From 30a490dc6f237fac5bb4012dae2d250dbe48e107 Mon Sep 17 00:00:00 2001 From: Elvio Basello Date: Fri, 12 Sep 2008 14:49:46 +0000 Subject: fixed compilation git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2442 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/objects/class_widget.cpp | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'src/modules/objects/class_widget.cpp') diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 9dbf8ebf9..c09473b49 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -47,9 +47,12 @@ #include #include #include -#include #include +#ifdef COMPILE_WEBKIT_SUPPORT + #include +#endif + KviKvsWidget::KviKvsWidget(KviKvsObject_widget * object,QWidget * par) :QWidget(par), m_pObject(object) { @@ -706,7 +709,9 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object") KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"maybeTipEvent") KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"shortCutEvent") +#ifdef COMPILE_WEBKIT_SUPPORT KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setWebView",function_setWebView) +#endif KVSO_END_REGISTERCLASS(KviKvsObject_widget) @@ -1968,19 +1973,23 @@ bool KviKvsObject_widget::function_removeFromStatusBar(KviKvsObjectFunctionCall if (widget()) g_pFrame->statusBar()->removeWidget(widget()); return true; } + +#ifdef COMPILE_WEBKIT_SUPPORT bool KviKvsObject_widget::function_setWebView(KviKvsObjectFunctionCall *c) { - QString szUrl; - KVSO_PARAMETERS_BEGIN(c) - KVSO_PARAMETER("text",KVS_PT_STRING,0,szUrl) + QString szUrl; + KVSO_PARAMETERS_BEGIN(c) + KVSO_PARAMETER("text",KVS_PT_STRING,0,szUrl) KVSO_PARAMETERS_END(c) - webview=new QWebView(widget()); - webview->load(QUrl(szUrl)); - webview->show(); + m_pWebview = new QWebView(widget()); + m_pWebview->load(QUrl(szUrl)); + m_pWebview->show(); //if (widget()) g_pFrame->statusBar()->removeWidget(widget()); return true; } +#endif //COMPILE_WEBKIT_SUPPORT + #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_widget.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES -- cgit v1.3.1-10-gc9f91