summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Montel <[email protected]>2018-02-13 09:01:08 +0100
committerLaurent Montel <[email protected]>2018-02-13 09:01:16 +0100
commit87a4b4a896efc1e46042a3e17ce6f5940bcf53ee (patch)
tree0a4fa8fe159f9f23f3507e7249fcbd842b4a7225
parentefb56a365b32a59f60b33b5ca090d00a48fe3a51 (diff)
Fix some warnings
-rw-r--r--src/editor/kmcomposerwin.cpp1
-rw-r--r--src/identity/newidentitydialog.cpp6
-rw-r--r--src/kmkernel.cpp2
3 files changed, 4 insertions, 5 deletions
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index 972fff4..741bb83 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -3449,7 +3449,6 @@ void KMComposerWin::slotKeyForMailBoxResult(const GpgME::KeyListResult &, const
break;
case GpgME::UserID::Undefined:
case GpgME::UserID::Unknown:
- default:
overlay = QIcon::fromTheme(QStringLiteral("emblem-information"));
tooltip = i18n("The email to this recipient will be encrypted, but the security of the encryption is unknown "
"(the encryption key could not be verified). Click the icon for details.");
diff --git a/src/identity/newidentitydialog.cpp b/src/identity/newidentitydialog.cpp
index 78724e6..71d9faf 100644
--- a/src/identity/newidentitydialog.cpp
+++ b/src/identity/newidentitydialog.cpp
@@ -127,9 +127,9 @@ void NewIdentityDialog::slotHelp()
NewIdentityDialog::DuplicateMode NewIdentityDialog::duplicateMode() const
{
const int id = mButtonGroup->checkedId();
- assert(id == (int)Empty
- || id == (int)ControlCenter
- || id == (int)ExistingEntry);
+ assert(id == static_cast<int>(Empty)
+ || id == static_cast<int>(ControlCenter)
+ || id == static_cast<int>(ExistingEntry));
return static_cast<DuplicateMode>(id);
}
diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
index 6b80750..0440547 100644
--- a/src/kmkernel.cpp
+++ b/src/kmkernel.cpp
@@ -1100,7 +1100,7 @@ void KMKernel::cleanup()
OrgFreedesktopAkonadiMailFilterAgentInterface mailFilterInterface(QStringLiteral("org.freedesktop.Akonadi.MailFilterAgent"), QStringLiteral(
"/MailFilterAgent"), QDBusConnection::sessionBus(), this);
if (mailFilterInterface.isValid()) {
- mailFilterInterface.expunge((qlonglong)trashCollection.id());
+ mailFilterInterface.expunge(static_cast<qlonglong>(trashCollection.id()));
} else {
qCWarning(KMAIL_LOG) << "Mailfilter is not active";
}