summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-09-20 07:58:43 +0200
committerMontel Laurent <[email protected]>2017-09-20 07:58:43 +0200
commit5539a0b5b7f90d41fbbfcc235ba27a1ad3cbec07 (patch)
treeea8d32f39ccb6ed62e6aec808ccd4e2aa7c5be49
parentf7e54fe0cb50e5a43254bba13debe0432c5c00e8 (diff)
Continue to clean up code
-rw-r--r--src/kmkernel.h2
-rw-r--r--src/kmstartup.cpp4
-rw-r--r--src/messageactions.h2
-rw-r--r--src/undostack.h9
4 files changed, 8 insertions, 9 deletions
diff --git a/src/kmkernel.h b/src/kmkernel.h
index 1751428..65073d4 100644
--- a/src/kmkernel.h
+++ b/src/kmkernel.h
@@ -521,7 +521,7 @@ private:
MailCommon::JobScheduler *mJobScheduler = nullptr;
MailServiceImpl *mMailService = nullptr;
- bool mSystemNetworkStatus;
+ bool mSystemNetworkStatus = true;
KMail::KMSystemTray *mSystemTray = nullptr;
QHash<QString, KPIM::ProgressItem::CryptoStatus> mResourceCryptoSettingCache;
diff --git a/src/kmstartup.cpp b/src/kmstartup.cpp
index 721049b..92e0e4c 100644
--- a/src/kmstartup.cpp
+++ b/src/kmstartup.cpp
@@ -20,7 +20,7 @@
#include <kiconloader.h>
-using namespace KMail;
+namespace KMail {
void insertLibraryIcons()
{
static const char *const iconPath[] = {
@@ -36,4 +36,4 @@ void insertLibraryIcons()
il->addAppDir(QLatin1String(iconPath[i]));
}
}
-
+}
diff --git a/src/messageactions.h b/src/messageactions.h
index 491c232..4abf1ac 100644
--- a/src/messageactions.h
+++ b/src/messageactions.h
@@ -134,9 +134,9 @@ private Q_SLOTS:
void slotAddFollowupReminder();
private:
QList<QAction *> mMailListActionList;
- QWidget *mParent = nullptr;
Akonadi::Item mCurrentItem;
Akonadi::Item::List mVisibleItems;
+ QWidget *mParent = nullptr;
KMReaderWin *mMessageView = nullptr;
KActionMenu *mReplyActionMenu = nullptr;
diff --git a/src/undostack.h b/src/undostack.h
index e503ed3..67f858b 100644
--- a/src/undostack.h
+++ b/src/undostack.h
@@ -64,17 +64,16 @@ public:
QString undoInfo() const;
-protected Q_SLOTS:
- void slotMoveResult(KJob *);
+Q_SIGNALS:
+ void undoStackChanged();
-protected:
+private:
+ void slotMoveResult(KJob *);
QList<UndoInfo *> mStack;
int mSize = 0;
int mLastId = 0;
UndoInfo *mCachedInfo = nullptr;
-Q_SIGNALS:
- void undoStackChanged();
};
}