[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeutils/ark
From: Raphael Kubo da Costa <kubito () gmail ! com>
Date: 2009-07-23 7:05:02
Message-ID: 1248332702.233807.32393.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1001398 by rkcosta:
Move all remaining methods from their class declaration to implementation.
M +20 -0 kerfuffle/jobs.cpp
M +4 -12 kerfuffle/jobs.h
M +5 -0 part/archivemodel.cpp
M +1 -4 part/archivemodel.h
M +10 -0 part/jobtracker.cpp
M +2 -6 part/jobtracker.h
M +5 -0 part/part.cpp
M +1 -3 part/part.h
--- trunk/KDE/kdeutils/ark/kerfuffle/jobs.cpp #1001397:1001398
@@ -146,6 +146,21 @@
if (!m_interface->waitForFinishedSignal()) m_interface->finished(ret);
}
+qlonglong ListJob::extractedFilesSize()
+{
+ return m_extractedFilesSize;
+}
+
+bool ListJob::isPasswordProtected()
+{
+ return m_isPasswordProtected;
+}
+
+bool ListJob::isSingleFolderArchive()
+{
+ return m_isSingleFolderArchive;
+}
+
void ListJob::onNewEntry(const ArchiveEntry& entry)
{
m_extractedFilesSize += entry[ Size ].toLongLong();
@@ -170,6 +185,11 @@
}
}
+QString ListJob::subfolderName()
+{
+ return m_subfolderName;
+}
+
ExtractJob::ExtractJob(const QList<QVariant>& files, const QString& destinationDir,
ExtractionOptions options, ReadOnlyArchiveInterface \
*interface, QObject *parent)
: Job(interface, parent), m_files(files), m_destinationDir(destinationDir), \
m_options(options)
--- trunk/KDE/kdeutils/ark/kerfuffle/jobs.h #1001397:1001398
@@ -86,18 +86,10 @@
explicit ListJob(ReadOnlyArchiveInterface *interface, QObject *parent = 0);
void doWork();
- bool isSingleFolderArchive() {
- return m_isSingleFolderArchive;
- }
- bool isPasswordProtected() {
- return m_isPasswordProtected;
- }
- QString subfolderName() {
- return m_subfolderName;
- }
- qlonglong extractedFilesSize() {
- return m_extractedFilesSize;
- }
+ qlonglong extractedFilesSize();
+ bool isPasswordProtected();
+ bool isSingleFolderArchive();
+ QString subfolderName();
private:
bool m_isSingleFolderArchive;
--- trunk/KDE/kdeutils/ark/part/archivemodel.cpp #1001397:1001398
@@ -734,6 +734,11 @@
if (behaviour == NotifyViews) endInsertRows();
}
+Kerfuffle::Archive* ArchiveModel::archive() const
+{
+ return m_archive;
+}
+
KJob* ArchiveModel::setArchive(Kerfuffle::Archive *archive)
{
delete m_archive;
--- trunk/KDE/kdeutils/ark/part/archivemodel.h #1001397:1001398
@@ -58,11 +58,8 @@
virtual bool dropMimeData(const QMimeData * data, Qt::DropAction action, int \
row, int column, const QModelIndex & parent);
-
KJob* setArchive(Kerfuffle::Archive *archive);
- Kerfuffle::Archive *archive() const {
- return m_archive;
- }
+ Kerfuffle::Archive *archive() const;
ArchiveEntry entryForIndex(const QModelIndex &index);
int childCount(const QModelIndex &index);
--- trunk/KDE/kdeutils/ark/part/jobtracker.cpp #1001397:1001398
@@ -38,6 +38,11 @@
resetUi();
}
+KJob* JobTracker::currentJob() const
+{
+ return m_currentJob;
+}
+
void JobTracker::description(KJob *job, const QString &title, const QPair< QString, \
QString > &f1, const QPair< QString, QString > &f2) {
Q_UNUSED(job);
@@ -104,3 +109,8 @@
m_ui->progressBar->hide();
KJobTrackerInterface::unregisterJob(job);
}
+
+QWidget* JobTracker::widget(KJob *)
+{
+ return m_ui;
+}
--- trunk/KDE/kdeutils/ark/part/jobtracker.h #1001397:1001398
@@ -39,15 +39,11 @@
public:
JobTracker(QWidget *parent = 0);
- QWidget *widget(KJob *) {
- return m_ui;
- }
+ QWidget *widget(KJob *);
virtual void registerJob(KJob *job);
virtual void unregisterJob(KJob *job);
- KJob *currentJob() const {
- return m_currentJob;
- }
+ KJob *currentJob() const;
protected slots:
virtual void finished(KJob *job);
--- trunk/KDE/kdeutils/ark/part/part.cpp #1001397:1001398
@@ -387,6 +387,11 @@
return true;
}
+bool Part::isBusy() const
+{
+ return m_busy;
+}
+
void Part::slotLoadingStarted()
{
}
--- trunk/KDE/kdeutils/ark/part/part.h #1001397:1001398
@@ -51,9 +51,7 @@
virtual bool openFile();
virtual bool saveFile();
- bool isBusy() const {
- return m_busy;
- }
+ bool isBusy() const;
public slots:
void extractSelectedFilesTo(QString localPath);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic