From 6592a47e5dd48c7b5c506c3bde0dce57fe858298 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:50:28 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 libktorrent/datachecker/multidatachecker.cpp  | 2 +-
 libktorrent/datachecker/singledatachecker.cpp | 2 +-
 libktorrent/functions.cpp                     | 4 ++--
 libktorrent/interfaces/filetreediritem.cpp    | 4 ++--
 libktorrent/interfaces/filetreeitem.cpp       | 4 ++--
 libktorrent/interfaces/functions.cpp          | 4 ++--
 libktorrent/labelview.cpp                     | 2 +-
 libktorrent/migrate/ccmigrate.cpp             | 2 +-
 libktorrent/migrate/migrate.cpp               | 2 +-
 libktorrent/pluginmanagerprefpage.cpp         | 4 ++--
 libktorrent/torrent/announcelist.cpp          | 2 +-
 libktorrent/torrent/bdecoder.cpp              | 2 +-
 libktorrent/torrent/cachefile.cpp             | 2 +-
 libktorrent/torrent/chunkdownload.cpp         | 2 +-
 libktorrent/torrent/chunkmanager.cpp          | 2 +-
 libktorrent/torrent/dndfile.cpp               | 2 +-
 libktorrent/torrent/httptracker.cpp           | 2 +-
 libktorrent/torrent/multifilecache.cpp        | 2 +-
 libktorrent/torrent/peerid.cpp                | 2 +-
 libktorrent/torrent/peermanager.cpp           | 2 +-
 libktorrent/torrent/peersourcemanager.cpp     | 2 +-
 libktorrent/torrent/preallocationthread.cpp   | 2 +-
 libktorrent/torrent/queuemanager.cpp          | 4 ++--
 libktorrent/torrent/singlefilecache.cpp       | 2 +-
 libktorrent/torrent/torrent.cpp               | 2 +-
 libktorrent/torrent/torrentcontrol.cpp        | 4 ++--
 libktorrent/torrent/torrentcreator.cpp        | 2 +-
 libktorrent/torrent/udptrackersocket.cpp      | 4 ++--
 libktorrent/util/file.cpp                     | 2 +-
 libktorrent/util/fileops.cpp                  | 2 +-
 libktorrent/util/functions.cpp                | 4 ++--
 libktorrent/util/log.cpp                      | 2 +-
 libktorrent/util/mmapfile.cpp                 | 2 +-
 33 files changed, 42 insertions(+), 42 deletions(-)

(limited to 'libktorrent')

diff --git a/libktorrent/datachecker/multidatachecker.cpp b/libktorrent/datachecker/multidatachecker.cpp
index dcbac73..f63e05c 100644
--- a/libktorrent/datachecker/multidatachecker.cpp
+++ b/libktorrent/datachecker/multidatachecker.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <util/log.h>
 #include <util/file.h>
diff --git a/libktorrent/datachecker/singledatachecker.cpp b/libktorrent/datachecker/singledatachecker.cpp
index 21341bb..4ecc268 100644
--- a/libktorrent/datachecker/singledatachecker.cpp
+++ b/libktorrent/datachecker/singledatachecker.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <util/log.h>
 #include <util/file.h>
diff --git a/libktorrent/functions.cpp b/libktorrent/functions.cpp
index f57837d..45ef9a2 100644
--- a/libktorrent/functions.cpp
+++ b/libktorrent/functions.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <tqdatetime.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <util/functions.h>
 #include "functions.h"
diff --git a/libktorrent/interfaces/filetreediritem.cpp b/libktorrent/interfaces/filetreediritem.cpp
index 0b37646..167ff2d 100644
--- a/libktorrent/interfaces/filetreediritem.cpp
+++ b/libktorrent/interfaces/filetreediritem.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <util/functions.h>
diff --git a/libktorrent/interfaces/filetreeitem.cpp b/libktorrent/interfaces/filetreeitem.cpp
index b864b72..ca431b5 100644
--- a/libktorrent/interfaces/filetreeitem.cpp
+++ b/libktorrent/interfaces/filetreeitem.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <interfaces/functions.h>
diff --git a/libktorrent/interfaces/functions.cpp b/libktorrent/interfaces/functions.cpp
index 709b647..096a48c 100644
--- a/libktorrent/interfaces/functions.cpp
+++ b/libktorrent/interfaces/functions.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <tqdatetime.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include "functions.h"
 
 using namespace bt;
diff --git a/libktorrent/labelview.cpp b/libktorrent/labelview.cpp
index ca44f5d..7fe1424 100644
--- a/libktorrent/labelview.cpp
+++ b/libktorrent/labelview.cpp
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <util/log.h>
 #include "labelview.h"
 
diff --git a/libktorrent/migrate/ccmigrate.cpp b/libktorrent/migrate/ccmigrate.cpp
index e824830..631ac6f 100644
--- a/libktorrent/migrate/ccmigrate.cpp
+++ b/libktorrent/migrate/ccmigrate.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <util/log.h>
 #include <util/file.h>
 #include <util/error.h>
