delete Qt <4.6 hacks

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5685 17fca916-40b9-46aa-a4ea-0a15b648b75c

6 files changed, 10 insertions, 16 deletions

diff --git a/cmake/kvirc4.desktop.cmake b/cmake/kvirc4.desktop.cmake
index 95acc1e09..4e1064993 100644
--- a/cmake/kvirc4.desktop.cmake
+++ b/cmake/kvirc4.desktop.cmake
@@ -11,7 +11,7 @@ Comment[de]=Internet Relay Chat betreten.
 Comment[pl]=Połącz się z Internet Relay Chat (IRC)
 Comment[pt]=Conectar ao IRC (Internet Relay Chat)
 Comment[tr]=IRC'e bağlanın
-Comment[es]=Conecta al chat IRC
+Comment[es]=Conectar al chat IRC
 Exec=${KVIRC_BINARYNAME} -m %u
 Icon=kvirc
 Type=Application
diff --git a/src/modules/help/HelpWidget.cpp b/src/modules/help/HelpWidget.cpp
index 1af2b4da9..edede5eb1 100644
--- a/src/modules/help/HelpWidget.cpp
+++ b/src/modules/help/HelpWidget.cpp
@@ -47,11 +47,7 @@ extern KviPointerList<HelpWidget> * g_pHelpWidgetList;
 #ifdef COMPILE_WEBKIT_SUPPORT
 #include <QtWebKit/QWebView>
 
-#if QT_VERSION >= 0x040600
-	#define HIGHLIGHT_FLAGS QWebPage::HighlightAllOccurrences
-#else
-	#define HIGHLIGHT_FLAGS 0
-#endif
+#define HIGHLIGHT_FLAGS QWebPage::HighlightAllOccurrences
 
 HelpWidget::HelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
 : QWidget(par)
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;
diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp
index 441a8a212..c2e667080 100644
--- a/src/modules/theme/ThemeManagementDialog.cpp
+++ b/src/modules/theme/ThemeManagementDialog.cpp
@@ -23,7 +23,7 @@
 //=============================================================================
 #include "kvi_settings.h"
 
-#if defined(COMPILE_WEBKIT_SUPPORT) && (QT_VERSION >= 0x040600)
+#if defined(COMPILE_WEBKIT_SUPPORT)
 	#include "WebThemeInterfaceDialog.h"
 #endif