Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Kontact
Commits
57e1b895
Commit
57e1b895
authored
Oct 21, 2021
by
Laurent Montel
😁
Browse files
Remove old code
parent
a7d85715
Pipeline
#90366
passed with stage
in 6 minutes
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/kcmkontact.cpp
View file @
57e1b895
...
...
@@ -27,6 +27,7 @@ KcmKontact::KcmKontact(QWidget *parent, const QVariantList &args)
:
KCModule
(
parent
,
args
)
,
mPluginCombo
(
new
QComboBox
(
parent
))
{
qDebug
()
<<
" ssssssssssssssssssssssssssssssssssssss"
;
auto
topLayout
=
new
QVBoxLayout
(
this
);
QBoxLayout
*
pluginStartupLayout
=
new
QHBoxLayout
();
topLayout
->
addLayout
(
pluginStartupLayout
);
...
...
src/ksettingsdialog/kontactkcmultidialog.cpp
View file @
57e1b895
...
...
@@ -11,7 +11,6 @@
#include
"kontactkcmultidialog.h"
#include
"kcmoduleproxy.h"
#include
"kcmutils_version.h"
#include
"kontactkcmultidialog_p.h"
#include
<QApplication>
...
...
@@ -37,11 +36,7 @@ bool KontactKCMultiDialogPrivate::resolveChanges(KCModuleProxy *currentProxy)
{
Q_Q
(
KontactKCMultiDialog
);
if
(
!
currentProxy
#if KCMUTILS_VERSION > QT_VERSION_CHECK(5, 86, 0)
||
!
currentProxy
->
isChanged
())
{
#else
||
!
currentProxy
->
changed
())
{
#endif
return
true
;
}
...
...
@@ -132,11 +127,7 @@ void KontactKCMultiDialogPrivate::_k_clientChanged()
bool
change
=
false
;
bool
defaulted
=
false
;
if
(
activeModule
)
{
#if KCMUTILS_VERSION > QT_VERSION_CHECK(5, 86, 0)
change
=
activeModule
->
isChanged
();
#else
change
=
activeModule
->
changed
();
#endif
defaulted
=
activeModule
->
defaulted
();
QPushButton
*
applyButton
=
q
->
buttonBox
()
->
button
(
QDialogButtonBox
::
Apply
);
...
...
@@ -321,11 +312,7 @@ void KontactKCMultiDialogPrivate::apply()
for
(
const
CreatedModule
&
module
:
std
::
as_const
(
modules
))
{
KCModuleProxy
*
proxy
=
module
.
kcm
;
#if KCMUTILS_VERSION > QT_VERSION_CHECK(5, 86, 0)
if
(
proxy
->
isChanged
())
{
#else
if
(
proxy
->
changed
())
{
#endif
proxy
->
save
();
/**
* Add name of the components the kcm belongs to the list
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment