[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeutils/ark/kerfuffle
From:       Raphael Kubo da Costa <kubito () gmail ! com>
Date:       2009-05-14 2:28:33
Message-ID: 1242268113.933431.13031.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 967805 by rkcosta:

Cleanup batchextract.h, adding forward declarations and removing
unnecessary headers. Added the proper headers to batchextract.cpp

 M  +12 -10    batchextract.cpp  
 M  +16 -27    batchextract.h  


--- trunk/KDE/kdeutils/ark/kerfuffle/batchextract.cpp #967804:967805
@@ -20,8 +20,18 @@
  */
 
 #include "batchextract.h"
+
+#include "archive.h"
 #include "extractiondialog.h"
+#include "jobs.h"
+#include "queries.h"
 
+#include <QFileInfo>
+#include <QDir>
+#include <QCoreApplication>
+#include <QApplication>
+#include <QDesktopWidget>
+
 #include <KDebug>
 #include <KGlobal>
 #include <KLocale>
@@ -29,12 +39,6 @@
 #include <KIO/RenameDialog>
 #include <kwidgetjobtracker.h>
 
-#include <QFileInfo>
-#include <QDir>
-#include <QCoreApplication>
-#include <QApplication>
-#include <QDesktopWidget>
-
 namespace Kerfuffle
 {
 	BatchExtract::BatchExtract() 
@@ -83,12 +87,10 @@
 				options
 				);
 
-		connect(job, SIGNAL(userQuery(Query*)),
-				this, SLOT(slotUserQuery(Query*)));
+		connect(job, SIGNAL(userQuery(Query*)), this, SLOT(slotUserQuery(Query*)));
 
 		kDebug( 1601 ) << QString("Registering job from archive %1, to %2, preservePaths \
%3").arg(archive->fileName()).arg(autoDestination).arg(preservePaths);  
-
 		addSubjob(job);
 		fileNames[job] = qMakePair(archive->fileName(), destinationFolder);
 		connect(job, SIGNAL(percent(KJob*, unsigned long)),
@@ -110,7 +112,6 @@
 	{
 		kDebug( 1601 );
 
-
 		if (!subfolder.isEmpty()) {
 			kDebug( 1601 ) << "Creating subfolder" << subfolder;
 			QDir dest(destinationFolder);
@@ -129,6 +130,7 @@
 
 			addExtraction(archive, m_preservePaths, finalDestination);
 		}
+
 		KIO::getJobTracker()->registerJob(this);
 
 		emit description(this,
--- trunk/KDE/kdeutils/ark/kerfuffle/batchextract.h #967804:967805
@@ -22,25 +22,22 @@
 #ifndef BATCHEXTRACT_H
 #define BATCHEXTRACT_H
 
-#include <KParts/MainWindow>
-#include <KParts/ReadWritePart>
-#include <KUrl>
-#include <KDialog>
-#include <QMap>
-#include <QPair>
-#include <kcompositejob.h>
-#include "jobs.h"
-#include "archive.h"
-#include "queries.h"
 #include "kerfuffle_export.h"
 
-using Kerfuffle::Query;
+#include <QtCore/QMap>
+#include <QtCore/QPair>
+#include <QtCore/QString>
 
+#include <kcompositejob.h>
+
 class Interface;
 class KJobTrackerInterface;
+class KUrl;
 
 namespace Kerfuffle
 {
+	class Archive;
+	class Query;
 
 	class KERFUFFLE_EXPORT BatchExtract : public KCompositeJob
 	{
@@ -49,39 +46,31 @@
 		public:
 			BatchExtract();
 			virtual ~BatchExtract();
-			void addExtraction(Kerfuffle::Archive* archive, bool preservePaths = true, \
QString destinationFolder = QString()); +			void addExtraction(Archive* archive, bool \
preservePaths = true, QString destinationFolder = QString());  void start();
 			void setAutoSubfolder(bool value);
 			bool addInput( const KUrl& url );
+			bool showExtractDialog();
+			void setDestinationFolder(QString folder);
+			void setSubfolder(QString subfolder);
+			void setPreservePaths(bool value);
 
 		private slots:
 			void forwardProgress(KJob *job, unsigned long percent);
-			void slotResult( KJob *job );
+			void slotResult(KJob *job);
 			void slotUserQuery(Query *query);
 
 		private:
 			int initialJobCount;
-			QMap<class KJob *, QPair<QString,QString> > fileNames;
+			QMap<KJob*, QPair<QString,QString> > fileNames;
 			bool autoSubfolders;
 
-
-			QList<Kerfuffle::Archive*> inputs;
+			QList<Archive*> inputs;
 			KJobTrackerInterface *tracker;
 			QString destinationFolder;
 			QString subfolder;
 			bool m_preservePaths;
-
-		public:
-			bool showExtractDialog();
-			void setDestinationFolder(QString folder);
-			void setSubfolder(QString subfolder);
-			void setPreservePaths(bool value);
-
-		public slots:
-
 	};
-
 }
 
-
 #endif // BATCHEXTRACT_H


[prev in list] [next in list] [prev in thread] [next in thread]