diff options
| author | gregory guy <[email protected]> | 2020-10-20 14:40:51 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2021-01-15 15:15:39 +0100 |
| commit | 7fefe15989a08e255ade5e577c781701b157d430 (patch) | |
| tree | 094796ae879ca732f013f7ff6baf059da9d3b862 /src/torclient.cpp | |
| parent | ade9896cdea394b76db639c1f22a43821a9d1ecd (diff) | |
| download | tork-7fefe15989a08e255ade5e577c781701b157d430.tar.gz tork-7fefe15989a08e255ade5e577c781701b157d430.zip | |
Conversion to the cmake building system.
Signed-off-by: gregory guy <[email protected]>
(cherry picked from commit 81b64bcfc0a32fdeb0e4f367adbf273d924e55f4)
Diffstat (limited to 'src/torclient.cpp')
| -rw-r--r-- | src/torclient.cpp | 40 |
1 files changed, 22 insertions, 18 deletions
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){ |