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/util | |
| parent | 409b87cbe23e2f18e7a73a81ce958aa0fdd148e4 (diff) | |
| download | ktorrent-6592a47e5dd48c7b5c506c3bde0dce57fe858298.tar.gz ktorrent-6592a47e5dd48c7b5c506c3bde0dce57fe858298.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libktorrent/util')
| -rw-r--r-- | libktorrent/util/file.cpp | 2 | ||||
| -rw-r--r-- | libktorrent/util/fileops.cpp | 2 | ||||
| -rw-r--r-- | libktorrent/util/functions.cpp | 4 | ||||
| -rw-r--r-- | libktorrent/util/log.cpp | 2 | ||||
| -rw-r--r-- | libktorrent/util/mmapfile.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
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> |