aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects
diff options
context:
space:
mode:
authorGravatar Fabio Bas2023-09-20 22:07:04 +0200
committerGravatar ctrlaltca2023-10-18 10:26:35 +0200
commit9419f8b75e9f4816d62614b7cbcdc23b6738a81f (patch)
treef82a615acdd1ed738298cff73fb749276a7ba023 /src/modules/objects
parentREADME.md: replace travis badge with github actions (diff)
downloadKVIrc-9419f8b75e9f4816d62614b7cbcdc23b6738a81f.tar.gz
KVIrc-9419f8b75e9f4816d62614b7cbcdc23b6738a81f.tar.bz2
KVIrc-9419f8b75e9f4816d62614b7cbcdc23b6738a81f.zip
Rename COMPILE_WEBKIT_SUPPORT to COMPILE_WEBENGINE_SUPPORT
Diffstat (limited to 'src/modules/objects')
-rw-r--r--src/modules/objects/KvsObject_webView.cpp8
-rw-r--r--src/modules/objects/KvsObject_webView.h4
-rw-r--r--src/modules/objects/KvsObject_widget.h6
-rw-r--r--src/modules/objects/libkviobjects.cpp6
4 files changed, 12 insertions, 12 deletions
diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index 470bfca0d..d5fc79414 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -33,7 +33,7 @@
#include <QMenu>
-#if defined(COMPILE_WEBKIT_SUPPORT)
+#if defined(COMPILE_WEBENGINE_SUPPORT)
#include <QWebEngineProfile>
#include <QWebEngineView>
#include <QWebEngineSettings>
@@ -276,12 +276,12 @@ const char * const actions_tbl[] = {
@type:
class
@short:
- Provides web support in a widget using webkit.
+ Provides web support in a widget using webengine.
@inherits:
[class]object[/class]
[class]widget[/class]
@description:
- Provides an embedded web browser using webkit. Page structure can be managed by web element's unique identifiers.
+ Provides an embedded web browser using webengine. Page structure can be managed by web element's unique identifiers.
@functions:
!fn: $load(<url:string>)
Sets the current URL for the webView and starts loading it
@@ -787,4 +787,4 @@ bool KviKvsWebView::event(QEvent * e)
}
KviKvsWebView::~KviKvsWebView()
= default;
-#endif // COMPILE_WEBKIT_SUPPORT
+#endif // COMPILE_WEBENGINE_SUPPORT
diff --git a/src/modules/objects/KvsObject_webView.h b/src/modules/objects/KvsObject_webView.h
index b396a38bb..8bb9f9b9e 100644
--- a/src/modules/objects/KvsObject_webView.h
+++ b/src/modules/objects/KvsObject_webView.h
@@ -26,7 +26,7 @@
//=============================================================================
#include "kvi_settings.h"
-#if defined(COMPILE_WEBKIT_SUPPORT)
+#if defined(COMPILE_WEBENGINE_SUPPORT)
#include "object_macros.h"
#include <QFile>
#include <QNetworkAccessManager>
@@ -170,5 +170,5 @@ protected slots:
void slotFinished();
};
-#endif // COMPILE_WEBKIT_SUPPORT
+#endif // COMPILE_WEBENGINE_SUPPORT
#endif // _CLASS_WEBVIEW_H_
diff --git a/src/modules/objects/KvsObject_widget.h b/src/modules/objects/KvsObject_widget.h
index ef5cd158f..66835664e 100644
--- a/src/modules/objects/KvsObject_widget.h
+++ b/src/modules/objects/KvsObject_widget.h
@@ -32,7 +32,7 @@
#include <QGraphicsEffect>
-#ifdef COMPILE_WEBKIT_SUPPORT
+#ifdef COMPILE_WEBENGINE_SUPPORT
#include <QWebEngineView>
#endif
@@ -48,7 +48,7 @@ public:
protected:
bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
-#ifdef COMPILE_WEBKIT_SUPPORT
+#ifdef COMPILE_WEBENGINE_SUPPORT
QWebEngineView * m_pWebview = nullptr;
#endif
bool eventFilter(QObject * o, QEvent * e) override;
@@ -130,7 +130,7 @@ protected:
bool y(KviKvsObjectFunctionCall *);
bool grab(KviKvsObjectFunctionCall *);
-#ifdef COMPILE_WEBKIT_SUPPORT
+#ifdef COMPILE_WEBENGINE_SUPPORT
bool setWebView(KviKvsObjectFunctionCall * c);
#endif
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 12d9e6c00..091eff6ae 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -65,7 +65,7 @@
#include "KvsObject_treeWidget.h"
#include "KvsObject_treeWidgeteItem.h"
#include "KvsObject_vBox.h"
-#if defined(COMPILE_WEBKIT_SUPPORT)
+#if defined(COMPILE_WEBENGINE_SUPPORT)
#include "KvsObject_webView.h"
#endif
#include "KvsObject_widget.h"
@@ -97,7 +97,7 @@ 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.
-#if defined(COMPILE_WEBKIT_SUPPORT)
+#if defined(COMPILE_WEBENGINE_SUPPORT)
KvsObject_webView::unregisterSelf();
#endif
KvsObject_memoryBuffer::unregisterSelf();
@@ -797,7 +797,7 @@ static bool objects_module_init(KviModule * m)
KvsObject_trayIcon::registerSelf();
KvsObject_process::registerSelf();
KvsObject_memoryBuffer::registerSelf();
-#if defined(COMPILE_WEBKIT_SUPPORT)
+#if defined(COMPILE_WEBENGINE_SUPPORT)
KvsObject_webView::registerSelf();
#endif
return true;