summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2014-01-16 22:14:17 (GMT)
committerChristian Mollekopf <chrigi_1@fastmail.fm>2014-01-16 22:14:17 (GMT)
commit4e5f62680471ed1420438d7db51a31bca1ec8a64 (patch)
tree7a7392c1dd702a73daa31a7599969b1f2180413b
parenta8fd4e617845e2fc94610f8a48ad8c623c7eb9f1 (diff)
downloadkolab-utils-4e5f62680471ed1420438d7db51a31bca1ec8a64.tar.gz
Cleanups
-rw-r--r--lib/kolabaccount.h1
-rw-r--r--migrationutility/googlesourceaccount.cpp2
-rw-r--r--migrationutility/kolabserver.h1
-rw-r--r--migrationutility/main.cpp4
4 files changed, 3 insertions, 5 deletions
diff --git a/lib/kolabaccount.h b/lib/kolabaccount.h
index a80f2a5..4887370 100644
--- a/lib/kolabaccount.h
+++ b/lib/kolabaccount.h
@@ -46,7 +46,6 @@ public:
void setupFolders();
void appendObjectSync(Object obj, const QString &folder);
KJob *appendObject(Object obj, const QString &folder);
- QList<Object> getHeaders(const QString& folder);
void createFolder(const QString &name, Kolab::FolderType folderType);
void createFolder(const QString &name, const QByteArray &annotation);
void setDryRun(bool);
diff --git a/migrationutility/googlesourceaccount.cpp b/migrationutility/googlesourceaccount.cpp
index 2fad5f7..5a54fe8 100644
--- a/migrationutility/googlesourceaccount.cpp
+++ b/migrationutility/googlesourceaccount.cpp
@@ -319,7 +319,7 @@ QStringList GoogleContactsSourceAccount::lookupFolderList()
return QStringList() << "Contacts";
}
-FetchObjectsJob* GoogleContactsSourceAccount::fetchObjects(const QString& folder)
+FetchObjectsJob* GoogleContactsSourceAccount::fetchObjects(const QString &/*folder*/)
{
return new FetchContactObjectsJob(mAccount, this);
}
diff --git a/migrationutility/kolabserver.h b/migrationutility/kolabserver.h
index 8ce1afa..c2c692e 100644
--- a/migrationutility/kolabserver.h
+++ b/migrationutility/kolabserver.h
@@ -39,7 +39,6 @@ public:
KolabAccount *getAccount(const QString &user);
void setVersion(Kolab::Version);
private:
- void logout();
QString mHost;
int mPort;
QString mUsername;
diff --git a/migrationutility/main.cpp b/migrationutility/main.cpp
index e9166b9..2e109d8 100644
--- a/migrationutility/main.cpp
+++ b/migrationutility/main.cpp
@@ -86,9 +86,9 @@ int main(int argc, char *argv[])
KCmdLineOptions options;
options.add("dry", ki18n("Dry run, doesn't change anything on the server, but only prints what would be done (Use with care until this is well tested)."));
- options.add("wipeTargetFolders", ki18n("Wipe and recreate target folders (Will only wipe folders in the personal namespace which are existing on the source server)."));
+ options.add("wipeTargetFolders", ki18n("Wipe and recreate target folders (Will only wipe folders in the personal namespace)."));
options.add("statefile", ki18n("Resume from migration-state file"), "/tmp/kolabmigration.state");
- options.add("skipFolder <sourcefolder>", ki18n("Source-folders to skip. Uses a simple \"contains\"-filter."));
+ options.add("skipFolder <sourcefolder>", ki18n("Source-folders to skip. Uses a simple \"contains\"-filter. Can be stated multiple times."));
options.add("objectType <type>", ki18n("Objects types to migrate (MAIL, CONTACTS, EVENTS, TASKS). By default all types are migrated. Can be stated multiple times. Currently only implemented for the google source type."));
options.add("from <type>", ki18n("Source host type (kolab2, kolab3, exchangeimap, google)"));