Commit 6e03d857 authored by Laurent Montel's avatar Laurent Montel
Browse files

Adapt to new API

parent 42abef52
Pipeline #264377 failed with stage
in 3 minutes and 58 seconds
......@@ -74,7 +74,7 @@ set(LIBGRAVATAR_VERSION "5.21.40")
set(MAILCOMMON_LIB_VERSION "5.21.41")
set(MESSAGELIB_LIB_VERSION "5.21.43")
set(LIBKLEO_LIB_VERSION "5.21.40")
set(PIMCOMMON_LIB_VERSION "5.21.42")
set(PIMCOMMON_LIB_VERSION "5.21.73")
set(LIBKDEPIM_LIB_VERSION "5.21.40")
set(LIBKSIEVE_LIB_VERSION "5.21.40")
set(AKONADI_SEARCH_VERSION "5.21.40")
......
......@@ -7,7 +7,7 @@
#include "kmcomposerglobalaction.h"
#include "kmcomposerwin.h"
#include <PimCommonAutoCorrection/LineEditWithAutoCorrection>
#include <PimCommon/LineEditWithAutoCorrection>
#include <KLineEdit>
......@@ -28,8 +28,8 @@ void KMComposerGlobalAction::slotUndo()
return;
}
if (::qobject_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)->undo();
if (::qobject_cast<PimCommon::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommon::LineEditWithAutoCorrection *>(fw)->undo();
} else if (::qobject_cast<KMComposerEditorNg *>(fw)) {
static_cast<QTextEdit *>(fw)->undo();
} else if (::qobject_cast<KLineEdit *>(fw)) {
......@@ -44,8 +44,8 @@ void KMComposerGlobalAction::slotRedo()
return;
}
if (::qobject_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)->redo();
if (::qobject_cast<PimCommon::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommon::LineEditWithAutoCorrection *>(fw)->redo();
} else if (::qobject_cast<KMComposerEditorNg *>(fw)) {
static_cast<QTextEdit *>(fw)->redo();
} else if (::qobject_cast<KLineEdit *>(fw)) {
......@@ -60,8 +60,8 @@ void KMComposerGlobalAction::slotCut()
return;
}
if (::qobject_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)->cut();
if (::qobject_cast<PimCommon::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommon::LineEditWithAutoCorrection *>(fw)->cut();
} else if (::qobject_cast<KMComposerEditorNg *>(fw)) {
static_cast<QTextEdit *>(fw)->cut();
} else if (::qobject_cast<KLineEdit *>(fw)) {
......@@ -76,8 +76,8 @@ void KMComposerGlobalAction::slotCopy()
return;
}
if (::qobject_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)->copy();
if (::qobject_cast<PimCommon::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommon::LineEditWithAutoCorrection *>(fw)->copy();
} else if (::qobject_cast<KMComposerEditorNg *>(fw)) {
static_cast<QTextEdit *>(fw)->copy();
} else if (::qobject_cast<KLineEdit *>(fw)) {
......@@ -91,8 +91,8 @@ void KMComposerGlobalAction::slotPaste()
if (!fw) {
return;
}
if (::qobject_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)->paste();
if (::qobject_cast<PimCommon::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommon::LineEditWithAutoCorrection *>(fw)->paste();
} else if (::qobject_cast<KMComposerEditorNg *>(fw)) {
static_cast<QTextEdit *>(fw)->paste();
} else if (::qobject_cast<KLineEdit *>(fw)) {
......@@ -107,8 +107,8 @@ void KMComposerGlobalAction::slotMarkAll()
return;
}
if (::qobject_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)->selectAll();
if (::qobject_cast<PimCommon::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommon::LineEditWithAutoCorrection *>(fw)->selectAll();
} else if (::qobject_cast<KLineEdit *>(fw)) {
static_cast<KLineEdit *>(fw)->selectAll();
} else if (::qobject_cast<KMComposerEditorNg *>(fw)) {
......@@ -123,8 +123,8 @@ void KMComposerGlobalAction::slotInsertEmoticon(const QString &str)
return;
}
if (::qobject_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)->insertPlainText(str);
if (::qobject_cast<PimCommon::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommon::LineEditWithAutoCorrection *>(fw)->insertPlainText(str);
} else if (::qobject_cast<KMComposerEditorNg *>(fw)) {
static_cast<QTextEdit *>(fw)->insertPlainText(str);
}
......@@ -140,8 +140,8 @@ void KMComposerGlobalAction::slotInsertText(const QString &str)
return;
}
if (::qobject_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommonAutoCorrection::LineEditWithAutoCorrection *>(fw)->insertPlainText(str);
if (::qobject_cast<PimCommon::LineEditWithAutoCorrection *>(fw)) {
static_cast<PimCommon::LineEditWithAutoCorrection *>(fw)->insertPlainText(str);
} else if (::qobject_cast<KMComposerEditorNg *>(fw)) {
static_cast<QTextEdit *>(fw)->insertPlainText(str);
}
......
......@@ -467,8 +467,7 @@ KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg,
applyMainWindowSettings(KMKernel::self()->config()->group("Composer"));
mUpdateWindowTitleConnection =
connect(mEdtSubject, &PimCommonAutoCorrection::LineEditWithAutoCorrection::textChanged, this, &KMComposerWin::slotUpdateWindowTitle);
mUpdateWindowTitleConnection = connect(mEdtSubject, &PimCommon::LineEditWithAutoCorrection::textChanged, this, &KMComposerWin::slotUpdateWindowTitle);
mIdentityConnection = connect(identity, &KIdentityManagement::IdentityCombo::identityChanged, this, [this](uint val) {
slotIdentityChanged(val);
});
......
......@@ -10,7 +10,7 @@
#include <QMimeData>
SubjectLineEditWithAutoCorrection::SubjectLineEditWithAutoCorrection(QWidget *parent, const QString &configFile)
: PimCommonAutoCorrection::LineEditWithAutoCorrection(parent, configFile)
: PimCommon::LineEditWithAutoCorrection(parent, configFile)
{
setActivateLanguageMenu(false);
setToolTip(i18n("Set a subject for this message"));
......@@ -26,5 +26,5 @@ void SubjectLineEditWithAutoCorrection::dropEvent(QDropEvent *event)
event->accept();
return;
}
PimCommonAutoCorrection::LineEditWithAutoCorrection::dropEvent(event);
PimCommon::LineEditWithAutoCorrection::dropEvent(event);
}
......@@ -7,8 +7,8 @@
#pragma once
#include "kmail_private_export.h"
#include <PimCommonAutoCorrection/LineEditWithAutoCorrection>
class KMAILTESTS_TESTS_EXPORT SubjectLineEditWithAutoCorrection : public PimCommonAutoCorrection::LineEditWithAutoCorrection
#include <PimCommon/LineEditWithAutoCorrection>
class KMAILTESTS_TESTS_EXPORT SubjectLineEditWithAutoCorrection : public PimCommon::LineEditWithAutoCorrection
{
Q_OBJECT
public:
......
Supports Markdown
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