Commit 57e1b895 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Remove old code

parent a7d85715
Pipeline #90366 passed with stage
in 6 minutes
...@@ -27,6 +27,7 @@ KcmKontact::KcmKontact(QWidget *parent, const QVariantList &args) ...@@ -27,6 +27,7 @@ KcmKontact::KcmKontact(QWidget *parent, const QVariantList &args)
: KCModule(parent, args) : KCModule(parent, args)
, mPluginCombo(new QComboBox(parent)) , mPluginCombo(new QComboBox(parent))
{ {
qDebug() << " ssssssssssssssssssssssssssssssssssssss";
auto topLayout = new QVBoxLayout(this); auto topLayout = new QVBoxLayout(this);
QBoxLayout *pluginStartupLayout = new QHBoxLayout(); QBoxLayout *pluginStartupLayout = new QHBoxLayout();
topLayout->addLayout(pluginStartupLayout); topLayout->addLayout(pluginStartupLayout);
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include "kontactkcmultidialog.h" #include "kontactkcmultidialog.h"
#include "kcmoduleproxy.h" #include "kcmoduleproxy.h"
#include "kcmutils_version.h"
#include "kontactkcmultidialog_p.h" #include "kontactkcmultidialog_p.h"
#include <QApplication> #include <QApplication>
...@@ -37,11 +36,7 @@ bool KontactKCMultiDialogPrivate::resolveChanges(KCModuleProxy *currentProxy) ...@@ -37,11 +36,7 @@ bool KontactKCMultiDialogPrivate::resolveChanges(KCModuleProxy *currentProxy)
{ {
Q_Q(KontactKCMultiDialog); Q_Q(KontactKCMultiDialog);
if (!currentProxy if (!currentProxy
#if KCMUTILS_VERSION > QT_VERSION_CHECK(5, 86, 0)
|| !currentProxy->isChanged()) { || !currentProxy->isChanged()) {
#else
|| !currentProxy->changed()) {
#endif
return true; return true;
} }
...@@ -132,11 +127,7 @@ void KontactKCMultiDialogPrivate::_k_clientChanged() ...@@ -132,11 +127,7 @@ void KontactKCMultiDialogPrivate::_k_clientChanged()
bool change = false; bool change = false;
bool defaulted = false; bool defaulted = false;
if (activeModule) { if (activeModule) {
#if KCMUTILS_VERSION > QT_VERSION_CHECK(5, 86, 0)
change = activeModule->isChanged(); change = activeModule->isChanged();
#else
change = activeModule->changed();
#endif
defaulted = activeModule->defaulted(); defaulted = activeModule->defaulted();
QPushButton *applyButton = q->buttonBox()->button(QDialogButtonBox::Apply); QPushButton *applyButton = q->buttonBox()->button(QDialogButtonBox::Apply);
...@@ -321,11 +312,7 @@ void KontactKCMultiDialogPrivate::apply() ...@@ -321,11 +312,7 @@ void KontactKCMultiDialogPrivate::apply()
for (const CreatedModule &module : std::as_const(modules)) { for (const CreatedModule &module : std::as_const(modules)) {
KCModuleProxy *proxy = module.kcm; KCModuleProxy *proxy = module.kcm;
#if KCMUTILS_VERSION > QT_VERSION_CHECK(5, 86, 0)
if (proxy->isChanged()) { if (proxy->isChanged()) {
#else
if (proxy->changed()) {
#endif
proxy->save(); proxy->save();
/** /**
* Add name of the components the kcm belongs to the list * Add name of the components the kcm belongs to the list
......
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