From 7fefe15989a08e255ade5e577c781701b157d430 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>
(cherry picked from commit 81b64bcfc0a32fdeb0e4f367adbf273d924e55f4)
---
 src/torclient.cpp | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

(limited to 'src/torclient.cpp')

diff --git a/src/torclient.cpp b/src/torclient.cpp
index 1652ed2..27c9477 100644
--- a/src/torclient.cpp
+++ b/src/torclient.cpp
@@ -19,18 +19,17 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#include <ntqsocket.h>
-#include <ntqtextstream.h>
-#include <ntqstringlist.h>
-#include <ntqregexp.h>
-#include "torclient.h"
-#include "tork.h"
-#include "torkconfig.h"
-#include "dndlistview.h"
-#include "functions.h"
+#include <tqdir.h>
+#include <tqsocket.h>
+#include <tqtextstream.h>
+#include <tqstringlist.h>
+#include <tqregexp.h>
+#include <tqtimer.h>
 
-#include <ntqtimer.h>
 #include <tdelocale.h>
 #include <assert.h>
 #include <ntqfile.h>
@@ -40,15 +39,20 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <kstandarddirs.h>
-#include <ntqdir.h>
-#include "crypto.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 "torclient.h"
+#include "tork.h"
+#include "torkconfig.h"
+#include "dndlistview.h"
+#include "functions.h"
+#include "crypto.h"
+
 /* Linux-specific includes */
 #include <dirent.h>
 #include <unistd.h>
@@ -827,10 +831,10 @@ void TorClient::parseServer(const TQString &info)
         GeoIP * gi = 0;
 
         if (geoip_db)
-#ifndef EXTERNAL_GEOIP
-            gi = GeoIP_open(locate("data", "tork/geoip/GeoIP.dat").ascii(),0);
-#else
+#ifdef EXTERNAL_GEOIP
             gi = GeoIP_new(GEOIP_STANDARD);
+#else
+            gi = GeoIP_open(locate("data", "tork/geoip/GeoIP.dat").ascii(),0);
 #endif
 
         if (gi){
-- 
cgit v1.2.1