summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorRichard Maudsley <richard.maudsley@isode.com>2014-01-13 16:05:53 (GMT)
committerRichard Maudsley <richard.maudsley@isode.com>2014-01-13 16:05:53 (GMT)
commitf554c290a644043a2180784308a105d8f7ea8fdf (patch)
tree34aed45abf9dc1cf6e3b31a48bac6ea6224e5c5e /Swift
parentdcddedd425e1fbb07507e8468857c75e09188cfd (diff)
downloadswift-f554c290a644043a2180784308a105d8f7ea8fdf.zip
swift-f554c290a644043a2180784308a105d8f7ea8fdf.tar.bz2
Fixed compiler errors.
Change-Id: I5a36fa14bfb0e758a1178e4b5fe3c2eb2e32b04c
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Controllers/SConscript1
-rw-r--r--Swift/Controllers/UIInterfaces/HighlightEditorWindow.h6
-rw-r--r--Swift/QtUI/QtHighlightEditor.cpp3
-rw-r--r--Swift/QtUI/QtHighlightEditor.h2
-rw-r--r--Swift/QtUI/QtHighlightEditor.ui6
-rw-r--r--Swift/QtUI/SConscript1
6 files changed, 10 insertions, 9 deletions
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index e0fa508..820e3f5 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -61,6 +61,7 @@ if env["SCONS_STAGE"] == "build" :
"UIEvents/UIEvent.cpp",
"UIInterfaces/XMLConsoleWidget.cpp",
"UIInterfaces/ChatListWindow.cpp",
+ "UIInterfaces/HighlightEditorWindow.cpp",
"PreviousStatusStore.cpp",
"ProfileSettingsProvider.cpp",
"Settings/SettingsProviderHierachy.cpp",
diff --git a/Swift/Controllers/UIInterfaces/HighlightEditorWindow.h b/Swift/Controllers/UIInterfaces/HighlightEditorWindow.h
index 760b4a8..abc8741 100644
--- a/Swift/Controllers/UIInterfaces/HighlightEditorWindow.h
+++ b/Swift/Controllers/UIInterfaces/HighlightEditorWindow.h
@@ -6,14 +6,14 @@
namespace Swift {
+class HighlightManager;
+
class HighlightEditorWindow {
public:
HighlightEditorWindow();
virtual ~HighlightEditorWindow();
- virtual void setHighlightManager(HighlightManager *highlightManager) {highlightManager_ = highlightManager;}
+ virtual void setHighlightManager(HighlightManager *highlightManager) = 0;
virtual void show() = 0;
-private:
- HighlightManager* highlightManager_;
};
}
diff --git a/Swift/QtUI/QtHighlightEditor.cpp b/Swift/QtUI/QtHighlightEditor.cpp
index 191b239..d22756a 100644
--- a/Swift/QtUI/QtHighlightEditor.cpp
+++ b/Swift/QtUI/QtHighlightEditor.cpp
@@ -6,8 +6,7 @@
#include <cassert>
-#include <Swift/QtUI/QtHighlightEditorWidget.h>
-#include <Swift/QtUI/QtHighlightRulesItemModel.h>
+#include <Swift/QtUI/QtHighlightEditor.h>
namespace Swift {
diff --git a/Swift/QtUI/QtHighlightEditor.h b/Swift/QtUI/QtHighlightEditor.h
index b063ff0..4aa42ae 100644
--- a/Swift/QtUI/QtHighlightEditor.h
+++ b/Swift/QtUI/QtHighlightEditor.h
@@ -11,6 +11,8 @@
namespace Swift {
+ class QtSettingsProvider;
+
class QtHighlightEditor : public QWidget, public HighlightEditorWindow {
Q_OBJECT
diff --git a/Swift/QtUI/QtHighlightEditor.ui b/Swift/QtUI/QtHighlightEditor.ui
index 933c61f..d0ea682 100644
--- a/Swift/QtUI/QtHighlightEditor.ui
+++ b/Swift/QtUI/QtHighlightEditor.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>QtHighlightRuleWidget</class>
- <widget class="QWidget" name="QtHighlightRuleWidget">
+ <class>QtHighlightEditor</class>
+ <widget class="QWidget" name="QtHighlightEditor">
<property name="geometry">
<rect>
<x>0</x>
@@ -267,7 +267,7 @@ If you want to provide more than one sender or keyword, input them in separate l
<enum>Qt::Horizontal</enum>
</property>
</widget>
- <widget class="QWidget" name="">
+ <widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 20dc6e6..f254edf 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -282,7 +282,6 @@ myenv.Uic4("QtJoinMUCWindow.ui")
myenv.Uic4("QtHistoryWindow.ui")
myenv.Uic4("QtConnectionSettings.ui")
myenv.Uic4("QtHighlightEditor.ui")
-myenv.Uic4("QtHighlightEditorWidget.ui")
myenv.Uic4("QtBlockListEditorWindow.ui")
myenv.Uic4("QtSpellCheckerWindow.ui")
myenv.Qrc("DefaultTheme.qrc")