From 22ca84d4d22ed7e39c626981e5ae85e9287c3edb Mon Sep 17 00:00:00 2001
From: wodim
Date: Thu, 7 Apr 2016 13:00:54 +0200
Subject: Remove all ifdefs related to older versions of Qt.

Now that we only support Qt 5 we will no longer need these.
---
 src/modules/objects/KvsObject_ftp.cpp  | 11 +++--------
 src/modules/objects/KvsObject_http.cpp | 11 +++--------
 src/modules/objects/KvsObject_lcd.cpp  |  4 ----
 src/modules/objects/KvsObject_sql.cpp  |  2 --
 src/modules/objects/KvsObject_sql.h    |  6 +-----
 src/modules/objects/KvsObject_widget.h |  6 +-----
 6 files changed, 8 insertions(+), 32 deletions(-)

(limited to 'src/modules/objects')

diff --git a/src/modules/objects/KvsObject_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp
index adfebfa36..5b25cda6a 100644
--- a/src/modules/objects/KvsObject_ftp.cpp
+++ b/src/modules/objects/KvsObject_ftp.cpp
@@ -30,14 +30,9 @@
 
 #include "KviLocale.h"
 
-#if (QT_VERSION > 0x050000)
-	// Qt >= 5.0.0 has no QFtp.
-	// We use the external source code module provided by digia (in qtftp)
-	#include <qftp.h>
-#else
-	// Use standard QFtp
-	#include <QFtp>
-#endif
+// Qt >= 5.0.0 has no QFtp.
+// We use the external source code module provided by digia (in qtftp)
+#include <qftp.h>
 
 #include <QHashIterator>
 
diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp
index 57bb11d74..7a83bbc10 100644
--- a/src/modules/objects/KvsObject_http.cpp
+++ b/src/modules/objects/KvsObject_http.cpp
@@ -28,14 +28,9 @@
 #include "KviError.h"
 #include "KviLocale.h"
 
-#if (QT_VERSION > 0x050000)
-	// Qt >= 5.0.0 has no QHttp.
-	// We use the external source code module provided by digia (in qthttp)
-	#include <qhttp.h>
-#else
-	// Use standard QHttp
-	#include <QHttp>
-#endif
+// Qt >= 5.0.0 has no QHttp.
+// We use the external source code module provided by digia (in qthttp)
+#include <qhttp.h>
 
 #include <QUrl>
 
diff --git a/src/modules/objects/KvsObject_lcd.cpp b/src/modules/objects/KvsObject_lcd.cpp
index b770a1ac5..39c8f3489 100644
--- a/src/modules/objects/KvsObject_lcd.cpp
+++ b/src/modules/objects/KvsObject_lcd.cpp
@@ -164,11 +164,7 @@ KVSO_CLASS_FUNCTION(lcd,setNumDigits)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("digit",KVS_PT_DOUBLE,0,digit)
 	KVSO_PARAMETERS_END(c)
-#if (QT_VERSION >= 0x050000)
 	((QLCDNumber *)widget())->setDigitCount((int)digit);
-#else
-	((QLCDNumber *)widget())->setNumDigits((int)digit);
-#endif
 	return true;
 }
 
diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp
index 722f1724b..9e212c8b8 100644
--- a/src/modules/objects/KvsObject_sql.cpp
+++ b/src/modules/objects/KvsObject_sql.cpp
@@ -29,11 +29,9 @@
 #include "KvsObject_memoryBuffer.h"
 #include <stdlib.h>
 #include <QHash>
-#if (QT_VERSION >= 0x050000)
 #include <QSqlDriver>
 #include <QSqlError>
 #include <QSqlRecord>
-#endif
 
 #define CHECK_QUERY_IS_INIT if (!m_pCurrentSQlQuery)\
 			{\
diff --git a/src/modules/objects/KvsObject_sql.h b/src/modules/objects/KvsObject_sql.h
index ac8ebf2b5..dff227903 100644
--- a/src/modules/objects/KvsObject_sql.h
+++ b/src/modules/objects/KvsObject_sql.h
@@ -29,11 +29,7 @@
 #include "KviPointerList.h"
 #include "KviKvsVariant.h"
 #include "object_macros.h"
-#if (QT_VERSION >= 0x050000)
-	#include <QSqlQuery>
-#else
-	#include <QtSql>
-#endif
+#include <QSqlQuery>
 #include <QHash>
 
 class KvsObject_sql : public KviKvsObject
diff --git a/src/modules/objects/KvsObject_widget.h b/src/modules/objects/KvsObject_widget.h
index 054f1af2e..0f49ce25d 100644
--- a/src/modules/objects/KvsObject_widget.h
+++ b/src/modules/objects/KvsObject_widget.h
@@ -33,11 +33,7 @@
 #include <QGraphicsEffect>
 
 #ifdef COMPILE_WEBKIT_SUPPORT
-	#if (QT_VERSION < 0x050000)
-		#include <QtWebKit/QWebView>
-	#else
-		#include <QtWebKitWidgets/QWebView>
-	#endif
+	#include <QtWebKitWidgets/QWebView>
 #endif
 
 class KvsObject_widget : public KviKvsObject
-- 
cgit v1.3.1-10-gc9f91