Consolidate UiStyleSettings into uisettings.h

diff --git a/src/qtui/qtuisettings.h b/src/qtui/qtuisettings.h
index fa3c792..ac3b0f5 100644 (file)
--- a/src/qtui/qtuisettings.h
+++ b/src/qtui/qtuisettings.h
@@ -21,6 +21,8 @@
 #ifndef _QTUISETTINGS_H_
 #define _QTUISETTINGS_H_
 
+#include <QColor>
+
 #include "uisettings.h"
 
 class QtUiSettings : public UiSettings {
@@ -30,5 +32,14 @@ class QtUiSettings : public UiSettings {
 
 }; 
 
+class QtUiStyleSettings : public UiStyleSettings {
+
+  public:
+    QtUiStyleSettings();
+
+    void setHighlightColor(const QColor &);
+    QColor highlightColor() const;
+
+};
 
 #endif

diff --git a/src/uisupport/CMakeLists.txt b/src/uisupport/CMakeLists.txt
index bc69347..7c235f8 100644 (file)
--- a/src/uisupport/CMakeLists.txt
+++ b/src/uisupport/CMakeLists.txt
@@ -18,8 +18,7 @@ set(SOURCES
     settingspage.cpp
     tabcompleter.cpp
     uisettings.cpp
-    uistyle.cpp
-    uistylesettings.cpp)
+    uistyle.cpp)
 
 set(MOC_HDRS
     abstractbuffercontainer.h
@@ -37,8 +36,7 @@ set(MOC_HDRS
 
 set(HEADERS
     uisettings.h
-    uistyle.h
-    uistylesettings.h)
+    uistyle.h)
 
 qt4_wrap_cpp(MOC ${MOC_HDRS})
 

diff --git a/src/uisupport/uisettings.cpp b/src/uisupport/uisettings.cpp
index b923a4f..c338691 100644 (file)
--- a/src/uisupport/uisettings.cpp
+++ b/src/uisupport/uisettings.cpp
@@ -36,3 +36,30 @@ QVariant UiSettings::value(const QString &key, const QVariant &def) {
 void UiSettings::remove(const QString &key) {
   removeLocalKey(key);
 }
+
+/**************************************************************************/
+
+UiStyleSettings::UiStyleSettings(const QString &group) : ClientSettings(group) {
+
+}
+
+void UiStyleSettings::setCustomFormat(UiStyle::FormatType ftype, QTextCharFormat format) {
+  setLocalValue(QString("Format/%1").arg(ftype), format);
+}
+
+QTextCharFormat UiStyleSettings::customFormat(UiStyle::FormatType ftype) {
+  return localValue(QString("Format/%1").arg(ftype), QTextFormat()).value<QTextFormat>().toCharFormat();
+}
+
+void UiStyleSettings::removeCustomFormat(UiStyle::FormatType ftype) {
+  removeLocalKey(QString("Format/%1").arg(ftype));
+}
+
+QList<UiStyle::FormatType> UiStyleSettings::availableFormats() {
+  QList<UiStyle::FormatType> formats;
+  QStringList list = localChildKeys("Format");
+  foreach(QString type, list) {
+    formats << (UiStyle::FormatType)type.toInt();
+  }
+  return formats;
+}

diff --git a/src/uisupport/uisettings.h b/src/uisupport/uisettings.h
index 0f0f52e..40463bf 100644 (file)
--- a/src/uisupport/uisettings.h
+++ b/src/uisupport/uisettings.h
@@ -22,6 +22,7 @@
 #define UISETTINGS_H
 
 #include "clientsettings.h"
+#include "uistyle.h"
 
 class UiSettings : public ClientSettings {
 public:
@@ -32,4 +33,16 @@ public:
   void remove(const QString &key);
 };
 
+class UiStyleSettings : public ClientSettings {
+
+  public:
+    UiStyleSettings(const QString &group = "UiStyle");
+
+    void setCustomFormat(UiStyle::FormatType, QTextCharFormat);
+    QTextCharFormat customFormat(UiStyle::FormatType);
+
+    void removeCustomFormat(UiStyle::FormatType);
+    QList<UiStyle::FormatType> availableFormats();
+};
+
 #endif

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 7482b93..cbd99c2 100644 (file)
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -20,7 +20,7 @@
 #include <QApplication>
 
 #include "uistyle.h"
-#include "uistylesettings.h"
+#include "uisettings.h"
 #include "util.h"
 
 // FIXME remove with migration code

diff --git a/src/uisupport/uistylesettings.cpp b/src/uisupport/uistylesettings.cpp
deleted file mode 100644 (file)
index 10c7300..0000000
--- a/src/uisupport/uistylesettings.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#include "uistylesettings.h"
-
-UiStyleSettings::UiStyleSettings(const QString &group) : ClientSettings(group) {
-
-}
-
-void UiStyleSettings::setCustomFormat(UiStyle::FormatType ftype, QTextCharFormat format) {
-  setLocalValue(QString("Format/%1").arg(ftype), format);
-}
-
-QTextCharFormat UiStyleSettings::customFormat(UiStyle::FormatType ftype) {
-  return localValue(QString("Format/%1").arg(ftype), QTextFormat()).value<QTextFormat>().toCharFormat();
-}
-
-void UiStyleSettings::removeCustomFormat(UiStyle::FormatType ftype) {
-  removeLocalKey(QString("Format/%1").arg(ftype));
-}
-
-QList<UiStyle::FormatType> UiStyleSettings::availableFormats() {
-  QList<UiStyle::FormatType> formats;
-  QStringList list = localChildKeys("Format");
-  foreach(QString type, list) {
-    formats << (UiStyle::FormatType)type.toInt();
-  }
-  return formats;
-}
-

diff --git a/src/uisupport/uistylesettings.h b/src/uisupport/uistylesettings.h
deleted file mode 100644 (file)
index d0d0f0f..0000000
--- a/src/uisupport/uistylesettings.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef _UISTYLESETTINGS_H_
-#define _UISTYLESETTINGS_H_
-
-#include "clientsettings.h"
-#include "uistyle.h"
-
-class UiStyleSettings : public ClientSettings {
-
-  public:
-    UiStyleSettings(const QString &group = "UiStyle");
-
-    void setCustomFormat(UiStyle::FormatType, QTextCharFormat);
-    QTextCharFormat customFormat(UiStyle::FormatType);
-
-    void removeCustomFormat(UiStyle::FormatType);
-    QList<UiStyle::FormatType> availableFormats();
-
-  private:
-
-};
-
-#endif