diff --git a/libktorrent/migrate/migrate.cpp b/libktorrent/migrate/migrate.cpp
index ef6ddf1..4de80cc 100644
--- a/libktorrent/migrate/migrate.cpp
+++ b/libktorrent/migrate/migrate.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <util/log.h>
 #include <util/error.h>
 #include <util/fileops.h>
diff --git a/libktorrent/pluginmanagerprefpage.cpp b/libktorrent/pluginmanagerprefpage.cpp
index 497ea2e..872c8c1 100644
--- a/libktorrent/pluginmanagerprefpage.cpp
+++ b/libktorrent/pluginmanagerprefpage.cpp
@@ -17,11 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
 #include <tqheader.h> 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <util/constants.h>
 #include "pluginmanager.h"
diff --git a/libktorrent/torrent/announcelist.cpp b/libktorrent/torrent/announcelist.cpp
index 4d3d4fa..65424d0 100644
--- a/libktorrent/torrent/announcelist.cpp
+++ b/libktorrent/torrent/announcelist.cpp
@@ -24,7 +24,7 @@
 #include "globals.h"
 #include <util/log.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstringlist.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/libktorrent/torrent/bdecoder.cpp b/libktorrent/torrent/bdecoder.cpp
index e965eb5..38bc67b 100644
--- a/libktorrent/torrent/bdecoder.cpp
+++ b/libktorrent/torrent/bdecoder.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include <util/log.h>
 #include <util/error.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "bdecoder.h"
 #include "bnode.h"
 #include "globals.h"
diff --git a/libktorrent/torrent/cachefile.cpp b/libktorrent/torrent/cachefile.cpp
index cb6f902..fc7cd33 100644
--- a/libktorrent/torrent/cachefile.cpp
+++ b/libktorrent/torrent/cachefile.cpp
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <tqfile.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
 #include <util/array.h>
 #include <util/fileops.h>
