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

List:       kde-commits
Subject:    [kdepim] /: Use Q_DECL_OVERRIDE
From:       Montel Laurent <montel () kde ! org>
Date:       2015-05-28 21:45:26
Message-ID: E1Yy5cE-0003Z9-Dd () scm ! kde ! org
[Download RAW message or body]

Git commit f3d356d2e05307fe2b7a67c45fc4bd064be84160 by Montel Laurent.
Committed on 28/05/2015 at 21:41.
Pushed by mlaurent into branch 'master'.

Use Q_DECL_OVERRIDE

M  +2    -2    akregator/src/tabwidget.h
M  +1    -1    kleopatra/conf/configuredialog.cpp

http://commits.kde.org/kdepim/f3d356d2e05307fe2b7a67c45fc4bd064be84160

diff --git a/akregator/src/tabwidget.h b/akregator/src/tabwidget.h
index ada2a19..5bd7a6a 100644
--- a/akregator/src/tabwidget.h
+++ b/akregator/src/tabwidget.h
@@ -66,8 +66,8 @@ Q_SIGNALS:
     void signalZoomOutFrame(int);
 
 private:
-    /*reimpl*/ void tabInserted(int);
-    /*reimpl*/ void tabRemoved(int);
+    /*reimpl*/ void tabInserted(int) Q_DECL_OVERRIDE;
+    /*reimpl*/ void tabRemoved(int) Q_DECL_OVERRIDE;
 
 private Q_SLOTS:
     void initiateDrag(int tab);
diff --git a/kleopatra/conf/configuredialog.cpp b/kleopatra/conf/configuredialog.cpp
index 658141a..df83533 100644
--- a/kleopatra/conf/configuredialog.cpp
+++ b/kleopatra/conf/configuredialog.cpp
@@ -46,7 +46,7 @@
 
 #ifdef KLEO_STATIC_KCMODULES
 # include <KDesktopFile>
-# define KCM_IMPORT_PLUGIN( x ) extern "C" KCModule * create_##x( QWidget * \
parent=0, const QVariantList & args=QVariantList() ); +# define KCM_IMPORT_PLUGIN( x \
) extern "C" KCModule * create_##x( QWidget * parent = Q_NULLPTR, const QVariantList \
& args=QVariantList() );  # define addMyModule( x ) addModule( KCModuleInfo( \
KDesktopFile( "services", QLatin1String(#x) + QLatin1String(".desktop") ) ), \
create_##x() )  #else // KLEO_STATIC_KCMODULES
 # define KCM_IMPORT_PLUGIN( x )


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