From 1a20906fc7da1569e1316f9576552fe2db14eb75 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 8 Feb 2018 22:45:37 +0100 Subject: [PATCH] Fix some warning --- agents/archivemailagent/archivemailagent.cpp | 2 +- agents/archivemailagent/archivemailagentutil.cpp | 3 --- agents/archivemailagent/archivemailinfo.cpp | 4 ++-- agents/archivemailagent/archivemailwidget.cpp | 4 ++-- agents/archivemailagent/widgets/formatcombobox.cpp | 12 ++++++------ agents/archivemailagent/widgets/unitcombobox.cpp | 10 +++++----- .../followupreminderagent/followupreminderagent.cpp | 2 +- agents/mailfilteragent/filterlogdialog.cpp | 2 +- agents/mailfilteragent/filtermanager.cpp | 8 ++++---- agents/sendlateragent/sendlateragent.cpp | 2 +- agents/sendlateragent/sendlatermanager.cpp | 2 +- src/kmlaunchexternalcomponent.cpp | 8 ++++---- src/searchdialog/kmailsearchpatternedit.cpp | 2 +- src/undostack.cpp | 2 +- 14 files changed, 30 insertions(+), 33 deletions(-) diff --git a/agents/archivemailagent/archivemailagent.cpp b/agents/archivemailagent/archivemailagent.cpp index e7f9c7439..eba4a33f5 100644 --- a/agents/archivemailagent/archivemailagent.cpp +++ b/agents/archivemailagent/archivemailagent.cpp @@ -139,7 +139,7 @@ void ArchiveMailAgent::reload() void ArchiveMailAgent::configure(WId windowId) { - showConfigureDialog((qulonglong)windowId); + showConfigureDialog(static_cast(windowId)); } void ArchiveMailAgent::pause() diff --git a/agents/archivemailagent/archivemailagentutil.cpp b/agents/archivemailagent/archivemailagentutil.cpp index d581b43cc..a8b997097 100644 --- a/agents/archivemailagent/archivemailagentutil.cpp +++ b/agents/archivemailagent/archivemailagentutil.cpp @@ -36,9 +36,6 @@ QDate ArchiveMailAgentUtil::diffDate(ArchiveMailInfo *info) case ArchiveMailInfo::ArchiveYears: diffDate = diffDate.addYears(info->archiveAge()); break; - default: - qCDebug(ARCHIVEMAILAGENT_LOG) << "archiveUnit not defined :" << info->archiveUnit(); - break; } return diffDate; } diff --git a/agents/archivemailagent/archivemailinfo.cpp b/agents/archivemailagent/archivemailinfo.cpp index 213441d3b..be98c35ad 100644 --- a/agents/archivemailagent/archivemailinfo.cpp +++ b/agents/archivemailagent/archivemailinfo.cpp @@ -189,8 +189,8 @@ void ArchiveMailInfo::writeConfig(KConfigGroup &config) } config.writeEntry("saveSubCollection", mSaveSubCollection); - config.writeEntry("archiveType", (int)mArchiveType); - config.writeEntry("archiveUnit", (int)mArchiveUnit); + config.writeEntry("archiveType", static_cast(mArchiveType)); + config.writeEntry("archiveUnit", static_cast(mArchiveUnit)); config.writeEntry("saveCollectionId", mSaveCollectionId); config.writeEntry("archiveAge", mArchiveAge); config.writeEntry("maximumArchiveCount", mMaximumArchiveCount); diff --git a/agents/archivemailagent/archivemailwidget.cpp b/agents/archivemailagent/archivemailwidget.cpp index 3ef45f87a..a8951d574 100644 --- a/agents/archivemailagent/archivemailwidget.cpp +++ b/agents/archivemailagent/archivemailwidget.cpp @@ -178,7 +178,7 @@ void ArchiveMailWidget::createOrUpdateItem(ArchiveMailInfo *info, ArchiveMailIte void ArchiveMailWidget::updateDiffDate(ArchiveMailItem *item, ArchiveMailInfo *info) { const QDate diffDate = ArchiveMailAgentUtil::diffDate(info); - const int diff = QDate::currentDate().daysTo(diffDate); + const qint64 diff = QDate::currentDate().daysTo(diffDate); item->setText(ArchiveMailWidget::NextArchive, i18np("Tomorrow", "%1 days", diff)); if (diff < 0) { if (info->isEnabled()) { @@ -252,7 +252,7 @@ void ArchiveMailWidget::slotModifyItem() void ArchiveMailWidget::slotAddItem() { - QPointer dialog = new AddArchiveMailDialog(0, this); + QPointer dialog = new AddArchiveMailDialog(nullptr, this); if (dialog->exec()) { ArchiveMailInfo *info = dialog->info(); if (verifyExistingArchive(info)) { diff --git a/agents/archivemailagent/widgets/formatcombobox.cpp b/agents/archivemailagent/widgets/formatcombobox.cpp index d16d64db0..652d6c262 100644 --- a/agents/archivemailagent/widgets/formatcombobox.cpp +++ b/agents/archivemailagent/widgets/formatcombobox.cpp @@ -24,11 +24,11 @@ FormatComboBox::FormatComboBox(QWidget *parent) : QComboBox(parent) { // These combobox values have to stay in sync with the ArchiveType enum from BackupJob! - addItem(i18n("Compressed Zip Archive (.zip)"), (int)MailCommon::BackupJob::Zip); - addItem(i18n("Uncompressed Archive (.tar)"), (int)MailCommon::BackupJob::Tar); - addItem(i18n("BZ2-Compressed Tar Archive (.tar.bz2)"), (int)MailCommon::BackupJob::TarBz2); - addItem(i18n("GZ-Compressed Tar Archive (.tar.gz)"), (int)MailCommon::BackupJob::TarGz); - setCurrentIndex(findData((int)MailCommon::BackupJob::TarBz2)); + addItem(i18n("Compressed Zip Archive (.zip)"), static_cast(MailCommon::BackupJob::Zip)); + addItem(i18n("Uncompressed Archive (.tar)"), static_cast(MailCommon::BackupJob::Tar)); + addItem(i18n("BZ2-Compressed Tar Archive (.tar.bz2)"), static_cast(MailCommon::BackupJob::TarBz2)); + addItem(i18n("GZ-Compressed Tar Archive (.tar.gz)"), static_cast(MailCommon::BackupJob::TarGz)); + setCurrentIndex(findData(static_cast(MailCommon::BackupJob::TarBz2))); } FormatComboBox::~FormatComboBox() @@ -37,7 +37,7 @@ FormatComboBox::~FormatComboBox() void FormatComboBox::setFormat(MailCommon::BackupJob::ArchiveType type) { - const int index = findData((int)type); + const int index = findData(static_cast(type)); if (index != -1) { setCurrentIndex(index); } else { diff --git a/agents/archivemailagent/widgets/unitcombobox.cpp b/agents/archivemailagent/widgets/unitcombobox.cpp index 6c2b85cf6..f9fe186c4 100644 --- a/agents/archivemailagent/widgets/unitcombobox.cpp +++ b/agents/archivemailagent/widgets/unitcombobox.cpp @@ -23,10 +23,10 @@ UnitComboBox::UnitComboBox(QWidget *parent) : QComboBox(parent) { - addItem(i18n("Days"), (int)ArchiveMailInfo::ArchiveDays); - addItem(i18n("Weeks"), (int)ArchiveMailInfo::ArchiveWeeks); - addItem(i18n("Months"), (int)ArchiveMailInfo::ArchiveMonths); - addItem(i18n("Years"), (int)ArchiveMailInfo::ArchiveYears); + addItem(i18n("Days"), static_cast(ArchiveMailInfo::ArchiveDays)); + addItem(i18n("Weeks"), static_cast(ArchiveMailInfo::ArchiveWeeks)); + addItem(i18n("Months"), static_cast(ArchiveMailInfo::ArchiveMonths)); + addItem(i18n("Years"), static_cast(ArchiveMailInfo::ArchiveYears)); } UnitComboBox::~UnitComboBox() @@ -35,7 +35,7 @@ UnitComboBox::~UnitComboBox() void UnitComboBox::setUnit(ArchiveMailInfo::ArchiveUnit unit) { - const int index = findData((int)unit); + const int index = findData(static_cast(unit)); if (index != -1) { setCurrentIndex(index); } else { diff --git a/agents/followupreminderagent/followupreminderagent.cpp b/agents/followupreminderagent/followupreminderagent.cpp index 5d2bca840..fdfd23c1c 100644 --- a/agents/followupreminderagent/followupreminderagent.cpp +++ b/agents/followupreminderagent/followupreminderagent.cpp @@ -119,7 +119,7 @@ void FollowUpReminderAgent::showConfigureDialog(qlonglong windowId) void FollowUpReminderAgent::configure(WId windowId) { - showConfigureDialog((qulonglong)windowId); + showConfigureDialog(static_cast(windowId)); } void FollowUpReminderAgent::itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) diff --git a/agents/mailfilteragent/filterlogdialog.cpp b/agents/mailfilteragent/filterlogdialog.cpp index cdcb0a33e..7acdab186 100644 --- a/agents/mailfilteragent/filterlogdialog.cpp +++ b/agents/mailfilteragent/filterlogdialog.cpp @@ -257,7 +257,7 @@ void FilterLogDialog::writeConfig() group.writeEntry("LogRuleResult", FilterLog::instance()->isContentTypeEnabled(FilterLog::RuleResult)); group.writeEntry("LogPatternResult", FilterLog::instance()->isContentTypeEnabled(FilterLog::PatternResult)); group.writeEntry("LogAppliedAction", FilterLog::instance()->isContentTypeEnabled(FilterLog::AppliedAction)); - group.writeEntry("maxLogSize", (int)(FilterLog::instance()->maxLogSize())); + group.writeEntry("maxLogSize", static_cast(FilterLog::instance()->maxLogSize())); group.sync(); } diff --git a/agents/mailfilteragent/filtermanager.cpp b/agents/mailfilteragent/filtermanager.cpp index 5fdb84d73..858a8f2b9 100644 --- a/agents/mailfilteragent/filtermanager.cpp +++ b/agents/mailfilteragent/filtermanager.cpp @@ -58,9 +58,9 @@ public: Private(FilterManager *qq) : q(qq) , mRequiredPartsBasedOnAll(SearchRule::Envelope) - , mInboundFiltersExist(false) , mTotalProgressCount(0) , mCurrentProgressCount(0) + , mInboundFiltersExist(false) { pixmapNotification = QIcon::fromTheme(QStringLiteral("view-filter")).pixmap(KIconLoader::SizeSmall, KIconLoader::SizeSmall); } @@ -81,12 +81,12 @@ public: FilterManager *q; QList mFilters; QMap mRequiredParts; - SearchRule::RequiredPart mRequiredPartsBasedOnAll; QPixmap pixmapNotification; - bool mInboundFiltersExist = false; - bool mAllFoldersFiltersExist = false; + SearchRule::RequiredPart mRequiredPartsBasedOnAll; int mTotalProgressCount = 0; int mCurrentProgressCount = 0; + bool mInboundFiltersExist = false; + bool mAllFoldersFiltersExist = false; }; void FilterManager::Private::slotItemsFetchedForFilter(const Akonadi::Item::List &items) diff --git a/agents/sendlateragent/sendlateragent.cpp b/agents/sendlateragent/sendlateragent.cpp index 5b39065ce..5da9b3b1f 100644 --- a/agents/sendlateragent/sendlateragent.cpp +++ b/agents/sendlateragent/sendlateragent.cpp @@ -138,7 +138,7 @@ bool SendLaterAgent::enabledAgent() const void SendLaterAgent::configure(WId windowId) { - showConfigureDialog((qlonglong)windowId); + showConfigureDialog(static_cast(windowId)); } void SendLaterAgent::slotSendNow(Akonadi::Item::Id id) diff --git a/agents/sendlateragent/sendlatermanager.cpp b/agents/sendlateragent/sendlatermanager.cpp index b2e89da4a..69d1aa8ed 100644 --- a/agents/sendlateragent/sendlatermanager.cpp +++ b/agents/sendlateragent/sendlatermanager.cpp @@ -91,7 +91,7 @@ void SendLaterManager::createSendInfoList() if (!mListSendLaterInfo.isEmpty()) { mCurrentInfo = mListSendLaterInfo.first(); const QDateTime now = QDateTime::currentDateTime(); - const int seconds = now.secsTo(mCurrentInfo->dateTime()); + const qint64 seconds = now.secsTo(mCurrentInfo->dateTime()); if (seconds > 0) { //qCDebug(SENDLATERAGENT_LOG)<<" seconds"<start(seconds * 1000); diff --git a/src/kmlaunchexternalcomponent.cpp b/src/kmlaunchexternalcomponent.cpp index 9d668699f..ee9261308 100644 --- a/src/kmlaunchexternalcomponent.cpp +++ b/src/kmlaunchexternalcomponent.cpp @@ -58,7 +58,7 @@ void KMLaunchExternalComponent::slotConfigureAutomaticArchiving() OrgFreedesktopAkonadiArchiveMailAgentInterface archiveMailInterface(service, QStringLiteral("/ArchiveMailAgent"), QDBusConnection::sessionBus(), this); if (archiveMailInterface.isValid()) { - archiveMailInterface.showConfigureDialog((qlonglong)mParentWidget->winId()); + archiveMailInterface.showConfigureDialog(static_cast(mParentWidget->winId())); } else { KMessageBox::error(mParentWidget, i18n("Archive Mail Agent was not registered.")); } @@ -69,7 +69,7 @@ void KMLaunchExternalComponent::slotConfigureSendLater() const QString service = akonadiPath(QStringLiteral("org.freedesktop.Akonadi.SendLaterAgent")); OrgFreedesktopAkonadiSendLaterAgentInterface sendLaterInterface(service, QStringLiteral("/SendLaterAgent"), QDBusConnection::sessionBus(), this); if (sendLaterInterface.isValid()) { - sendLaterInterface.showConfigureDialog((qlonglong)mParentWidget->winId()); + sendLaterInterface.showConfigureDialog(static_cast(mParentWidget->winId())); } else { KMessageBox::error(mParentWidget, i18n("Send Later Agent was not registered.")); } @@ -82,7 +82,7 @@ void KMLaunchExternalComponent::slotConfigureFollowupReminder() OrgFreedesktopAkonadiFollowUpReminderAgentInterface followUpInterface(service, QStringLiteral("/FollowUpReminder"), QDBusConnection::sessionBus(), this); if (followUpInterface.isValid()) { - followUpInterface.showConfigureDialog((qlonglong)mParentWidget->winId()); + followUpInterface.showConfigureDialog(static_cast(mParentWidget->winId())); } else { KMessageBox::error(mParentWidget, i18n("Followup Reminder Agent was not registered.")); } @@ -147,5 +147,5 @@ void KMLaunchExternalComponent::slotAccountWizard() void KMLaunchExternalComponent::slotFilterLogViewer() { - MailCommon::FilterManager::instance()->showFilterLogDialog((qlonglong)mParentWidget->winId()); + MailCommon::FilterManager::instance()->showFilterLogDialog(static_cast(mParentWidget->winId())); } diff --git a/src/searchdialog/kmailsearchpatternedit.cpp b/src/searchdialog/kmailsearchpatternedit.cpp index cb7c1d120..88a3da6a9 100644 --- a/src/searchdialog/kmailsearchpatternedit.cpp +++ b/src/searchdialog/kmailsearchpatternedit.cpp @@ -20,7 +20,7 @@ using namespace KMail; KMailSearchPatternEdit::KMailSearchPatternEdit(QWidget *parent) : MailCommon::SearchPatternEdit(parent, - (MailCommon::SearchPatternEdit::SearchPatternEditOptions)(SearchPatternEdit::NotShowTags), + static_cast(SearchPatternEdit::NotShowTags), BalooMode) { } diff --git a/src/undostack.cpp b/src/undostack.cpp index eb2ce1700..42057c908 100644 --- a/src/undostack.cpp +++ b/src/undostack.cpp @@ -73,7 +73,7 @@ int UndoStack::newUndoAction(const Akonadi::Collection &srcFolder, const Akonadi info->srcFolder = srcFolder; info->destFolder = destFolder; info->moveToTrash = (destFolder == CommonKernel->trashCollectionFolder()); - if ((int)mStack.count() == mSize) { + if (static_cast(mStack.count()) == mSize) { delete mStack.last(); mStack.removeLast(); }