Make UiStyle a QObject

That way we can use signals/slots with it, e.g. emit a signal upon changes in the
style.

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index adef532..3823c4d 100644 (file)
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -86,6 +86,7 @@ set(MOC_HDRS
     qtui.h
     qtuiapplication.h
     qtuimessageprocessor.h
+    qtuistyle.h
     settingsdlg.h
     settingspagedlg.h
     simplenetworkeditor.h
@@ -102,7 +103,6 @@ set(HEADERS
     chatlinemodelitem.h
     chatviewsettings.h
     qtuisettings.h
-    qtuistyle.h
     webpreviewitem.h)
 
 set(FORMS

diff --git a/src/qtui/qtuistyle.cpp b/src/qtui/qtuistyle.cpp
index 5aa6534..208b3c0 100644 (file)
--- a/src/qtui/qtuistyle.cpp
+++ b/src/qtui/qtuistyle.cpp
@@ -21,7 +21,7 @@
 #include "qtuistyle.h"
 #include "qtuisettings.h"
 
-QtUiStyle::QtUiStyle() : UiStyle() {
+QtUiStyle::QtUiStyle(QObject *parent) : UiStyle(parent) {
 
 }
 

diff --git a/src/qtui/qtuistyle.h b/src/qtui/qtuistyle.h
index e341736..8f38d46 100644 (file)
--- a/src/qtui/qtuistyle.h
+++ b/src/qtui/qtuistyle.h
@@ -24,9 +24,10 @@
 #include "uistyle.h"
 
 class QtUiStyle : public UiStyle {
+  Q_OBJECT
 
 public:
-  QtUiStyle();
+  QtUiStyle(QObject *parent = 0);
   virtual ~QtUiStyle();
 
   virtual inline qreal firstColumnSeparator() const { return 6; }

diff --git a/src/uisupport/CMakeLists.txt b/src/uisupport/CMakeLists.txt
index a02584b..2b05f9d 100644 (file)
--- a/src/uisupport/CMakeLists.txt
+++ b/src/uisupport/CMakeLists.txt
@@ -57,13 +57,13 @@ set(MOC_HDRS
     settingspage.h
     tabcompleter.h
     toolbaractionprovider.h
+    uistyle.h
    )
 
 set(HEADERS
     icon.h
     qssparser.h
     uisettings.h
-    uistyle.h
    )
 
 if(HAVE_KDE)

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 6478f8c..5909c19 100644 (file)
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -27,7 +27,7 @@
 
 QHash<QString, UiStyle::FormatType> UiStyle::_formatCodes;
 
-UiStyle::UiStyle() {
+UiStyle::UiStyle(QObject *parent) : QObject(parent) {
   // register FormatList if that hasn't happened yet
   // FIXME I don't think this actually avoids double registration... then again... does it hurt?
   if(QVariant::nameToType("UiStyle::FormatList") == QVariant::Invalid) {

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index 98e15ed..5c6f090 100644 (file)
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -32,11 +32,11 @@
 #include "message.h"
 #include "settings.h"
 
-class UiStyle {
-  Q_DECLARE_TR_FUNCTIONS(UiStyle)
+class UiStyle : public QObject{
+  Q_OBJECT
 
 public:
-  UiStyle();
+  UiStyle(QObject *parent = 0);
   virtual ~UiStyle();
 
   typedef QList<QPair<quint16, quint32> > FormatList;