Remove dead code

Change-Id: I1cb0a54cbfeffe613d23931c29fbdde9cab1f2d1
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>

3 files changed, 0 insertions, 56 deletions

diff --git a/src/libraries/qmfclient/qmailstore_p.cpp b/src/libraries/qmfclient/qmailstore_p.cpp
index a1dd8bce..d7f80a88 100644
--- a/src/libraries/qmfclient/qmailstore_p.cpp
+++ b/src/libraries/qmfclient/qmailstore_p.cpp
@@ -8800,7 +8800,6 @@ bool QMailStorePrivate::recalculateThreadsColumns(const QMailThreadIdList& modif
         QMailThread thread(threadId);
         uint messagesCount = 0;
         uint unreadCount = 0;
-        uint firstUnread = 0;
         uint firstMessageIndex = 0;
         uint lastMessageIndex = 0;
         uint index = 0;
@@ -8823,7 +8822,6 @@ bool QMailStorePrivate::recalculateThreadsColumns(const QMailThreadIdList& modif
                 if (messagesCount == 0) firstMessageIndex = index;
                 messagesCount++;
                 if ((data.status() & QMailMessage::Read) == 0) {
-                    if (unreadCount == 0) firstUnread = messagesCount - 1;
                     ++unreadCount;
                 }
             }
diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
index ef8c6193..e59d6d42 100644
--- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
+++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
@@ -131,52 +131,6 @@ bool pathOnDefault(const QString &path)
     return path.startsWith(defaultPath());
 }
 
-bool migrateAccountToVersion101(const QMailAccountId &accountId)
-{
-    foreach (const QMailMessageId &id, QMailStore::instance()->queryMessages(QMailMessageKey::parentAccountId(accountId))) {
-        const QMailMessage message(id);
-
-        if (message.multipartType() != QMailMessage::MultipartNone) {
-            // Any part files for this message need to be moved to the new location
-            QString fileName(message.contentIdentifier());
-
-            QFileInfo fi(fileName);
-            QDir path(fi.dir());
-            path.setNameFilters(QStringList() << (fi.fileName() + "-[0-9]*"));
-
-            QStringList entries(path.entryList());
-            if (!entries.isEmpty()) {
-                // Does the part directory exist?
-                QString partDirectory(QmfStorageManager::messagePartDirectory(fileName));
-                if (!QDir(partDirectory).exists()) {
-                    if (!QDir::root().mkpath(partDirectory)) {
-                        qMailLog(Messaging) << "Unable to create directory for message part content:" << partDirectory;
-                        return false;
-                    }
-                }
-
-                foreach (const QString &entry, entries) {
-                    QFile existing(path.filePath(entry));
-
-                    // We need to move this file to the subdirectory
-                    QString newName(partDirectory + '/');
-                    int index = entry.lastIndexOf('-');
-                    if (index != -1) {
-                        newName.append(entry.mid(index + 1));
-                    }
-
-                    if (!existing.rename(newName)) {
-                        qMailLog(Messaging) << "Unable to move part file to new name:" << newName;
-                        return false;
-                    }
-                }
-            }
-        }
-    }
-
-    return true;
-}
-
 void syncFile(QSharedPointer<QFile> file)
 {
     // Ensure data is flushed to OS before attempting sync
diff --git a/tests/tst_storagemanager/tst_storagemanager.cpp b/tests/tst_storagemanager/tst_storagemanager.cpp
index 327db76d..1d5ea7cf 100644
--- a/tests/tst_storagemanager/tst_storagemanager.cpp
+++ b/tests/tst_storagemanager/tst_storagemanager.cpp
@@ -196,14 +196,6 @@ void tst_StorageManager::cleanupTestCase()
     QMailStore::instance()->removeMessages(QMailMessageKey::customField("present"));
 }
 
-//namespace tst_QmfStorageManager_namespace
-//{
-//    bool test_migrate(const QMailAccountId &accountId)
-//    {
-//        return migrateAccountToVersion101(accountId);
-//    }
-//}
-
 void tst_StorageManager::test_init()
 {
     QMailContentManager *mgr = QMailContentManagerFactory::create(QMailContentManagerFactory::defaultScheme());