From 81b64bcfc0a32fdeb0e4f367adbf273d924e55f4 Mon Sep 17 00:00:00 2001
From: gregory guy <gregory-tde@laposte.net>
Date: Tue, 20 Oct 2020 14:40:51 +0200
Subject: Conversion to the cmake building system.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
---
 src/tork.cpp | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/tork.cpp')

diff --git a/src/tork.cpp b/src/tork.cpp
index fb17b0a..d53df07 100644
--- a/src/tork.cpp
+++ b/src/tork.cpp
@@ -19,14 +19,23 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#include <ntqdragobject.h>
-#include <kprinter.h>
-#include <ntqpainter.h>
-#include <ntqpaintdevicemetrics.h>
-#include <ntqtimer.h>
-#include <ntqgroupbox.h>
+#include <tqdragobject.h>
+#include <tqpainter.h>
+#include <tqpaintdevicemetrics.h>
+#include <tqtimer.h>
+#include <tqgroupbox.h>
+#include <tqtooltip.h>
+#include <tqlabel.h>
+#include <tqfile.h>
+#include <tqdir.h>
+#include <tqtabwidget.h>
+#include <tqhostaddress.h>
 
+#include <kprinter.h>
 #include <tdeconfigdialog.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
@@ -60,21 +69,14 @@
 #include <twin.h>
 #include <knotifyclient.h>
 #include <tdelistviewsearchline.h>
-
-#include <ntqtooltip.h>
-#include <ntqlabel.h>
-#include <ntqfile.h>
-#include <ntqdir.h>
-#include <ntqtabwidget.h>
-#include <ntqhostaddress.h>
 #include <dcopref.h>
 #include <dcopclient.h>
 #include <tdecmdlineargs.h>
 
-#ifndef EXTERNAL_GEOIP
-# include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
-#else
+#ifdef EXTERNAL_GEOIP
 # include <GeoIP.h>
+#else
+# include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
 #endif
 
 #include "tork.h"
@@ -94,8 +96,6 @@
 #include "version.h"
 #include "hiddensrvs.h"
 
-#include "../config.h"
-
 tork *tdemain = 0L;
 
 using namespace tk;
@@ -2991,15 +2991,15 @@ void tork::startController()
 
     updateServerButton();
 
-#ifndef EXTERNAL_GEOIP
-    geoip_db = !locate("data", "tork/geoip/GeoIP.dat").isNull();
-#else
+#ifdef EXTERNAL_GEOIP
     GeoIP * gi = 0;
     gi = GeoIP_new(GEOIP_STANDARD);
     if (gi)
         geoip_db = true;
     else
         geoip_db = false;
+#else
+    geoip_db = !locate("data", "tork/geoip/GeoIP.dat").isNull();
 #endif
 
     client->setGeoIPAvailable(geoip_db);
-- 
cgit v1.2.1