diff options
| author | Stefan Hacker <dd0t@users.sourceforge.net> | 2014-09-20 02:34:24 +0400 |
|---|---|---|
| committer | Stefan Hacker <dd0t@users.sourceforge.net> | 2014-09-20 05:45:34 +0400 |
| commit | 8cf4e142e5f326a296ec5025ec425827c0f9dd6a (patch) | |
| tree | 8f49f1d04f3caaff4d6b0c5abc2561e8d838f717 /src/mumble/Database.h | |
| parent | edaca2ea2069fa3533f94238f9d71115d9271a90 (diff) | |
Introduce use of Q_DECL_OVERRIDE and Q_DECL_FINAL into the codebase.
Edited header files and tried to mark all overriden methods with
Q_DECL_OVERRIDE. Also added Q_DECL_FINAL in a few places where
a non-virtual destructor was used in a class.
Q_DECL_OVERRIDE/Q_DECL_FINAL were introduce with Qt 5.0. For earlier
versions Q_DECL_FINAL is defined to nothing. Q_DECL_OVERRIDE is still
available on windows as the override keyword was supported there since
msvc 2010.
All new code should make use of these macros as the bugs that occurred
in the Qt 4 to 5 transition show they are needed.
Diffstat (limited to 'src/mumble/Database.h')
| -rw-r--r-- | src/mumble/Database.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mumble/Database.h b/src/mumble/Database.h index c10ccd50c..a71524aa9 100644 --- a/src/mumble/Database.h +++ b/src/mumble/Database.h @@ -48,7 +48,7 @@ class Database : public QObject { Q_DISABLE_COPY(Database) public: Database(); - ~Database(); + ~Database() Q_DECL_OVERRIDE; static QList<FavoriteServer> getFavorites(); static void setFavorites(const QList<FavoriteServer> &servers); static void setPassword(const QString &host, unsigned short port, const QString &user, const QString &pw); |