diff --git a/libktorrent/torrent/chunkdownload.cpp b/libktorrent/torrent/chunkdownload.cpp
index 38e4fec..76638ce 100644
--- a/libktorrent/torrent/chunkdownload.cpp
+++ b/libktorrent/torrent/chunkdownload.cpp
@@ -30,7 +30,7 @@
 #include "piece.h"
 #include "peerdownloader.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace bt
 {	
diff --git a/libktorrent/torrent/chunkmanager.cpp b/libktorrent/torrent/chunkmanager.cpp
index aa50ad8..1fa4607 100644
--- a/libktorrent/torrent/chunkmanager.cpp
+++ b/libktorrent/torrent/chunkmanager.cpp
@@ -33,7 +33,7 @@
 #include <util/functions.h>
 #include "globals.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace bt
 {
diff --git a/libktorrent/torrent/dndfile.cpp b/libktorrent/torrent/dndfile.cpp
index dffb763..23f0f1c 100644
--- a/libktorrent/torrent/dndfile.cpp
+++ b/libktorrent/torrent/dndfile.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <util/file.h>
 #include <util/error.h>
 #include <util/fileops.h>
diff --git a/libktorrent/torrent/httptracker.cpp b/libktorrent/torrent/httptracker.cpp
index 249a60e..2367ca0 100644
--- a/libktorrent/torrent/httptracker.cpp
+++ b/libktorrent/torrent/httptracker.cpp
@@ -20,7 +20,7 @@
 #include <config.h>
  
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqhostaddress.h>
 #include <util/log.h>
 #include <util/functions.h>
diff --git a/libktorrent/torrent/multifilecache.cpp b/libktorrent/torrent/multifilecache.cpp
index ff5c8a9..aaa2797 100644
--- a/libktorrent/torrent/multifilecache.cpp
+++ b/libktorrent/torrent/multifilecache.cpp
@@ -21,7 +21,7 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 #include <tqfileinfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <util/file.h>
 #include <util/fileops.h>
diff --git a/libktorrent/torrent/peerid.cpp b/libktorrent/torrent/peerid.cpp
index e6a3387..f15d5f2 100644
--- a/libktorrent/torrent/peerid.cpp
+++ b/libktorrent/torrent/peerid.cpp
@@ -20,7 +20,7 @@
 #include <time.h>
 #include <stdlib.h>
 #include <tqmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "peerid.h"
 #include "ktversion.h"
 
diff --git a/libktorrent/torrent/peermanager.cpp b/libktorrent/torrent/peermanager.cpp
index eefd246..3f542c8 100644
--- a/libktorrent/torrent/peermanager.cpp
+++ b/libktorrent/torrent/peermanager.cpp
@@ -34,7 +34,7 @@
 #include <tqhostaddress.h>
 #include <mse/streamsocket.h> 
 #include <mse/encryptedauthenticate.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "ipblocklist.h"
 #include "chunkcounter.h"
 #include "authenticationmonitor.h"
diff --git a/libktorrent/torrent/peersourcemanager.cpp b/libktorrent/torrent/peersourcemanager.cpp
index 136d9e5..a48ccb0 100644
--- a/libktorrent/torrent/peersourcemanager.cpp
+++ b/libktorrent/torrent/peersourcemanager.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <functions.h>
 #include <util/log.h>
 #include <torrent/globals.h>
diff --git a/libktorrent/torrent/preallocationthread.cpp b/libktorrent/torrent/preallocationthread.cpp
index 4b2e40d..dfa8c56 100644
--- a/libktorrent/torrent/preallocationthread.cpp
+++ b/libktorrent/torrent/preallocationthread.cpp
@@ -26,7 +26,7 @@
 #include <util/log.h>
 #include <util/error.h>
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "preallocationthread.h"
 #include "chunkmanager.h"
 #include "globals.h"
diff --git a/libktorrent/torrent/queuemanager.cpp b/libktorrent/torrent/queuemanager.cpp
index bf64a2e..bc04f9f 100644
--- a/libktorrent/torrent/queuemanager.cpp
+++ b/libktorrent/torrent/queuemanager.cpp
@@ -21,8 +21,8 @@
 #include "queuemanager.h"
 
 #include <tqstring.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <util/log.h>
 #include <util/error.h>
 #include <util/sha1hash.h>
diff --git a/libktorrent/torrent/singlefilecache.cpp b/libktorrent/torrent/singlefilecache.cpp
index 9df0719..c89c0be 100644
--- a/libktorrent/torrent/singlefilecache.cpp
+++ b/libktorrent/torrent/singlefilecache.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfileinfo.h>
 #include <tqstringlist.h> 
 #include <util/fileops.h>
diff --git a/libktorrent/torrent/torrent.cpp b/libktorrent/torrent/torrent.cpp
index c175be9..a829230 100644
--- a/libktorrent/torrent/torrent.cpp
+++ b/libktorrent/torrent/torrent.cpp
@@ -32,7 +32,7 @@
 #include "bnode.h"
 #include "announcelist.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace bt
 {
diff --git a/libktorrent/torrent/torrentcontrol.cpp b/libktorrent/torrent/torrentcontrol.cpp
index 207b709..14ff2c6 100644
--- a/libktorrent/torrent/torrentcontrol.cpp
+++ b/libktorrent/torrent/torrentcontrol.cpp
@@ -20,8 +20,8 @@
  ***************************************************************************/
 #include <tqdir.h>
 #include <tqfile.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tqtextstream.h>
 #include <util/log.h>
diff --git a/libktorrent/torrent/torrentcreator.cpp b/libktorrent/torrent/torrentcreator.cpp
index fae7d75..35c8c3e 100644
--- a/libktorrent/torrent/torrentcreator.cpp
+++ b/libktorrent/torrent/torrentcreator.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include <tqdir.h>
 #include <tqfileinfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <time.h>
 #include <util/error.h>
 #include <ktversion.h>
diff --git a/libktorrent/torrent/udptrackersocket.cpp b/libktorrent/torrent/udptrackersocket.cpp
index bab6f02..6df3cdf 100644
--- a/libktorrent/torrent/udptrackersocket.cpp
+++ b/libktorrent/torrent/udptrackersocket.cpp
@@ -27,8 +27,8 @@
 #include <net/portlist.h>
 #include <util/log.h>
 #include <util/functions.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include "globals.h"
 #include "udptrackersocket.h"
 		
diff --git a/libktorrent/util/file.cpp b/libktorrent/util/file.cpp
index d27ccba..95af348 100644
--- a/libktorrent/util/file.cpp
+++ b/libktorrent/util/file.cpp
@@ -24,7 +24,7 @@
 
 #include <tqfile.h>
 #include "config.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/libktorrent/util/fileops.cpp b/libktorrent/util/fileops.cpp
index a3e2bf1..29e7549 100644
--- a/libktorrent/util/fileops.cpp
+++ b/libktorrent/util/fileops.cpp
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/libktorrent/util/functions.cpp b/libktorrent/util/functions.cpp
index b53a88e..2480a24 100644
--- a/libktorrent/util/functions.cpp
+++ b/libktorrent/util/functions.cpp
@@ -29,9 +29,9 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "functions.h"
 #include "error.h"
 #include "log.h"
diff --git a/libktorrent/util/log.cpp b/libktorrent/util/log.cpp
index 258506a..42e2716 100644
--- a/libktorrent/util/log.cpp
+++ b/libktorrent/util/log.cpp
@@ -20,7 +20,7 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdatetime.h>
 #include <tqtextstream.h>
 #include <tqfile.h>
diff --git a/libktorrent/util/mmapfile.cpp b/libktorrent/util/mmapfile.cpp
index 398ce34..b60bef9 100644
--- a/libktorrent/util/mmapfile.cpp
+++ b/libktorrent/util/mmapfile.cpp
@@ -32,7 +32,7 @@
 #include <tqfile.h>
 #include <tdefileitem.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <util/error.h>
 #include <util/log.h>
 #include <torrent/globals.h>
-- 
cgit v1.2.3