[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/0.9.1-52-g976211b
George Kiagiadakis
gkiagia-guest at alioth.debian.org
Sun Apr 5 21:02:31 UTC 2009
The following commit has been merged in the master branch:
commit 976211b3509b860e54a3022aaf340270acbe43a0
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date: Mon Apr 6 00:02:10 2009 +0300
Remove some unused stuff.
diff --git a/diroperations/recursivedirjob.cpp b/diroperations/recursivedirjob.cpp
index beeafdf..3d7e8c2 100644
--- a/diroperations/recursivedirjob.cpp
+++ b/diroperations/recursivedirjob.cpp
@@ -37,7 +37,6 @@
QString RecursiveDirJob::Error::message() const
{
switch (m_type) {
- case OperationCanceled: return tr("User canceled the operation");
case AccessDenied: return tr("Access was denied to the file or directory \"%1\"").arg(m_info);
case NoSuchFileOrDirectory: return tr("\"%1\": No such file or directory").arg(m_info);
case FileOrDirectoryExists: return tr("\"%1\" already exists").arg(m_info);
@@ -53,7 +52,7 @@ struct RecursiveDirJob::Private
RecursiveDirJob::JobType m_jobType;
QVariantList m_args;
QVariant m_result;
- QList<Error> m_exceptions;
+ //QList<Error> m_exceptions;
};
//static
@@ -76,6 +75,7 @@ RecursiveDirJob* RecursiveDirJob::recursiveRmDir(const QString & dir)
return new RecursiveDirJob(RmDir, QVariantList() << QVariant(dir));
}
+#if 0
bool RecursiveDirJob::hasError() const
{
return (isFinished()) ? (!d->m_exceptions.isEmpty()) : false;
@@ -85,10 +85,11 @@ QList<RecursiveDirJob::Error> RecursiveDirJob::errors() const
{
return (isFinished()) ? d->m_exceptions : QList<Error>();
}
+#endif
void RecursiveDirJob::slotErrorOccured(RecursiveDirJob::Error e)
{
- d->m_exceptions.append(e);
+ //d->m_exceptions.append(e);
emit errorOccured(e.message());
}
diff --git a/diroperations/recursivedirjob.h b/diroperations/recursivedirjob.h
index f726ec1..d6b3ff4 100644
--- a/diroperations/recursivedirjob.h
+++ b/diroperations/recursivedirjob.h
@@ -42,8 +42,8 @@ public:
{
Q_DECLARE_TR_FUNCTIONS(Error)
public:
- enum Type { OperationCanceled, AccessDenied, NoSuchFileOrDirectory,
- FileOrDirectoryExists, CopyFail, MkdirFail, RmFail, NoError };
+ enum Type { AccessDenied, NoSuchFileOrDirectory, FileOrDirectoryExists,
+ CopyFail, MkdirFail, RmFail, NoError };
explicit Error() : m_type(NoError) {}
explicit Error(Type type, const QString & extraInfo = QString())
@@ -80,8 +80,8 @@ public:
void setProgressDialogInterface(ProgressDialogInterface *pd);
- bool hasError() const;
- QList<Error> errors() const;
+ //bool hasError() const;
+ //QList<Error> errors() const;
QVariant result() const;
void synchronousRun(ProgressDialogInterface *pd = NULL);
--
Kaboom - Debian KDE 3->4 migration tool
More information about the pkg-kde-commits
mailing list