Compiler warnings fixed

58 files changed, 201 insertions, 226 deletions

diff --git a/benchmarks/tst_messageserver/tst_messageserver.cpp b/benchmarks/tst_messageserver/tst_messageserver.cpp
index ace71ba4..43f0a1aa 100644
--- a/benchmarks/tst_messageserver/tst_messageserver.cpp
+++ b/benchmarks/tst_messageserver/tst_messageserver.cpp
@@ -77,7 +77,7 @@ typedef void (tst_MessageServer::*TestFunction)();
 
 typedef QList<QByteArray> TestMail;
 typedef QList<TestMail>   TestMailList;
-Q_DECLARE_METATYPE(TestMailList);
+Q_DECLARE_METATYPE(TestMailList)
 
 class tst_MessageServer : public QObject
 {
diff --git a/examples/qtmail/app/accountsettings.h b/examples/qtmail/app/accountsettings.h
index 23149798..51eafa09 100644
--- a/examples/qtmail/app/accountsettings.h
+++ b/examples/qtmail/app/accountsettings.h
@@ -59,7 +59,7 @@ class QAction;
 class QSmoothList;
 class QListView;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class AccountSettings : public QDialog
 {
diff --git a/examples/qtmail/app/emailclient.cpp b/examples/qtmail/app/emailclient.cpp
index 62dc7011..a8cf63a5 100644
--- a/examples/qtmail/app/emailclient.cpp
+++ b/examples/qtmail/app/emailclient.cpp
@@ -163,10 +163,13 @@ static bool confirmDelete( QWidget *parent, const QString & caption, const QStri
 static const int MoreMessagesIncrement = 20;
 
 // This is used regularly:
+#ifndef Q_OS_SYMBIAN
 static const QMailMessage::MessageType nonEmailType = static_cast<QMailMessage::MessageType>(QMailMessage::Mms |
                                                                                              QMailMessage::Sms |
                                                                                              QMailMessage::Instant |
                                                                                              QMailMessage::System);
+#endif
+
 class AcknowledgmentBox : public QMessageBox
 {
     Q_OBJECT
@@ -1992,7 +1995,6 @@ void EmailClient::folderSelected(QMailMessageSet *item)
         initActions();
         contextStatusUpdate();
 
-        bool atAccount(false);
         bool atFolder(false);
         bool showCreate(false);
         bool showDelete(false);
@@ -2002,7 +2004,6 @@ void EmailClient::folderSelected(QMailMessageSet *item)
         QMailFolderId folderId(item->data(EmailFolderModel::FolderIdRole).value<QMailFolderId>());
 
         if (accountId.isValid()) {
-            atAccount = true;
             selectedAccountId = accountId;
 
             QMailAccount account(accountId);
diff --git a/examples/qtmail/app/emailclient.h b/examples/qtmail/app/emailclient.h
index f342e418..886a93a9 100644
--- a/examples/qtmail/app/emailclient.h
+++ b/examples/qtmail/app/emailclient.h
@@ -77,7 +77,7 @@ class QStackedWidget;
 class QStringList;
 class QToolBar;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class MessageUiBase : public QMainWindow
 {
diff --git a/examples/qtmail/app/messagelistview.cpp b/examples/qtmail/app/messagelistview.cpp
index 60ffa0c0..a821b240 100644
--- a/examples/qtmail/app/messagelistview.cpp
+++ b/examples/qtmail/app/messagelistview.cpp
@@ -208,9 +208,9 @@ QVariant MessageListModel<BaseModel>::headerData(int section, Qt::Orientation o,
 template <typename BaseModel>
 int MessageListModel<BaseModel>::columnCount(const QModelIndex & parent) const
 {
-    return headers.count();
-
     Q_UNUSED(parent);
+
+    return headers.count();
 }
 
 template <typename BaseModel>
diff --git a/examples/qtmail/app/messagelistview.h b/examples/qtmail/app/messagelistview.h
index f33a49a8..cba48195 100644
--- a/examples/qtmail/app/messagelistview.h
+++ b/examples/qtmail/app/messagelistview.h
@@ -64,7 +64,7 @@ class QTabBar;
 class QToolButton;
 class QItemDelegate;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class MessageListView : public QWidget
 {
diff --git a/examples/qtmail/app/readmail.h b/examples/qtmail/app/readmail.h
index f9792513..7ab5afc0 100644
--- a/examples/qtmail/app/readmail.h
+++ b/examples/qtmail/app/readmail.h
@@ -58,7 +58,7 @@ class QMenu;
 class QStackedWidget;
 class QUrl;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class ReadMail : public QFrame
 {
diff --git a/examples/qtmail/app/searchview.cpp b/examples/qtmail/app/searchview.cpp
index e54bee48..55244bb5 100644
--- a/examples/qtmail/app/searchview.cpp
+++ b/examples/qtmail/app/searchview.cpp
@@ -339,7 +339,7 @@ public:
                      LessThan = 1 << 10,
                      LessThanEqual = 1 << 11 };
 
-    Q_DECLARE_FLAGS(Comparators,Comparator);
+    Q_DECLARE_FLAGS(Comparators,Comparator)
 
     static Comparators textComparators(){ return (QFlags<Comparator>(Contains) | DoesNotContain | Equal | NotEqual);};
     static Comparators numericComparators(){ return QFlags<Comparator>(Equal) | NotEqual | GreaterThan | GreaterThanEqual | LessThan | LessThanEqual;}
diff --git a/examples/qtmail/app/searchview.h b/examples/qtmail/app/searchview.h
index ceb4b1d1..495b9726 100644
--- a/examples/qtmail/app/searchview.h
+++ b/examples/qtmail/app/searchview.h
@@ -62,7 +62,7 @@ class QRadioButton;
 class QStatusBar;
 class QToolButton;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class SearchView : public QMainWindow
 {
diff --git a/examples/qtmail/app/selectcomposerwidget.h b/examples/qtmail/app/selectcomposerwidget.h
index fe097dca..c34d2961 100644
--- a/examples/qtmail/app/selectcomposerwidget.h
+++ b/examples/qtmail/app/selectcomposerwidget.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 class QListWidget;
 class QListWidgetItem;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class SelectComposerWidget : public QWidget
 {
diff --git a/examples/qtmail/app/writemail.h b/examples/qtmail/app/writemail.h
index 1fa31712..cbb0f046 100644
--- a/examples/qtmail/app/writemail.h
+++ b/examples/qtmail/app/writemail.h
@@ -57,7 +57,7 @@ class QComboBox;
 class QContent;
 class QStackedWidget;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class WriteMail : public QMainWindow
 {
diff --git a/examples/qtmail/libs/qmfutil/folderdelegate.h b/examples/qtmail/libs/qmfutil/folderdelegate.h
index 2a58d2c3..6c958d00 100644
--- a/examples/qtmail/libs/qmfutil/folderdelegate.h
+++ b/examples/qtmail/libs/qmfutil/folderdelegate.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 class QAbstractItemView;
 class QScrollBar;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class FolderDelegate : public QItemDelegate
 {
diff --git a/examples/qtmail/libs/qmfutil/qmailcomposer.h b/examples/qtmail/libs/qmfutil/qmailcomposer.h
index 94527098..30a92e45 100644
--- a/examples/qtmail/libs/qmfutil/qmailcomposer.h
+++ b/examples/qtmail/libs/qmfutil/qmailcomposer.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 
 class QMenu;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class QMFUTIL_EXPORT QMailComposerInterface : public QWidget
 {
diff --git a/examples/qtmail/libs/qmfutil/qmailviewer.h b/examples/qtmail/libs/qmfutil/qmailviewer.h
index d239311a..674f60d6 100644
--- a/examples/qtmail/libs/qmfutil/qmailviewer.h
+++ b/examples/qtmail/libs/qmfutil/qmailviewer.h
@@ -55,7 +55,7 @@ class QContact;
 class QMenu;
 class QUrl;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class QMailViewerInterface;
 
diff --git a/examples/qtmail/libs/qmfutil/qtmailnamespace.h b/examples/qtmail/libs/qmfutil/qtmailnamespace.h
index 82bb8287..a0f3af30 100644
--- a/examples/qtmail/libs/qmfutil/qtmailnamespace.h
+++ b/examples/qtmail/libs/qmfutil/qtmailnamespace.h
@@ -48,6 +48,6 @@
 namespace Qtmail
 {
     QMFUTIL_EXPORT QIcon icon(const QString& name);
-};
+}
 
 #endif
diff --git a/examples/qtmail/libs/qmfutil/selectfolder.h b/examples/qtmail/libs/qmfutil/selectfolder.h
index 4eaafae1..60199392 100644
--- a/examples/qtmail/libs/qmfutil/selectfolder.h
+++ b/examples/qtmail/libs/qmfutil/selectfolder.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 class QListWidget;
 class QPushButton;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class QMFUTIL_EXPORT SelectFolderDialog : public QDialog
 {
diff --git a/examples/qtmail/plugins/composers/email/attachmentlistwidget.h b/examples/qtmail/plugins/composers/email/attachmentlistwidget.h
index c518d283..bf2dd40a 100644
--- a/examples/qtmail/plugins/composers/email/attachmentlistwidget.h
+++ b/examples/qtmail/plugins/composers/email/attachmentlistwidget.h
@@ -56,7 +56,7 @@ class QLabel;
 class QTreeView;
 class QModelIndex;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class AttachmentListWidget : public QWidget
 {
diff --git a/examples/qtmail/plugins/composers/email/emailcomposer.h b/examples/qtmail/plugins/composers/email/emailcomposer.h
index f9581b7e..7fac27ea 100644
--- a/examples/qtmail/plugins/composers/email/emailcomposer.h
+++ b/examples/qtmail/plugins/composers/email/emailcomposer.h
@@ -58,7 +58,7 @@ class QLineEdit;
 class QStackedWidget;
 class QTextEdit;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class EmailComposerInterface : public QMailComposerInterface
 {
diff --git a/examples/qtmail/plugins/viewers/generic/attachmentoptions.h b/examples/qtmail/plugins/viewers/generic/attachmentoptions.h
index 734f9896..6d916682 100644
--- a/examples/qtmail/plugins/viewers/generic/attachmentoptions.h
+++ b/examples/qtmail/plugins/viewers/generic/attachmentoptions.h
@@ -56,7 +56,7 @@ class QLabel;
 class QPushButton;
 class QString;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class AttachmentOptions : public QDialog
 {
diff --git a/examples/qtmail/plugins/viewers/generic/genericviewer.h b/examples/qtmail/plugins/viewers/generic/genericviewer.h
index daee0bab..2fbcebed 100644
--- a/examples/qtmail/plugins/viewers/generic/genericviewer.h
+++ b/examples/qtmail/plugins/viewers/generic/genericviewer.h
@@ -56,7 +56,7 @@ class QAction;
 class QPushButton;
 class QToolButton;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 // A generic viewer able to show email, SMS or basic MMS
 class GenericViewer : public QMailViewerInterface
diff --git a/src/libraries/qmfclient/longstream_p.h b/src/libraries/qmfclient/longstream_p.h
index 622e681c..4c09f019 100644
--- a/src/libraries/qmfclient/longstream_p.h
+++ b/src/libraries/qmfclient/longstream_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 class QTemporaryFile;
 class QDataStream;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class QMF_EXPORT LongStream
 {
diff --git a/src/libraries/qmfclient/longstring_p.h b/src/libraries/qmfclient/longstring_p.h
index a106ca74..ba82a4e5 100644
--- a/src/libraries/qmfclient/longstring_p.h
+++ b/src/libraries/qmfclient/longstring_p.h
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 class QDataStream;
 class QTextStream;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class LongStringPrivate;
 
diff --git a/src/libraries/qmfclient/qmailaccount.h b/src/libraries/qmfclient/qmailaccount.h
index a1f4b23e..3fab0d0d 100644
--- a/src/libraries/qmfclient/qmailaccount.h
+++ b/src/libraries/qmfclient/qmailaccount.h
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 class QSettings;
 class QTimer;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class QMF_EXPORT QMailAccount
 {
diff --git a/src/libraries/qmfclient/qmailaccountkey.cpp b/src/libraries/qmfclient/qmailaccountkey.cpp
index c0a294c2..a60eafe7 100644
--- a/src/libraries/qmfclient/qmailaccountkey.cpp
+++ b/src/libraries/qmfclient/qmailaccountkey.cpp
@@ -108,7 +108,7 @@ using namespace QMailDataComparator;
     Synonym for QMailKeyArgument<QMailAccountKey::Property>.
 */
 
-Q_IMPLEMENT_USER_METATYPE(QMailAccountKey);
+Q_IMPLEMENT_USER_METATYPE(QMailAccountKey)
 
 /*!
     Creates a QMailAccountKey without specifying matching parameters.
diff --git a/src/libraries/qmfclient/qmailaccountkey.h b/src/libraries/qmfclient/qmailaccountkey.h
index e5282449..54fc93b7 100644
--- a/src/libraries/qmfclient/qmailaccountkey.h
+++ b/src/libraries/qmfclient/qmailaccountkey.h
@@ -143,6 +143,6 @@ private:
     QSharedDataPointer<QMailAccountKeyPrivate> d;
 };
 
-Q_DECLARE_USER_METATYPE(QMailAccountKey);
+Q_DECLARE_USER_METATYPE(QMailAccountKey)
 
 #endif
diff --git a/src/libraries/qmfclient/qmailaccountlistmodel.cpp b/src/libraries/qmfclient/qmailaccountlistmodel.cpp
index 4f1fbef4..0f1eccd1 100644
--- a/src/libraries/qmfclient/qmailaccountlistmodel.cpp
+++ b/src/libraries/qmfclient/qmailaccountlistmodel.cpp
@@ -263,19 +263,15 @@ QVariant QMailAccountListModel::data(const QModelIndex& index, int role) const
        case Qt::DisplayRole:
        case NameTextRole:
             return account.name();
-            break;
 
        case MessageTypeRole:
             return static_cast<int>(account.messageType());
-            break;
 
        case MessageSourcesRole:
             return account.messageSources();
-            break;
 
        case MessageSinksRole:
             return account.messageSinks();
-            break;
     }
 
     return QVariant();
diff --git a/src/libraries/qmfclient/qmailaccountsortkey.cpp b/src/libraries/qmfclient/qmailaccountsortkey.cpp
index 5dfbadc7..9f1d8d35 100644
--- a/src/libraries/qmfclient/qmailaccountsortkey.cpp
+++ b/src/libraries/qmfclient/qmailaccountsortkey.cpp
@@ -258,5 +258,5 @@ QMailAccountSortKey QMailAccountSortKey::status(quint64 mask, Qt::SortOrder orde
 }
 
 
-Q_IMPLEMENT_USER_METATYPE(QMailAccountSortKey);
+Q_IMPLEMENT_USER_METATYPE(QMailAccountSortKey)
 
diff --git a/src/libraries/qmfclient/qmailaccountsortkey.h b/src/libraries/qmfclient/qmailaccountsortkey.h
index 0ab0c68d..a0c8a0d0 100644
--- a/src/libraries/qmfclient/qmailaccountsortkey.h
+++ b/src/libraries/qmfclient/qmailaccountsortkey.h
@@ -100,7 +100,7 @@ private:
     QSharedDataPointer<QMailAccountSortKeyPrivate> d;
 };
 
-Q_DECLARE_USER_METATYPE(QMailAccountSortKey);
+Q_DECLARE_USER_METATYPE(QMailAccountSortKey)
 
 #endif
 
diff --git a/src/libraries/qmfclient/qmailaddress.h b/src/libraries/qmfclient/qmailaddress.h
index ddcdd578..48d90c48 100644
--- a/src/libraries/qmfclient/qmailaddress.h
+++ b/src/libraries/qmfclient/qmailaddress.h
@@ -101,7 +101,7 @@ Q_DECLARE_USER_METATYPE(QMailAddress)
 
 typedef QList<QMailAddress> QMailAddressList;
 
-Q_DECLARE_METATYPE(QMailAddressList);
-Q_DECLARE_USER_METATYPE_TYPEDEF(QMailAddressList, QMailAddressList);
+Q_DECLARE_METATYPE(QMailAddressList)
+Q_DECLARE_USER_METATYPE_TYPEDEF(QMailAddressList, QMailAddressList)
 
 #endif
diff --git a/src/libraries/qmfclient/qmailfolderkey.cpp b/src/libraries/qmfclient/qmailfolderkey.cpp
index d091fc90..a7fe382d 100644
--- a/src/libraries/qmfclient/qmailfolderkey.cpp
+++ b/src/libraries/qmfclient/qmailfolderkey.cpp
@@ -117,7 +117,7 @@ using namespace QMailKey;
     Synonym for QMailKeyArgument<QMailFolderKey::Property>.
 */
 
-Q_IMPLEMENT_USER_METATYPE(QMailFolderKey);
+Q_IMPLEMENT_USER_METATYPE(QMailFolderKey)
 
 /*!
     Creates a QMailFolderKey without specifying matching parameters.
diff --git a/src/libraries/qmfclient/qmailfolderkey.h b/src/libraries/qmfclient/qmailfolderkey.h
index b85b5757..db64f7b6 100644
--- a/src/libraries/qmfclient/qmailfolderkey.h
+++ b/src/libraries/qmfclient/qmailfolderkey.h
@@ -163,6 +163,6 @@ private:
     QSharedDataPointer<QMailFolderKeyPrivate> d;
 };
 
-Q_DECLARE_USER_METATYPE(QMailFolderKey);
+Q_DECLARE_USER_METATYPE(QMailFolderKey)
 
 #endif
diff --git a/src/libraries/qmfclient/qmailfoldersortkey.cpp b/src/libraries/qmfclient/qmailfoldersortkey.cpp
index 9c723feb..5b8c3b6f 100644
--- a/src/libraries/qmfclient/qmailfoldersortkey.cpp
+++ b/src/libraries/qmfclient/qmailfoldersortkey.cpp
@@ -302,5 +302,5 @@ QMailFolderSortKey QMailFolderSortKey::status(quint64 mask, Qt::SortOrder order)
 }
 
 
-Q_IMPLEMENT_USER_METATYPE(QMailFolderSortKey);
+Q_IMPLEMENT_USER_METATYPE(QMailFolderSortKey)
 
diff --git a/src/libraries/qmfclient/qmailfoldersortkey.h b/src/libraries/qmfclient/qmailfoldersortkey.h
index fc1e73ed..a3da5512 100644
--- a/src/libraries/qmfclient/qmailfoldersortkey.h
+++ b/src/libraries/qmfclient/qmailfoldersortkey.h
@@ -109,6 +109,6 @@ private:
     QSharedDataPointer<QMailFolderSortKeyPrivate> d;
 };
 
-Q_DECLARE_USER_METATYPE(QMailFolderSortKey);
+Q_DECLARE_USER_METATYPE(QMailFolderSortKey)
 
 #endif
diff --git a/src/libraries/qmfclient/qmailid.cpp b/src/libraries/qmfclient/qmailid.cpp
index 3f421825..d82df528 100644
--- a/src/libraries/qmfclient/qmailid.cpp
+++ b/src/libraries/qmfclient/qmailid.cpp
@@ -154,7 +154,7 @@ QTextStream& operator<<(QTextStream& s, const QMailIdPrivate &id)
     \relates QMailAccountId
 */
 
-Q_IMPLEMENT_USER_METATYPE(QMailAccountId);
+Q_IMPLEMENT_USER_METATYPE(QMailAccountId)
 
 /*! 
     Construct an uninitialized QMailAccountId, for which isValid() returns false.
@@ -292,7 +292,7 @@ Q_IMPLEMENT_USER_METATYPE_TYPEDEF(QMailAccountIdList, QMailAccountIdList)
     \relates QMailFolderId
 */
 
-Q_IMPLEMENT_USER_METATYPE(QMailFolderId);
+Q_IMPLEMENT_USER_METATYPE(QMailFolderId)
 
 /*! 
     Construct an uninitialized QMailFolderId, for which isValid() returns false.
@@ -439,7 +439,7 @@ Q_IMPLEMENT_USER_METATYPE_TYPEDEF(QMailFolderIdList, QMailFolderIdList)
     \relates QMailMessageId
 */
 
-Q_IMPLEMENT_USER_METATYPE(QMailMessageId);
+Q_IMPLEMENT_USER_METATYPE(QMailMessageId)
 
 /*! 
     Construct an uninitialized QMailMessageId, for which isValid() returns false.
diff --git a/src/libraries/qmfclient/qmailid.h b/src/libraries/qmfclient/qmailid.h
index 64757a6d..6096a34d 100644
--- a/src/libraries/qmfclient/qmailid.h
+++ b/src/libraries/qmfclient/qmailid.h
@@ -140,9 +140,9 @@ QMF_EXPORT QTextStream& operator<< (QTextStream& s, const QMailAccountId &id);
 QMF_EXPORT QTextStream& operator<< (QTextStream& s, const QMailFolderId &id);
 QMF_EXPORT QTextStream& operator<< (QTextStream& s, const QMailMessageId &id);
 
-Q_DECLARE_USER_METATYPE(QMailAccountId);
-Q_DECLARE_USER_METATYPE(QMailFolderId);
-Q_DECLARE_USER_METATYPE(QMailMessageId);
+Q_DECLARE_USER_METATYPE(QMailAccountId)
+Q_DECLARE_USER_METATYPE(QMailFolderId)
+Q_DECLARE_USER_METATYPE(QMailMessageId)
 
 Q_DECLARE_METATYPE(QMailAccountIdList)
 Q_DECLARE_METATYPE(QMailFolderIdList)
diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp
index 59539492..4f069b3b 100644
--- a/src/libraries/qmfclient/qmailmessage.cpp
+++ b/src/libraries/qmfclient/qmailmessage.cpp
@@ -1423,7 +1423,6 @@ void QMailMessageHeaderFieldPrivate::parse(const QByteArray& text, bool structur
     bool malformed = false;
 
     const char* token = begin;
-    const char* firstToken = begin;
     const char* it = begin;
     const char* separator = 0;
     for (bool quoted = false; it != end; ++it)
@@ -1441,7 +1440,6 @@ void QMailMessageHeaderFieldPrivate::parse(const QByteArray& text, bool structur
                 // If this is a structured header, there can be only one colon
                 token = (it + 1);
             }
-            firstToken = token;
         }
         else if (*it == '=' && !quoted && structured) {
             if (separator == 0) {
@@ -3725,9 +3723,9 @@ static QString decodedContent(const QString& id, const QByteArray& content)
 {
     // TODO: Potentially, we should disallow decoding here based on the specific header field
     // return (permitDecoding ? QMailMessageHeaderField::decodeContent(content) : QString(content));
+    Q_UNUSED(id);
 
     return QMailMessageHeaderField::decodeContent(content);
-    Q_UNUSED(id);
 }
 
 /*!
@@ -3899,10 +3897,9 @@ static QByteArray encodedContent(const QByteArray& id, const QString& content)
 {
     // TODO: Potentially, we should disallow encoding here based on the specific header field
     // return (permitEncoding ? QMailMessageHeaderField::encodeContent(content) : to7BitAscii(content));
-
+    Q_UNUSED(id)
 
     return QMailMessageHeaderField::encodeContent(content);
-    Q_UNUSED(id)
 }
 
 void QMailMessagePartContainerPrivate::updateHeaderField(const QByteArray &id, const QString &content)
@@ -7229,9 +7226,9 @@ static bool seedRng()
 static int randomNumber()
 {
     static bool initialised = seedRng();
-    return qrand();
-
     Q_UNUSED(initialised)
+
+    return qrand();
 }
 
 static QByteArray gBoundaryString;
diff --git a/src/libraries/qmfclient/qmailmessage.h b/src/libraries/qmfclient/qmailmessage.h
index a5826725..a0b81205 100644
--- a/src/libraries/qmfclient/qmailmessage.h
+++ b/src/libraries/qmfclient/qmailmessage.h
@@ -63,7 +63,7 @@ class QDataStream;
 class QTextStream;
 class QFile;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class QMailMessageHeaderFieldPrivate;
 
diff --git a/src/libraries/qmfclient/qmailmessagekey.cpp b/src/libraries/qmfclient/qmailmessagekey.cpp
index e6562674..c2200598 100644
--- a/src/libraries/qmfclient/qmailmessagekey.cpp
+++ b/src/libraries/qmfclient/qmailmessagekey.cpp
@@ -1057,5 +1057,5 @@ template void QMF_EXPORT QMailMessageKey::serialize<QDataStream>(QDataStream& st
 template void QMF_EXPORT QMailMessageKey::deserialize<QDataStream>(QDataStream& stream);
 #endif
 
-Q_IMPLEMENT_USER_METATYPE(QMailMessageKey);
+Q_IMPLEMENT_USER_METATYPE(QMailMessageKey)
 
diff --git a/src/libraries/qmfclient/qmailmessagekey.h b/src/libraries/qmfclient/qmailmessagekey.h
index 242e2cda..7586e268 100644
--- a/src/libraries/qmfclient/qmailmessagekey.h
+++ b/src/libraries/qmfclient/qmailmessagekey.h
@@ -240,6 +240,6 @@ private:
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QMailMessageKey::Properties)
-Q_DECLARE_USER_METATYPE(QMailMessageKey);
+Q_DECLARE_USER_METATYPE(QMailMessageKey)
 
 #endif
diff --git a/src/libraries/qmfclient/qmailmessagelistmodel.cpp b/src/libraries/qmfclient/qmailmessagelistmodel.cpp
index 81886094..bbcc1d1d 100644
--- a/src/libraries/qmfclient/qmailmessagelistmodel.cpp
+++ b/src/libraries/qmfclient/qmailmessagelistmodel.cpp
@@ -163,11 +163,11 @@ int QMailMessageListModelPrivate::rowCount(const QModelIndex &idx) const
 
 int QMailMessageListModelPrivate::columnCount(const QModelIndex &idx) const
 {
+    Q_UNUSED(idx)
+
     init();
 
     return 1;
-    
-    Q_UNUSED(idx)
 }
 
 QMailMessageId QMailMessageListModelPrivate::idFromIndex(const QModelIndex& index) const
@@ -582,17 +582,17 @@ QModelIndex QMailMessageListModel::index(int row, int column, const QModelIndex
 /*! \reimp */
 QModelIndex QMailMessageListModel::parent(const QModelIndex &idx) const
 {
-    return QModelIndex();
-
     Q_UNUSED(idx)
+
+    return QModelIndex();
 }
 
 /*! \reimp */
 QModelIndex QMailMessageListModel::generateIndex(int row, int column, void *ptr)
 {
-    return index(row, column, QModelIndex());
-
     Q_UNUSED(ptr)
+
+    return index(row, column, QModelIndex());
 }
 
 /*! \reimp */
diff --git a/src/libraries/qmfclient/qmailmessagemodelbase.cpp b/src/libraries/qmfclient/qmailmessagemodelbase.cpp
index a47bf6af..fa78bd7e 100644
--- a/src/libraries/qmfclient/qmailmessagemodelbase.cpp
+++ b/src/libraries/qmfclient/qmailmessagemodelbase.cpp
@@ -202,11 +202,9 @@ QVariant QMailMessageModelBase::data(const QModelIndex& index, int role) const
     {
     case MessageIdRole:
         return id;
-        break;
 
     case Qt::CheckStateRole:
         return impl()->checkState(index);
-        break;
 
     default:
         break;
@@ -251,11 +249,9 @@ QVariant QMailMessageModelBase::data(const QMailMessageMetaData &message, int ro
         case Qt::DisplayRole:
         case MessageAddressTextRole:
             return messageAddressText(message,incoming);
-        break;
 
         case MessageSizeTextRole:
             return messageSizeText(message);
-        break;
 
         case MessageTimeStampTextRole:
         {
@@ -276,15 +272,12 @@ QVariant QMailMessageModelBase::data(const QMailMessageMetaData &message, int ro
             QString sublabel(QString("%1 %2 %3").arg(action).arg(date).arg(time));
             return sublabel;
         }
-        break;
 
         case MessageSubjectTextRole:
             return message.subject();
-        break;
 
         case MessageFilterTextRole:
             return messageAddressText(message,incoming) + ' ' + message.subject();
-        break;
 
         case Qt::DecorationRole:
         case MessageTypeIconRole:
@@ -292,14 +285,12 @@ QVariant QMailMessageModelBase::data(const QMailMessageMetaData &message, int ro
             // Not currently implemented...
             return QString();
         }
-        break;
 
         case MessageDirectionIconRole:
         {
             QString mainIcon = incoming ? incomingIcon : outgoingIcon;
             return mainIcon;
         }
-        break;
 
         case MessageStatusIconRole:
         if (incoming) {
@@ -325,7 +316,6 @@ QVariant QMailMessageModelBase::data(const QMailMessageMetaData &message, int ro
             // Not currently implemented...
             return QString();
         }
-        break;
 
         case MessageBodyTextRole:
         {
@@ -342,7 +332,6 @@ QVariant QMailMessageModelBase::data(const QMailMessageMetaData &message, int ro
                 return QString();
             }
         }
-        break;
     }
 
     return QVariant();
diff --git a/src/libraries/qmfclient/qmailmessagesortkey.cpp b/src/libraries/qmfclient/qmailmessagesortkey.cpp
index 32befc1c..027870c3 100644
--- a/src/libraries/qmfclient/qmailmessagesortkey.cpp
+++ b/src/libraries/qmfclient/qmailmessagesortkey.cpp
@@ -400,5 +400,5 @@ QMailMessageSortKey QMailMessageSortKey::status(quint64 mask, Qt::SortOrder orde
 }
 
         
-Q_IMPLEMENT_USER_METATYPE(QMailMessageSortKey);
+Q_IMPLEMENT_USER_METATYPE(QMailMessageSortKey)
 
diff --git a/src/libraries/qmfclient/qmailmessagesortkey.h b/src/libraries/qmfclient/qmailmessagesortkey.h
index d1b54099..785db878 100644
--- a/src/libraries/qmfclient/qmailmessagesortkey.h
+++ b/src/libraries/qmfclient/qmailmessagesortkey.h
@@ -127,6 +127,6 @@ private:
     QSharedDataPointer<QMailMessageSortKeyPrivate> d;
 };
 
-Q_DECLARE_USER_METATYPE(QMailMessageSortKey);
+Q_DECLARE_USER_METATYPE(QMailMessageSortKey)
 
 #endif
diff --git a/src/libraries/qmfclient/qmailmessagethreadedmodel.cpp b/src/libraries/qmfclient/qmailmessagethreadedmodel.cpp
index f8531585..e2ec6d0f 100644
--- a/src/libraries/qmfclient/qmailmessagethreadedmodel.cpp
+++ b/src/libraries/qmfclient/qmailmessagethreadedmodel.cpp
@@ -45,8 +45,6 @@
 #include <QCache>
 #include <QtAlgorithms>
 
-static const int fullRefreshCutoff = 10;
-
 class QMailMessageThreadedModelItem
 {
 public:
@@ -202,11 +200,10 @@ int QMailMessageThreadedModelPrivate::rowCount(const QModelIndex &idx) const
 
 int QMailMessageThreadedModelPrivate::columnCount(const QModelIndex &idx) const
 {
+    Q_UNUSED(idx)
     init();
 
     return 1;
-    
-    Q_UNUSED(idx)
 }
 
 QMailMessageId QMailMessageThreadedModelPrivate::idFromIndex(const QModelIndex& idx) const
diff --git a/src/libraries/qmfclient/qmailstore_p.cpp b/src/libraries/qmfclient/qmailstore_p.cpp
index 65ef7a19..5696f39c 100644
--- a/src/libraries/qmfclient/qmailstore_p.cpp
+++ b/src/libraries/qmfclient/qmailstore_p.cpp
@@ -1420,38 +1420,30 @@ QString operatorString(QMailKey::Comparator op, bool multipleArgs = false, bool
     {
     case Equal:
         return (multipleArgs ? " IN " : (patternMatch ? " LIKE " : " = "));
-        break;
 
     case NotEqual:
         return (multipleArgs ? " NOT IN " : (patternMatch ? " NOT LIKE " : " <> "));
-        break;
 
     case LessThan:
         return " < ";
-        break;
 
     case LessThanEqual:
         return " <= ";
-        break;
 
     case GreaterThan:
         return " > ";
-        break;
 
     case GreaterThanEqual:
         return " >= ";
-        break;
 
     case Includes:
     case Present:
         return (multipleArgs ? " IN " : (bitwiseMultiples ? " & " : " LIKE "));
-        break;
 
     case Excludes:
     case Absent:
         // Note: the result is not correct in the bitwiseMultiples case!
         return (multipleArgs ? " NOT IN " : (bitwiseMultiples ? " & " : " NOT LIKE "));
-        break;
     }
 
     return QString();
@@ -1463,11 +1455,9 @@ QString combineOperatorString(QMailKey::Combiner op)
     {
     case And:
         return " AND ";
-        break;
 
     case Or:
         return " OR ";
-        break;
 
     case None:
         break;
@@ -1979,7 +1969,8 @@ QMailStorePrivate::Transaction::~Transaction()
 bool QMailStorePrivate::Transaction::commit()
 {
     if (m_initted && !m_committed) {
-        if ((m_committed = m_d->commit())) {
+        m_committed = m_d->commit();
+        if (m_committed) {
             --mutexLockCount;
             if (mutexLockCount == 0)
                 m_d->databaseMutex().unlock();
diff --git a/src/libraries/qmfclient/qmailstore_p.h b/src/libraries/qmfclient/qmailstore_p.h
index 464bce47..4a9d0f02 100644
--- a/src/libraries/qmfclient/qmailstore_p.h
+++ b/src/libraries/qmfclient/qmailstore_p.h
@@ -512,7 +512,7 @@ private:
     static void extractMessageMetaData(const QSqlRecord& r, QMailMessageKey::Properties recordProperties, const QMailMessageKey::Properties& properties, QMailMessageMetaData* metaData);
 
 private:
-    Q_DECLARE_PUBLIC (QMailStore);
+    Q_DECLARE_PUBLIC (QMailStore)
     QMailStore * const q_ptr;
 
     template <typename T, typename KeyType> 
diff --git a/src/libraries/qmfclient/support/qcopchannel_p.h b/src/libraries/qmfclient/support/qcopchannel_p.h
index c632dee1..2f85d59f 100644
--- a/src/libraries/qmfclient/support/qcopchannel_p.h
+++ b/src/libraries/qmfclient/support/qcopchannel_p.h
@@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE
 
 class QEventLoop;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 #define	QCopCmd_RegisterChannel	    1
 #define	QCopCmd_Send		    2
diff --git a/src/libraries/qmfclient/support/qloggers.h b/src/libraries/qmfclient/support/qloggers.h
index 715eb156..8d8bd0db 100644
--- a/src/libraries/qmfclient/support/qloggers.h
+++ b/src/libraries/qmfclient/support/qloggers.h
@@ -208,7 +208,7 @@ public:
         /// Closes file if this object is it's owner.
         ~FileLogger();
 private:
-        Q_DISABLE_COPY(FileLogger);
+        Q_DISABLE_COPY(FileLogger)
         QString name;
         /// File handle
         FILE* f;
@@ -250,7 +250,7 @@ public:
         /// Disconnects from the syslog
         ~SysLogger();
 private:
-        Q_DISABLE_COPY(SysLogger);
+        Q_DISABLE_COPY(SysLogger)
         /// Ident string for syslog
         QByteArray ident;
 };
@@ -283,7 +283,7 @@ inline void BaseLogger<Host, Prefix>::log(const LogLevel _lvl, const char* _fmt,
 
 
    }
-};
+}
 
 /**********************************************************************************************************/
 /*********************************** FileLogger implementation ********************************************/
@@ -299,20 +299,20 @@ inline FileLogger<Prefix>::FileLogger(const QString& _name, const unsigned _flus
         should_close = false;
         BaseLogger< FileLogger<Prefix>, Prefix >::setUnReady(strerror(errno));
     }
-};
+}
 
 template <class Prefix>
 inline FileLogger<Prefix>::FileLogger(FILE* _f, const unsigned _flush_period, const LogLevel _min_lvl, bool _owner)
     : BaseLogger< FileLogger<Prefix>, Prefix >(*this, _min_lvl), name(""), f(_f), should_close(_owner), flush_period(_flush_period)
 {
-};
+}
 
 template <class Prefix>
 inline FileLogger<Prefix>::~FileLogger()
 {
     if(should_close)
         fclose(f);
-};
+}
 
 template <class Prefix>
 inline void FileLogger<Prefix>::doLog(const LogLevel /*lvl*/, const char* fmt, va_list args)
@@ -325,7 +325,7 @@ inline void FileLogger<Prefix>::doLog(const LogLevel /*lvl*/, const char* fmt, v
         do_cntr = 0;
         fflush(f);
     };
-};
+}
 
 #if (!defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN))
 
diff --git a/src/libraries/qmfclient/support/qlogsystem.h b/src/libraries/qmfclient/support/qlogsystem.h
index 267fa2f3..cacaae11 100644
--- a/src/libraries/qmfclient/support/qlogsystem.h
+++ b/src/libraries/qmfclient/support/qlogsystem.h
@@ -54,7 +54,7 @@ extern "C"
 {
 #include <stdarg.h>
 #include <errno.h>
-};
+}
 
 /// This enumeration represents different widely-used log levels
 typedef enum {
@@ -129,7 +129,7 @@ private:
     /// Do not allow to delete object of this class from outside
     ~LogSystem();
 
-    Q_DISABLE_COPY(LogSystem);
+    Q_DISABLE_COPY(LogSystem)
 
     QList<ILogger*> loggers;
 
diff --git a/src/libraries/qmfclient/support/qmaillog.cpp b/src/libraries/qmfclient/support/qmaillog.cpp
index 9e1ccee1..91833833 100644
--- a/src/libraries/qmfclient/support/qmaillog.cpp
+++ b/src/libraries/qmfclient/support/qmaillog.cpp
@@ -85,7 +85,7 @@ namespace
             loggers.addLogger(logger);
         };
     };
-};
+}
 
 #if (!defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN))
 QMF_EXPORT
diff --git a/src/libraries/qmfclient/support/qmaillog.h b/src/libraries/qmfclient/support/qmaillog.h
index 4ec4c2f6..ddceb552 100644
--- a/src/libraries/qmfclient/support/qmaillog.h
+++ b/src/libraries/qmfclient/support/qmaillog.h
@@ -87,7 +87,7 @@ QMF_EXPORT bool qmf_checkLoggingEnabled(const char *category, const bool defValu
         static inline bool enabled() { static char mem=0; if (!mem) { qmf_registerLoggingFlag(&mem); mem=(qmf_checkLoggingEnabled(#dbgcat, deflvl))?3:2; } return mem&1; }\
     };
 
-#define qMailLog(dbgcat) if(!dbgcat##_QLog::enabled()); else dbgcat##_QLog::log(#dbgcat)
+#define qMailLog(dbgcat) if (!dbgcat##_QLog::enabled()) qt_noop(); else dbgcat##_QLog::log(#dbgcat)
 
 // By default, these categories are completely disabled.
 // Any logging statements for these categories will be compiled out of the executable.
diff --git a/src/libraries/qmfclient/support/qmailnamespace.cpp b/src/libraries/qmfclient/support/qmailnamespace.cpp
index 19d491c7..38bdd950 100644
--- a/src/libraries/qmfclient/support/qmailnamespace.cpp
+++ b/src/libraries/qmfclient/support/qmailnamespace.cpp
@@ -65,8 +65,10 @@
 #include <fcntl.h>
 #endif
 
+#ifndef Q_OS_SYMBIAN
 static const char* QMF_DATA_ENV="QMF_DATA";
 static const char* QMF_PLUGINS_ENV="QMF_PLUGINS";
+#endif
 static const char* QMF_SERVER_ENV="QMF_SERVER";
 static const char* QMF_SETTINGS_ENV="QMF_SETTINGS";
 
@@ -189,10 +191,12 @@ bool QMail::fileUnlock(int id)
 
     int result = -1;
 
-    if((result = ::fcntl(id,F_SETLK, &fl)) == -1)
+    result = ::fcntl(id,F_SETLK, &fl);
+    if (result == -1)
         return false;
 
-    if((result = ::close(id)) == -1)
+    result = ::close(id);
+    if (result == -1)
         return false;
 
     return true;
@@ -207,12 +211,13 @@ QString QMail::dataPath()
 {
 #ifdef Q_OS_SYMBIAN
     return QString("\\");
-#endif
+#else
     static QString dataEnv(qgetenv(QMF_DATA_ENV));
     if(!dataEnv.isEmpty())
         return dataEnv + '/';
     //default to ~/.qmf if not env set
     return QDir::homePath() + "/.qmf/";
+#endif
 }
 
 /*!
@@ -230,13 +235,13 @@ QString QMail::pluginsPath()
 {
 #if defined(Q_OS_SYMBIAN)
     return QString("/resource/qt/plugins/qtmail");
-#endif
-    
+#else
     static QString pluginsEnv(qgetenv(QMF_PLUGINS_ENV));
     if(!pluginsEnv.isEmpty())
         return pluginsEnv + '/';
     //default to "." if no env set
     return pluginsEnv;
+#endif
 }
 
 /*!
diff --git a/src/libraries/qmfclient/support/qmailnamespace.h b/src/libraries/qmfclient/support/qmailnamespace.h
index a37d3b76..b68293a3 100644
--- a/src/libraries/qmfclient/support/qmailnamespace.h
+++ b/src/libraries/qmfclient/support/qmailnamespace.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 class QSqlDatabase;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 #endif
 
 namespace QMail
diff --git a/src/libraries/qmfclient/support/qmailpluginmanager.cpp b/src/libraries/qmfclient/support/qmailpluginmanager.cpp
index 423fd6c7..444e185b 100644
--- a/src/libraries/qmfclient/support/qmailpluginmanager.cpp
+++ b/src/libraries/qmfclient/support/qmailpluginmanager.cpp
@@ -117,8 +117,7 @@ QStringList pluginFilePatterns()
 
 #ifdef Q_OS_SYMBIAN
     return QStringList() << "*.qtplugin";
-#endif
-#ifdef Q_OS_WIN
+#elif defined(Q_OS_WIN)
 	return QStringList() << QString("*%1.dll").arg(debugSuffix) << QString("*%1.DLL").arg(debugSuffix);
 #elif defined(Q_OS_MAC)
 	return QStringList() << "*.dylib";
diff --git a/src/libraries/qmfmessageserver/qmailauthenticator.cpp b/src/libraries/qmfmessageserver/qmailauthenticator.cpp
index 79b9c167..2002e5cf 100644
--- a/src/libraries/qmfmessageserver/qmailauthenticator.cpp
+++ b/src/libraries/qmfmessageserver/qmailauthenticator.cpp
@@ -106,10 +106,10 @@ static QByteArray cramMd5Response(const QByteArray &nonce, const QByteArray &nam
 */
 bool QMailAuthenticator::useEncryption(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities)
 {
-    return false;
-
     Q_UNUSED(svcCfg)
     Q_UNUSED(capabilities)
+
+    return false;
 }
 
 /*!
@@ -119,14 +119,14 @@ bool QMailAuthenticator::useEncryption(const QMailAccountConfiguration::ServiceC
 */
 QByteArray QMailAuthenticator::getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities)
 {
+    Q_UNUSED(capabilities)
+
     QMailServiceConfiguration configuration(svcCfg);
     if (configuration.value("authentication") == QString::number(QMail::CramMd5Mechanism))
         return "CRAM-MD5";
 
     // Unknown service type and/or authentication type
     return QByteArray();
-
-    Q_UNUSED(capabilities)
 }
 
 /*!
diff --git a/src/libraries/qmfmessageserver/qmailmessageservice.cpp b/src/libraries/qmfmessageserver/qmailmessageservice.cpp
index a6c15179..fa8ffb34 100644
--- a/src/libraries/qmfmessageserver/qmailmessageservice.cpp
+++ b/src/libraries/qmfmessageserver/qmailmessageservice.cpp
@@ -445,12 +445,12 @@ QMailStore::MessageRemovalOption QMailMessageSource::messageRemovalOption() cons
 */
 bool QMailMessageSource::retrieveFolderList(const QMailAccountId &accountId, const QMailFolderId &folderId, bool descending)
 {
-    notImplemented();
-    return false;
-
     Q_UNUSED(accountId)
     Q_UNUSED(folderId)
     Q_UNUSED(descending)
+
+    notImplemented();
+    return false;
 }
 
 /*!
@@ -486,13 +486,13 @@ bool QMailMessageSource::retrieveFolderList(const QMailAccountId &accountId, con
 */
 bool QMailMessageSource::retrieveMessageList(const QMailAccountId &accountId, const QMailFolderId &folderId, uint minimum, const QMailMessageSortKey &sort)
 {
-    notImplemented();
-    return false;
-
     Q_UNUSED(accountId)
     Q_UNUSED(folderId)
     Q_UNUSED(minimum)
     Q_UNUSED(sort)
+
+    notImplemented();
+    return false;
 }
 
 /*!
@@ -519,11 +519,11 @@ bool QMailMessageSource::retrieveMessageList(const QMailAccountId &accountId, co
 */
 bool QMailMessageSource::retrieveMessages(const QMailMessageIdList &ids, QMailRetrievalAction::RetrievalSpecification spec)
 {
-    notImplemented();
-    return false;
-
     Q_UNUSED(ids)
     Q_UNUSED(spec)
+
+    notImplemented();
+    return false;
 }
 
 /*!
@@ -539,10 +539,10 @@ bool QMailMessageSource::retrieveMessages(const QMailMessageIdList &ids, QMailRe
 */
 bool QMailMessageSource::retrieveMessagePart(const QMailMessagePart::Location &partLocation)
 {
+    Q_UNUSED(partLocation)
+
     notImplemented();
     return false;
-
-    Q_UNUSED(partLocation)
 }
 
 /*!
@@ -559,11 +559,11 @@ bool QMailMessageSource::retrieveMessagePart(const QMailMessagePart::Location &p
 */
 bool QMailMessageSource::retrieveMessageRange(const QMailMessageId &messageId, uint minimum)
 {
-    notImplemented();
-    return false;
-
     Q_UNUSED(messageId)
     Q_UNUSED(minimum)
+
+    notImplemented();
+    return false;
 }
 
 /*!
@@ -580,11 +580,11 @@ bool QMailMessageSource::retrieveMessageRange(const QMailMessageId &messageId, u
 */
 bool QMailMessageSource::retrieveMessagePartRange(const QMailMessagePart::Location &partLocation, uint minimum)
 {
-    notImplemented();
-    return false;
-
     Q_UNUSED(partLocation)
     Q_UNUSED(minimum)
+
+    notImplemented();
+    return false;
 }
 
 /*!
@@ -608,10 +608,10 @@ bool QMailMessageSource::retrieveMessagePartRange(const QMailMessagePart::Locati
 */
 bool QMailMessageSource::retrieveAll(const QMailAccountId &accountId)
 {
+    Q_UNUSED(accountId)
+
     notImplemented();
     return false;
-
-    Q_UNUSED(accountId)
 }
 
 /*!
@@ -626,10 +626,10 @@ bool QMailMessageSource::retrieveAll(const QMailAccountId &accountId)
 */
 bool QMailMessageSource::exportUpdates(const QMailAccountId &accountId)
 {
+    Q_UNUSED(accountId)
+
     notImplemented();
     return false;
-
-    Q_UNUSED(accountId)
 }
 
 /*!
@@ -656,10 +656,10 @@ bool QMailMessageSource::exportUpdates(const QMailAccountId &accountId)
 */
 bool QMailMessageSource::synchronize(const QMailAccountId &accountId)
 {
+    Q_UNUSED(accountId)
+
     notImplemented();
     return false;
-
-    Q_UNUSED(accountId)
 }
 
 /*!
@@ -752,12 +752,12 @@ bool QMailMessageSource::flagMessages(const QMailMessageIdList &ids, quint64 set
 */
 bool QMailMessageSource::createFolder(const QString &name, const QMailAccountId &accountId, const QMailFolderId &parentId)
 {
-    notImplemented();
-    return false;
-
     Q_UNUSED(name)
     Q_UNUSED(accountId)
     Q_UNUSED(parentId)
+
+    notImplemented();
+    return false;
 }
 
 /*!
@@ -772,11 +772,11 @@ bool QMailMessageSource::createFolder(const QString &name, const QMailAccountId
 */
 bool QMailMessageSource::renameFolder(const QMailFolderId &folderId, const QString &name)
 {
-    notImplemented();
-    return false;
-
     Q_UNUSED(folderId)
     Q_UNUSED(name)
+
+    notImplemented();
+    return false;
 }
 
 /*!
@@ -791,10 +791,10 @@ bool QMailMessageSource::renameFolder(const QMailFolderId &folderId, const QStri
 */
 bool QMailMessageSource::deleteFolder(const QMailFolderId &folderId)
 {
+    Q_UNUSED(folderId)
+
     notImplemented();
     return false;
-
-    Q_UNUSED(folderId)
 }
 
 
@@ -820,12 +820,12 @@ bool QMailMessageSource::deleteFolder(const QMailFolderId &folderId)
 */
 bool QMailMessageSource::searchMessages(const QMailMessageKey &searchCriteria, const QString &bodyText, const QMailMessageSortKey &sort)
 {
-    notImplemented();
-    return false;
-
     Q_UNUSED(searchCriteria)
     Q_UNUSED(bodyText)
     Q_UNUSED(sort)
+
+    notImplemented();
+    return false;
 }
 
 /*!
@@ -857,10 +857,10 @@ bool QMailMessageSource::cancelSearch()
 */
 bool QMailMessageSource::prepareMessages(const QList<QPair<QMailMessagePart::Location, QMailMessagePart::Location> > &ids)
 {
+    Q_UNUSED(ids)
+
     notImplemented();
     return false;
-
-    Q_UNUSED(ids)
 }
 
 /*!
@@ -877,12 +877,12 @@ bool QMailMessageSource::prepareMessages(const QList<QPair<QMailMessagePart::Loc
 */
 bool QMailMessageSource::protocolRequest(const QMailAccountId &accountId, const QString &request, const QVariant &data)
 {
-    notImplemented();
-    return false;
-
     Q_UNUSED(accountId)
     Q_UNUSED(request)
     Q_UNUSED(data)
+
+    notImplemented();
+    return false;
 }
 
 /*!
@@ -1122,10 +1122,10 @@ QMailMessageSink::~QMailMessageSink()
 */
 bool QMailMessageSink::transmitMessages(const QMailMessageIdList &ids)
 {
+    Q_UNUSED(ids)
+
     notImplemented();
     return false;
-
-    Q_UNUSED(ids)
 }
 
 /*! \internal */
@@ -1464,231 +1464,231 @@ QStringList QMailMessageServiceConfigurator::serviceConstraints(QMailMessageServ
 
 bool QMailMessageSource::retrieveFolderList(const QMailAccountId &accountId, const QMailFolderId &folderId, bool descending, quint64 action)
 {
-    notImplemented(action);
-    return false;
-
     Q_UNUSED(accountId)
     Q_UNUSED(folderId)
     Q_UNUSED(descending)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::retrieveMessageList(const QMailAccountId &accountId, const QMailFolderId &folderId, uint minimum, const QMailMessageSortKey &sort, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::retrieveMessageList(const QMailAccountId &accountId, const QMailFolderId &folderId, uint minimum, const QMailMessageSortKey &sort, quint64 action)
+{
     Q_UNUSED(accountId)
     Q_UNUSED(folderId)
     Q_UNUSED(minimum)
     Q_UNUSED(sort)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::retrieveMessages(const QMailMessageIdList &messageIds, QMailRetrievalAction::RetrievalSpecification spec, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::retrieveMessages(const QMailMessageIdList &messageIds, QMailRetrievalAction::RetrievalSpecification spec, quint64 action)
+{
     Q_UNUSED(messageIds)
     Q_UNUSED(spec)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::retrieveMessagePart(const QMailMessagePart::Location &partLocation, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::retrieveMessagePart(const QMailMessagePart::Location &partLocation, quint64 action)
+{
     Q_UNUSED(partLocation)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::retrieveMessageRange(const QMailMessageId &messageId, uint minimum, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::retrieveMessageRange(const QMailMessageId &messageId, uint minimum, quint64 action)
+{
     Q_UNUSED(messageId)
     Q_UNUSED(minimum)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::retrieveMessagePartRange(const QMailMessagePart::Location &partLocation, uint minimum, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::retrieveMessagePartRange(const QMailMessagePart::Location &partLocation, uint minimum, quint64 action)
+{
     Q_UNUSED(partLocation)
     Q_UNUSED(minimum)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::retrieveAll(const QMailAccountId &accountId, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::retrieveAll(const QMailAccountId &accountId, quint64 action)
+{
     Q_UNUSED(accountId)
     Q_UNUSED(action)
+
+    notImplemented(action);
+    return false;
 }
 
 bool QMailMessageSource::exportUpdates(const QMailAccountId &accountId, quint64 action)
 {
-    notImplemented(action);
-    return false;
-    
     Q_UNUSED(accountId)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::synchronize(const QMailAccountId &accountId, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::synchronize(const QMailAccountId &accountId, quint64 action)
+{
     Q_UNUSED(accountId)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::deleteMessages(const QMailMessageIdList &ids, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::deleteMessages(const QMailMessageIdList &ids, quint64 action)
+{
     Q_UNUSED(ids)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::copyMessages(const QMailMessageIdList &ids, const QMailFolderId &destinationId, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::copyMessages(const QMailMessageIdList &ids, const QMailFolderId &destinationId, quint64 action)
+{
     Q_UNUSED(ids)
     Q_UNUSED(destinationId)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::moveMessages(const QMailMessageIdList &ids, const QMailFolderId &destinationId, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::moveMessages(const QMailMessageIdList &ids, const QMailFolderId &destinationId, quint64 action)
+{
     Q_UNUSED(ids)
     Q_UNUSED(destinationId)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::flagMessages(const QMailMessageIdList &ids, quint64 setMask, quint64 unsetMask, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::flagMessages(const QMailMessageIdList &ids, quint64 setMask, quint64 unsetMask, quint64 action)
+{
     Q_UNUSED(ids)
     Q_UNUSED(setMask)
     Q_UNUSED(unsetMask)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::createFolder(const QString &name, const QMailAccountId &accountId, const QMailFolderId &parentId, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::createFolder(const QString &name, const QMailAccountId &accountId, const QMailFolderId &parentId, quint64 action)
+{
     Q_UNUSED(name)
     Q_UNUSED(accountId)
     Q_UNUSED(parentId)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::renameFolder(const QMailFolderId &folderId, const QString &name, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::renameFolder(const QMailFolderId &folderId, const QString &name, quint64 action)
+{
     Q_UNUSED(folderId)
     Q_UNUSED(name)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::deleteFolder(const QMailFolderId &folderId, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::deleteFolder(const QMailFolderId &folderId, quint64 action)
+{
     Q_UNUSED(folderId)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::searchMessages(const QMailMessageKey &filter, const QString& bodyText, const QMailMessageSortKey &sort, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::searchMessages(const QMailMessageKey &filter, const QString& bodyText, const QMailMessageSortKey &sort, quint64 action)
+{
     Q_UNUSED(filter)
     Q_UNUSED(bodyText)
     Q_UNUSED(sort)
     Q_UNUSED(action)
+
+    notImplemented(action);
+    return false;
 }
 
 bool QMailMessageSource::cancelSearch(quint64 action)
 {
+    Q_UNUSED(action)
+
     notImplemented(action);
     return false;
-
-    Q_UNUSED(action)
 }
 
 bool QMailMessageSource::prepareMessages(const QList<QPair<QMailMessagePart::Location, QMailMessagePart::Location> > &ids, quint64 action)
 {
-    notImplemented(action);
-    return false;
-
     Q_UNUSED(ids)
     Q_UNUSED(action)
-}
 
-bool QMailMessageSource::protocolRequest(const QMailAccountId &accountId, const QString &request, const QVariant &data, quint64 action)
-{
     notImplemented(action);
     return false;
+}
 
+bool QMailMessageSource::protocolRequest(const QMailAccountId &accountId, const QString &request, const QVariant &data, quint64 action)
+{
     Q_UNUSED(accountId)
     Q_UNUSED(request)
     Q_UNUSED(data)
     Q_UNUSED(action)
+
+    notImplemented(action);
+    return false;
 }
 
 void QMailMessageSource::notImplemented(quint64 action)
 {
-    notImplemented();
-
     Q_UNUSED(action)
+
+    notImplemented();
 }
 
 bool QMailMessageSink::transmitMessages(const QMailMessageIdList &ids, quint64 action)
 {
-    notImplemented(action);
-    return false;
-
     Q_UNUSED(ids)
     Q_UNUSED(action)
+
+    notImplemented(action);
+    return false;
 }
 
 void QMailMessageSink::notImplemented(quint64 action)
 {
-    notImplemented();
-
     Q_UNUSED(action)
+
+    notImplemented();
 }
 
 bool QMailMessageService::cancelOperation(QMailServiceAction::Status::ErrorCode code, const QString &text, quint64 action)
 {
-    Q_ASSERT(0);
-    return false;
-
     Q_UNUSED(code)
     Q_UNUSED(text)
     Q_UNUSED(action)
+
+    Q_ASSERT(0);
+    return false;
 }
diff --git a/src/libraries/qmfmessageserver/qmailtransport.h b/src/libraries/qmfmessageserver/qmailtransport.h
index 3ef37a23..aa12da70 100644
--- a/src/libraries/qmfmessageserver/qmailtransport.h
+++ b/src/libraries/qmfmessageserver/qmailtransport.h
@@ -56,7 +56,7 @@ class QSslSocket;
 class QSslError;
 #endif
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class MESSAGESERVER_EXPORT QMailTransport : public QObject
 {
diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.h b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.h
index 7b803fbe..d923dca0 100644
--- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.h
+++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 class QFile;
 
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 class QmfStorageManager : public QObject, public QMailContentManager
 {