[Pkg-owncloud-commits] [owncloud-client] 193/498: Theme: add a non-inline destructor

Sandro Knauß hefee-guest at moszumanska.debian.org
Tue Aug 11 14:48:49 UTC 2015


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 494f08de8cf316a1f8f74fb1f33965ceb76f2584
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Jun 24 10:14:55 2015 +0200

    Theme: add a non-inline destructor
    
    That way we do not need to include QIcon in theme.h
    So the header can be included (indirrectly) from cmd.cpp
    which is not compiled with the QtGui include paths
---
 src/libsync/theme.cpp | 2 ++
 src/libsync/theme.h   | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index a388f3c..50da8d1 100644
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -47,6 +47,8 @@ Theme* Theme::instance() {
     return _instance;
 }
 
+Theme::~Theme() {}
+
 QString Theme::statusHeaderText( SyncResult::Status status ) const
 {
     QString resultStr;
diff --git a/src/libsync/theme.h b/src/libsync/theme.h
index 0edb69c..9df4dfa 100644
--- a/src/libsync/theme.h
+++ b/src/libsync/theme.h
@@ -18,11 +18,6 @@
 #include <QObject>
 #include "syncresult.h"
 
-#ifndef TOKEN_AUTH_ONLY
-#include <QIcon>
-#endif
-
-
 class QIcon;
 class QString;
 class QObject;
@@ -48,6 +43,8 @@ public:
     /* returns a singleton instance. */
     static Theme* instance();
 
+    ~Theme();
+
     /**
      * @brief appNameGUI - Human readable application name.
      *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list