diff options
| author | Aleix Pol <aleixpol@kde.org> | 2015-07-27 12:39:56 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2015-07-27 12:39:56 +0200 |
| commit | be95bc91fb8b0e115a31d9b3cbd63c9d234da6a9 (patch) | |
| tree | a80692b11595ea3d26258e3cfcecec7d1f4139e8 | |
| parent | 297b6188d01064fb2803818c1f93d2d7bdfbccb7 (diff) | |
| download | kconfig-be95bc91fb8b0e115a31d9b3cbd63c9d234da6a9.tar.gz kconfig-be95bc91fb8b0e115a31d9b3cbd63c9d234da6a9.tar.bz2 | |
Don't generate deprecated code
::usrWriteConfig is deprecated, use ::usrSave as recommended by the
documentation.
REVIEW: 124467
| -rw-r--r-- | autotests/kconfig_compiler/test_signal.cpp.ref | 4 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test_signal.h.ref | 2 | ||||
| -rw-r--r-- | src/kconfig_compiler/kconfig_compiler.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/autotests/kconfig_compiler/test_signal.cpp.ref b/autotests/kconfig_compiler/test_signal.cpp.ref index 6faf8bd1..e959571a 100644 --- a/autotests/kconfig_compiler/test_signal.cpp.ref +++ b/autotests/kconfig_compiler/test_signal.cpp.ref @@ -56,9 +56,9 @@ TestSignal::~TestSignal() s_globalTestSignal()->q = 0; } -bool TestSignal::usrWriteConfig() +bool TestSignal::usrSave() { - const bool res = KConfigSkeleton::usrWriteConfig(); + const bool res = KConfigSkeleton::usrSave(); if (!res) return false; if ( mSettingsChanged & signalEmoticonSettingsChanged ) diff --git a/autotests/kconfig_compiler/test_signal.h.ref b/autotests/kconfig_compiler/test_signal.h.ref index e9f9c94c..648b26db 100644 --- a/autotests/kconfig_compiler/test_signal.h.ref +++ b/autotests/kconfig_compiler/test_signal.h.ref @@ -139,7 +139,7 @@ class TestSignal : public KConfigSkeleton TestSignal(); friend class TestSignalHelper; - virtual bool usrWriteConfig(); + virtual bool usrSave(); // Appearance QString mEmoticonTheme; diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp index 246cc92a..fc3571c0 100644 --- a/src/kconfig_compiler/kconfig_compiler.cpp +++ b/src/kconfig_compiler/kconfig_compiler.cpp @@ -2125,7 +2125,7 @@ int main(int argc, char **argv) } if (hasNonModifySignals) { - h << " virtual bool usrWriteConfig();" << endl; + h << " virtual bool usrSave();" << endl; } // Member variables @@ -2605,9 +2605,9 @@ int main(int argc, char **argv) cpp << "}" << endl << endl; if (hasNonModifySignals) { - cpp << "bool " << cfg.className << "::" << "usrWriteConfig()" << endl; + cpp << "bool " << cfg.className << "::" << "usrSave()" << endl; cpp << "{" << endl; - cpp << " const bool res = " << cfg.inherits << "::usrWriteConfig();" << endl; + cpp << " const bool res = " << cfg.inherits << "::usrSave();" << endl; cpp << " if (!res) return false;" << endl << endl; Q_FOREACH (const Signal &signal, signalList) { if (signal.modify) { |