Code improvements in the theme manager(wip)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5610 17fca916-40b9-46aa-a4ea-0a15b648b75c

1 files changed, 11 insertions, 5 deletions

diff --git a/src/modules/theme/ThemeManagementDialog.h b/src/modules/theme/ThemeManagementDialog.h
index 5c6d46de8..d4f7fa61d 100644
--- a/src/modules/theme/ThemeManagementDialog.h
+++ b/src/modules/theme/ThemeManagementDialog.h
@@ -38,13 +38,15 @@
 #include <QListWidget>
 #include <QItemDelegate>
 #include <QToolButton>
-
+#include "kvi_settings.h"
+#if defined(COMPILE_WEBKIT_SUPPORT) || defined(Q_MOC_RUN)
+#include "WebThemeInterfaceDialog.h"
+#endif
 class QLineEdit;
 class QPushButton;
 class QLabel;
 class KviDynamicToolTip;
 
-
 class ThemeListWidgetItem : public KviTalListWidgetItem
 {
 public:
@@ -53,7 +55,7 @@ public:
 public:
 	KviThemeInfo   * m_pThemeInfo;
 public:
-	KviThemeInfo * themeInfo(){ return m_pThemeInfo; };
+	KviThemeInfo * themeInfo(){ return m_pThemeInfo; }
 };
 
 
@@ -70,15 +72,19 @@ protected:
 	KviTalPopupMenu     * m_pContextPopup;
 	QToolButton         * m_pDeleteThemeButton;
 	QToolButton         * m_pPackThemeButton;
+#if defined(COMPILE_WEBKIT_SUPPORT) || defined(Q_MOC_RUN)
+	WebThemeInterfaceDialog *m_pWebThemeInterfaceDialog;
+#endif
 public:
-	static ThemeManagementDialog * instance(){ return m_pInstance; };
+	static ThemeManagementDialog * instance(){ return m_pInstance; }
 	static void display(bool bTopLevel);
 	static void cleanup();
 protected:
-	void fillThemeBox(const QString &szDir);
+	void fillThemeBox(bool bBuiltin);
 	bool hasSelectedItems();
 	virtual void closeEvent(QCloseEvent * e);
 protected slots:
+
 	void saveCurrentTheme();
 	void getMoreThemes();
 	void installFromFile();