summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2013-11-04 08:02:32 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2013-11-04 08:02:32 (GMT)
commit0890a67383f6134270549cb1f64f7a4823aacc8a (patch)
treec30d1a632a24c72d492ca6cafc094b41a020889d
parentbb60bd77288afcce1f32cdf53171d91ab5159c92 (diff)
downloadkolab-utils-0890a67383f6134270549cb1f64f7a4823aacc8a.tar.gz
cleanup
-rw-r--r--migrationutility/main.cpp14
-rw-r--r--migrationutility/migrateuserjob.cpp11
-rw-r--r--migrationutility/migrateuserjob.h2
-rw-r--r--migrationutility/sourceserver.h1
4 files changed, 12 insertions, 16 deletions
diff --git a/migrationutility/main.cpp b/migrationutility/main.cpp
index 5c284f0..6b02260 100644
--- a/migrationutility/main.cpp
+++ b/migrationutility/main.cpp
@@ -70,13 +70,15 @@ KIMAP::LoginJob::AuthenticationMode getAuthenticationMode(const QString &auth)
}
/**
- * kolab-migrate --from caldav --to kolab (implied?) --caldav-host caldav.example.org --caldav-authn <admin> --caldav-authz <user> --caldav-pass <pass> --<folder-selection> --<folder-mapping> --kolab-host kolab.example.org --kolab-authn <admin> --kolab-authz <user> --kolab-pass <pass>
-
-* --regextrans2 '/Public Folders/shared/' Regex transformation of folder paths
-* Incremental conversion (folder by folder or even by batch of messages)
-* Save state persistently and resume from there after interruption (Wipe before starting and start all over as first step)
+ * kolab-migrate --from caldav --to kolab (implied?)
+ * --caldav-host caldav.example.org --caldav-authn <admin> --caldav-authz <user> --caldav-pass <pass>
+ * --<folder-selection> --<folder-mapping>
+ * --kolab-host kolab.example.org
+ * --kolab-authn <admin> --kolab-authz <user> --kolab-pass <pass>
+ * --regextrans2 '/Public Folders/shared/' Regex transformation of folder paths
+ * Incremental conversion (folder by folder or even by batch of messages)
+ * Save state persistently and resume from there after interruption (Wipe before starting and start all over as first step)
*/
-
int main(int argc, char *argv[])
{
KCmdLineArgs::init(argc, argv, "migrationutility", "migrationutility",ki18n("migrationutility"), "0.1");
diff --git a/migrationutility/migrateuserjob.cpp b/migrationutility/migrateuserjob.cpp
index 8548178..43dd587 100644
--- a/migrationutility/migrateuserjob.cpp
+++ b/migrationutility/migrateuserjob.cpp
@@ -24,8 +24,8 @@
MigrateUserJob::MigrateUserJob(const QList<SourceAccount*> &sourceAccounts, KolabAccount *kolabAccount, QObject* parent)
: KJob(parent),
mSourceAccounts(sourceAccounts),
- mKolabAccount(kolabAccount),
- mCurrentSourceAccount(0)
+ mCurrentSourceAccount(0),
+ mKolabAccount(kolabAccount)
{
}
@@ -134,7 +134,7 @@ void MigrateUserJob::onFolderMigrated(KJob *job)
migrateNextFolder();
}
-bool MigrateUserJob::isIgnored(const QString &sourceFolder)
+bool MigrateUserJob::isIgnored(const QString &sourceFolder) const
{
foreach (const QString &ignoredFolder, mCurrentSourceAccount->ignoredFolders()) {
const QRegExp reg(ignoredFolder, Qt::CaseSensitive, QRegExp::RegExp2);
@@ -144,8 +144,3 @@ bool MigrateUserJob::isIgnored(const QString &sourceFolder)
}
return false;
}
-
-
-
-
-// #include "migrateuserjob.moc"
diff --git a/migrationutility/migrateuserjob.h b/migrationutility/migrateuserjob.h
index 0f2e1f8..de5442b 100644
--- a/migrationutility/migrateuserjob.h
+++ b/migrationutility/migrateuserjob.h
@@ -44,7 +44,7 @@ private slots:
void migrateNextFolder();
void migrateNextAccount();
private:
- bool isIgnored(const QString &);
+ bool isIgnored(const QString &) const;
QStringList mFolderQueue;
QList<SourceAccount*> mSourceAccounts;
SourceAccount *mCurrentSourceAccount;
diff --git a/migrationutility/sourceserver.h b/migrationutility/sourceserver.h
index 427d2dd..08881d9 100644
--- a/migrationutility/sourceserver.h
+++ b/migrationutility/sourceserver.h
@@ -34,7 +34,6 @@ class SourceServer: public QObject
Q_OBJECT
public:
explicit SourceServer(QObject* parent = 0);
-// void setAdminCredentials(const QString &username, const QString &pw);
QList<SourceAccount*> getSourceAccounts(const QString &user);
QStringList getUserList();
void setSingleUser(const QString &);