diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:50:28 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:50:28 -0600 |
commit | 6592a47e5dd48c7b5c506c3bde0dce57fe858298 (patch) | |
tree | 7f6eaf648b3ca743de3f6220c7f2b29d40480144 /libktorrent/torrent | |
parent | 409b87cbe23e2f18e7a73a81ce958aa0fdd148e4 (diff) | |
download | ktorrent-6592a47e5dd48c7b5c506c3bde0dce57fe858298.tar.gz ktorrent-6592a47e5dd48c7b5c506c3bde0dce57fe858298.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libktorrent/torrent')
-rw-r--r-- | libktorrent/torrent/announcelist.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/bdecoder.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/cachefile.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/chunkdownload.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/chunkmanager.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/dndfile.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/httptracker.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/multifilecache.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/peerid.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/peermanager.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/peersourcemanager.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/preallocationthread.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/queuemanager.cpp | 4 | ||||
-rw-r--r-- | libktorrent/torrent/singlefilecache.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/torrent.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/torrentcontrol.cpp | 4 | ||||
-rw-r--r-- | libktorrent/torrent/torrentcreator.cpp | 2 | ||||
-rw-r--r-- | libktorrent/torrent/udptrackersocket.cpp | 4 |
18 files changed, 21 insertions, 21 deletions
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" |