Reorder variable

collectionpage/collectionmailinglistpage.cpp

@@ -48,7 +48,7 @@ using namespace MailCommon;
 
 
 CollectionMailingListPage::CollectionMailingListPage(QWidget * parent) :
-    CollectionPropertiesPage( parent ), mLastItem(0), mGroupWidget(0), changed(false)
+    CollectionPropertiesPage( parent ), mGroupWidget(0), mLastItem(0), changed(false)
 {
     setObjectName( QLatin1String( "KMail::CollectionMailingListPage" ) );
     setPageTitle( i18nc( "@title:tab Mailing list settings for a folder.", "Mailing List" ) );

collectionpage/collectionmailinglistpage.h

@@ -75,7 +75,6 @@ private:
     Akonadi::Collection mCurrentCollection;
     QSharedPointer<MailCommon::FolderCollection> mFolder;
 
-    int           mLastItem;
     MailingList   mMailingList;
     QCheckBox    *mHoldsMailingList;
     KComboBox    *mMLHandlerCombo;
@@ -84,6 +83,7 @@ private:
     KEditListWidget *mEditList;
     KSqueezedTextLabel *mMLId;
     QWidget *mGroupWidget;
+    int           mLastItem;
     bool changed;
 };
 

collectionpage/collectiontemplatespage.h

@@ -48,8 +48,8 @@ private:
     void init();
     QCheckBox* mCustom;
     TemplateParser::TemplatesConfiguration* mWidget;
-    uint mIdentity;
     QString mCollectionId;
+    uint mIdentity;
     bool mIsLocalSystemFolder;
     bool mChanged;
 };

collectionpage/collectionviewpage.h

@@ -55,7 +55,6 @@ public slots:
 
 private:
     void init(const Akonadi::Collection&);
-    bool mIsLocalSystemFolder;
     QCheckBox   *mIconsCheckBox;
     QLabel      *mNormalIconLabel;
     KIconButton *mNormalIconButton;
@@ -68,6 +67,7 @@ private:
     MessageList::Utils::ThemeComboBox *mThemeComboBox;
     Akonadi::Collection mCurrentCollection;
     int mShowSenderReceiverValue;
+    bool mIsLocalSystemFolder;
 };
 
 AKONADI_COLLECTION_PROPERTIES_PAGE_FACTORY( CollectionViewPageFactory, CollectionViewPage )

folderarchive/folderarchiveaccountinfo.cpp

@@ -20,16 +20,16 @@
 #include <KConfigGroup>
 
 FolderArchiveAccountInfo::FolderArchiveAccountInfo()
-    : mArchiveType(UniqueFolder),
+    : mArchiveTopLevelCollectionId(-1),
-      mArchiveTopLevelCollectionId(-1),
+      mArchiveType(UniqueFolder),
       mEnabled(false),
       mKeepExistingStructure(false)
 {
 }
 
 FolderArchiveAccountInfo::FolderArchiveAccountInfo(const KConfigGroup &config)
-    : mArchiveType(UniqueFolder),
+    : mArchiveTopLevelCollectionId(-1),
-      mArchiveTopLevelCollectionId(-1),
+      mArchiveType(UniqueFolder),
       mEnabled(false),
       mKeepExistingStructure(false)
 {

folderarchive/folderarchiveaccountinfo.h

@@ -57,9 +57,9 @@ public:
     bool operator==( const FolderArchiveAccountInfo& other ) const;
 
 private:
-    FolderArchiveAccountInfo::FolderArchiveType mArchiveType;
     Akonadi::Collection::Id mArchiveTopLevelCollectionId;
     QString mInstanceName;
+    FolderArchiveAccountInfo::FolderArchiveType mArchiveType;
     bool mEnabled;
     bool mKeepExistingStructure;
 };