[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kconfig] /: kconfig_compiler - generate code with overrides
From:       Allen Winter <winter () kde ! org>
Date:       2016-11-12 13:51:36
Message-ID: E1c5YiW-0002Zy-Om () code ! kde ! org
[Download RAW message or body]

Git commit b66da09e586dda28ca43c6566904a0f62a787863 by Allen Winter.
Committed on 12/11/2016 at 13:49.
Pushed by winterz into branch 'master'.

kconfig_compiler - generate code with overrides
REVIEW: 129382

M  +1    -1    autotests/kconfig_compiler/test_signal.h.ref
M  +1    -1    src/kconfig_compiler/kconfig_compiler.cpp

http://commits.kde.org/kconfig/b66da09e586dda28ca43c6566904a0f62a787863

diff --git a/autotests/kconfig_compiler/test_signal.h.ref b/autotests/kconf=
ig_compiler/test_signal.h.ref
index e536181..8da42c8 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 usrSave();
+    bool usrSave() Q_DECL_OVERRIDE;
 =

     // Appearance
     QString mEmoticonTheme;
diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compil=
er/kconfig_compiler.cpp
index 4494e45..121bea4 100644
--- a/src/kconfig_compiler/kconfig_compiler.cpp
+++ b/src/kconfig_compiler/kconfig_compiler.cpp
@@ -2122,7 +2122,7 @@ int main(int argc, char **argv)
     }
 =

     if (hasNonModifySignals) {
-        h << "    virtual bool usrSave();" << endl;
+        h << "    bool usrSave() Q_DECL_OVERRIDE;" << endl;
     }
 =

     // Member variables
[prev in list] [next in list] [prev in thread] [next in thread]