Commit 147cf99f authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

USe KDEFrameworkCompilerSettings. Clean up. Make it compile

parent f3296b3a
......@@ -27,7 +27,7 @@ include(ECMGeneratePriFile)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMAddAppIcon)
include(ECMQtDeclareLoggingCategory)
include(ECMCoverageOption)
......@@ -143,11 +143,6 @@ configure_file(config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ente
include_directories(${kmail_SOURCE_DIR} ${kmail_BINARY_DIR})
configure_file(kmail-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kmail-version.h @ONLY)
add_definitions(-DQT_NO_CAST_FROM_ASCII)
add_definitions(-DQT_NO_CAST_TO_ASCII)
add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_definitions(-DQT_USE_QSTRINGBUILDER)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
add_subdirectory(src)
......
......@@ -1241,7 +1241,7 @@ bool QWinMetaFile::dibToBmp(QImage &bmp, const char *dib, long size)
// add BMP header
BMPFILEHEADER *bmpHeader;
bmpHeader = (BMPFILEHEADER *)((const char *)pattern);
bmpHeader = (BMPFILEHEADER *)(pattern.constData());
bmpHeader->bmType = 0x4D42;
bmpHeader->bmSize = sizeBmp;
......
......@@ -140,7 +140,7 @@ AccountsPageSendingTab::AccountsPageSendingTab(QWidget *parent)
l->setBuddy(mSendOnCheckCombo);
glay->addWidget(l, 2, 0);
QString msg = i18n(KMailSettings::self()->sendOnCheckItem()->whatsThis().toUtf8());
QString msg = i18n(KMailSettings::self()->sendOnCheckItem()->whatsThis().toUtf8().constData());
l->setWhatsThis(msg);
mSendOnCheckCombo->setWhatsThis(msg);
......
......@@ -342,7 +342,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab(QWidget *parent)
mRecipientCheck = new QCheckBox(
GlobalSettings::self()->tooManyRecipientsItem()->label(), this);
mRecipientCheck->setObjectName(QStringLiteral("kcfg_TooManyRecipients"));
helpText = i18n(KMailSettings::self()->tooManyRecipientsItem()->whatsThis().toUtf8());
helpText = i18n(KMailSettings::self()->tooManyRecipientsItem()->whatsThis().toUtf8().constData());
mRecipientCheck->setWhatsThis(helpText);
mRecipientCheck->setToolTip(i18n("Warn if too many recipients are specified"));
......@@ -353,7 +353,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab(QWidget *parent)
mRecipientSpin->setValue(5 /*init*/);
mRecipientSpin->setObjectName(QStringLiteral("kcfg_RecipientThreshold"));
mRecipientSpin->setEnabled(false);
helpText = i18n(KMailSettings::self()->recipientThresholdItem()->whatsThis().toUtf8());
helpText = i18n(KMailSettings::self()->recipientThresholdItem()->whatsThis().toUtf8().constData());
mRecipientSpin->setWhatsThis(helpText);
mRecipientSpin->setToolTip(i18n("Set the maximum number of recipients for the warning"));
......
......@@ -70,7 +70,7 @@ MiscPageFolderTab::MiscPageFolderTab(QWidget *parent)
layout->addWidget(mOnStartupOpenFolder);
mMMTab.mExcludeImportantFromExpiry->setWhatsThis(
i18n(KMailSettings::self()->excludeImportantMailFromExpiryItem()->whatsThis().toUtf8()));
i18n(KMailSettings::self()->excludeImportantMailFromExpiryItem()->whatsThis().toUtf8().constData()));
connect(mMMTab.mExcludeImportantFromExpiry, &QCheckBox::stateChanged, this, &MiscPageFolderTab::slotEmitChanged);
connect(mMMTab.mLoopOnGotoUnread, QOverload<int>::of(&KComboBox::activated), this, &MiscPageFolderTab::slotEmitChanged);
......
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