diff options
| author |  wodim | 2011-03-24 11:43:28 +0000 |
|---|---|---|
| committer | wodim | 2011-03-24 11:43:28 +0000 |
| commit | bd08f187fe11b437c91142141b7180696e7ccb48 (patch) | |
| tree | f53e1a6b75880fca8f15ee83e5050389d26ed533 /src/modules/objects | |
| parent | upd8 spanish translation (diff) | |
| download | KVIrc-bd08f187fe11b437c91142141b7180696e7ccb48.tar.gz KVIrc-bd08f187fe11b437c91142141b7180696e7ccb48.tar.bz2 KVIrc-bd08f187fe11b437c91142141b7180696e7ccb48.zip | |
delete Qt <4.6 hacks
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5685 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects')
| -rw-r--r-- | src/modules/objects/KvsObject_webView.cpp | 6 | ||||
| -rw-r--r-- | src/modules/objects/KvsObject_webView.h | 4 | ||||
| -rw-r--r-- | src/modules/objects/libkviobjects.cpp | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp index 8bdfa0e42..64f343c7e 100644 --- a/src/modules/objects/KvsObject_webView.cpp +++ b/src/modules/objects/KvsObject_webView.cpp @@ -25,7 +25,7 @@ // #include "kvi_settings.h" -#if defined(COMPILE_WEBKIT_SUPPORT) && (QT_VERSION >= 0x040600) +#if defined(COMPILE_WEBKIT_SUPPORT) #include <QtWebKit/QWebView> #include <QWebSettings> #include <QWebElement> @@ -637,6 +637,4 @@ void KvsObject_webView::slotDownloadRequest(const QNetworkRequest &r) } } - -#endif - +#endif // COMPILE_WEBKIT_SUPPORT diff --git a/src/modules/objects/KvsObject_webView.h b/src/modules/objects/KvsObject_webView.h index 221fb3aea..a096cea7f 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) && (QT_VERSION >= 0x040600) +#if defined(COMPILE_WEBKIT_SUPPORT) #include "object_macros.h" #include <QFile> #include <QNetworkAccessManager> @@ -117,5 +117,5 @@ protected slots: void slotReadyRead(); void slotReplyFinished(); }; -#endif +#endif // COMPILE_WEBKIT_SUPPORT #endif //!_CLASS_WEBVIEW_H_ diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 8a274b7d7..69461fe5e 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -63,7 +63,7 @@ #include "KvsObject_treeWidget.h" #include "KvsObject_treeWidgeteItem.h" #include "KvsObject_vBox.h" -#if defined(COMPILE_WEBKIT_SUPPORT) && (QT_VERSION >= 0x040600) +#if defined(COMPILE_WEBKIT_SUPPORT) #include "KvsObject_webView.h" #endif #include "KvsObject_widget.h" @@ -99,7 +99,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) && (QT_VERSION >= 0x040600) + #if defined(COMPILE_WEBKIT_SUPPORT) KvsObject_webView::unregisterSelf(); #endif KvsObject_memoryBuffer::unregisterSelf(); @@ -807,7 +807,7 @@ static bool objects_module_init(KviModule * m) KvsObject_trayIcon::registerSelf(); KvsObject_process::registerSelf(); KvsObject_memoryBuffer::registerSelf(); - #if defined(COMPILE_WEBKIT_SUPPORT) && (QT_VERSION >= 0x040600) + #if defined(COMPILE_WEBKIT_SUPPORT) KvsObject_webView::registerSelf(); #endif return true; |