aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects/libkviobjects.cpp
diff options
context:
space:
mode:
authorGravatar Noldor2011-03-12 13:43:52 +0000
committerGravatar Noldor2011-03-12 13:43:52 +0000
commite7e52e90397c8573b0d02598eb44f180e24996fc (patch)
treea951bc98830f34749f0a300e948d2e5ac98f8bef /src/modules/objects/libkviobjects.cpp
parent'...' correctness, remove trailing <br>s in the trayicon tooltip (diff)
downloadKVIrc-e7e52e90397c8573b0d02598eb44f180e24996fc.tar.gz
KVIrc-e7e52e90397c8573b0d02598eb44f180e24996fc.tar.bz2
KVIrc-e7e52e90397c8573b0d02598eb44f180e24996fc.zip
First public version of webkit kvs interfacing (wip)... missing doc
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5565 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects/libkviobjects.cpp')
-rw-r--r--src/modules/objects/libkviobjects.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 99f1d9574..d3e7fa28b 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -22,6 +22,8 @@
//
//=============================================================================
+#include "kvi_settings.h"
+
#include "KvsObject_button.h"
#include "KvsObject_checkBox.h"
#include "KvsObject_comboBox.h"
@@ -61,6 +63,9 @@
#include "KvsObject_treeWidget.h"
#include "KvsObject_treeWidgeteItem.h"
#include "KvsObject_vBox.h"
+#ifdef COMPILE_WEBKIT_SUPPORT
+#include "KvsObject_webView.h"
+#endif
#include "KvsObject_widget.h"
#include "KvsObject_window.h"
#include "KvsObject_wizard.h"
@@ -94,7 +99,9 @@ static bool objects_module_cleanup(KviModule *)
{
// Don't attempt to change the order of these calls.
// Derived classes must be unregistered before the base ones.
-
+ #ifdef COMPILE_WEBKIT_SUPPORT
+ KvsObject_webView::unregisterSelf();
+ #endif
KvsObject_memoryBuffer::unregisterSelf();
KvsObject_process::unregisterSelf();
KvsObject_trayIcon::unregisterSelf();
@@ -800,7 +807,9 @@ static bool objects_module_init(KviModule * m)
KvsObject_trayIcon::registerSelf();
KvsObject_process::registerSelf();
KvsObject_memoryBuffer::registerSelf();
-
+ #ifdef COMPILE_WEBKIT_SUPPORT
+ KvsObject_webView::registerSelf();
+ #endif
return true;
}