Commit f7e54fe0 authored by Laurent Montel's avatar Laurent Montel 😁

Clean up code

parent f206915d
......@@ -20,7 +20,7 @@
#include <kiconloader.h>
namespace KMail {
using namespace KMail;
void insertLibraryIcons()
{
static const char *const iconPath[] = {
......@@ -36,4 +36,4 @@ void insertLibraryIcons()
il->addAppDir(QLatin1String(iconPath[i]));
}
}
}
......@@ -56,11 +56,6 @@ using namespace KMail;
KMSystemTray::KMSystemTray(QObject *parent)
: KStatusNotifierItem(parent)
, mIcon(QIcon::fromTheme(QStringLiteral("mail-mark-unread-new")))
, mDesktopOfMainWin(0)
, mCount(0)
, mIconNotificationsEnabled(true)
, mNewMessagesPopup(nullptr)
, mSendQueued(nullptr)
{
qCDebug(KMAIL_LOG) << "Initting systray";
setToolTipTitle(i18n("KMail"));
......
......@@ -53,7 +53,7 @@ public:
void updateSystemTray();
private Q_SLOTS:
private:
void slotActivated();
void slotContextMenuAboutToShow();
void slotSelectCollection(QAction *act);
......@@ -61,7 +61,6 @@ private Q_SLOTS:
void slotCollectionStatisticsChanged(Akonadi::Collection::Id, const Akonadi::CollectionStatistics &);
void slotGeneralFontChanged();
private:
bool mainWindowIsOnCurrentDesktop();
bool buildPopupMenu();
void updateCount();
......@@ -69,14 +68,12 @@ private:
void unreadMail(const QAbstractItemModel *model, const QModelIndex &parentIndex = QModelIndex());
bool excludeFolder(const Akonadi::Collection &collection) const;
bool ignoreNewMailInFolder(const Akonadi::Collection &collection);
private:
QIcon mIcon;
int mDesktopOfMainWin;
int mDesktopOfMainWin = 0;
int mCount;
int mCount = 0;
bool mIconNotificationsEnabled;
bool mIconNotificationsEnabled =true;
QMenu *mNewMessagesPopup = nullptr;
QAction *mSendQueued = nullptr;
......
......@@ -41,7 +41,7 @@
#include <QDBusConnection>
namespace KMail {
using namespace KMail;
MailServiceImpl::MailServiceImpl()
{
new ServiceAdaptor(this);
......@@ -129,4 +129,3 @@ bool MailServiceImpl::sendMessage(const QString &from, const QString &to, const
KMail::makeComposer(msg, false, false);
return true;
}
}//end namespace KMail
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment