diff options
| author |  Elvio Basello | 2008-09-12 14:49:46 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-09-12 14:49:46 +0000 |
| commit | 30a490dc6f237fac5bb4012dae2d250dbe48e107 (patch) | |
| tree | de6b92a79c628ad37f81e3b6a4c55fb7a645253d | |
| parent | QT4 new stuff and ftp/http(wip) new classes (lack of docs :\) (diff) | |
| download | KVIrc-30a490dc6f237fac5bb4012dae2d250dbe48e107.tar.gz KVIrc-30a490dc6f237fac5bb4012dae2d250dbe48e107.tar.bz2 KVIrc-30a490dc6f237fac5bb4012dae2d250dbe48e107.zip | |
fixed compilation
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2442 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/modules/objects/class_widget.cpp | 25 | ||||
| -rw-r--r-- | src/modules/objects/class_widget.h | 13 |
2 files changed, 28 insertions, 10 deletions
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 <QMetaObject>
#include <QIcon>
#include <QStatusBar>
-#include <QtWebKit/QWebView>
#include <QUrl>
+#ifdef COMPILE_WEBKIT_SUPPORT
+ #include <QtWebKit/QWebView>
+#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
diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h index 332a3d000..ef1c32d6f 100644 --- a/src/modules/objects/class_widget.h +++ b/src/modules/objects/class_widget.h @@ -24,7 +24,11 @@ #include "kvi_string.h"
#include "kvi_tal_tooltip.h"
#include "object_macros.h"
-#include <QtWebKit/QWebView>
+
+#ifdef COMPILE_WEBKIT_SUPPORT
+ #include <QtWebKit/QWebView>
+#endif
+
class KviKvsObject_widget : public KviKvsObject
{
Q_OBJECT
@@ -36,7 +40,10 @@ public: protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
- QWebView *webview;
+
+#ifdef COMPILE_WEBKIT_SUPPORT
+ QWebView * m_pWebview;
+#endif
virtual bool eventFilter(QObject *o,QEvent *e);
// ok, it is clear that we're messing with the naming conventions for the
@@ -109,7 +116,9 @@ protected: bool function_x(KviKvsObjectFunctionCall *);
bool function_y(KviKvsObjectFunctionCall *);
+#ifdef COMPILE_WEBKIT_SUPPORT
bool function_setWebView(KviKvsObjectFunctionCall *c);
+#endif
signals:
void aboutToDie();
|