summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:46:26 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:46:26 -0600
commit8d8f89a9239b1386f3e5f5c057dffc9c6464c055 (patch)
treef1da90238c79241e3d22f79a25839eee37ac1dc0
parent8e887879589b340e5f530255d44632f7705089f3 (diff)
downloadtdeio-apt-8d8f89a9.tar.gz
tdeio-apt-8d8f89a9.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--src/apt.cpp6
-rw-r--r--src/dpkg.cpp2
-rw-r--r--src/parsers/list.cpp2
-rw-r--r--src/parsers/policy.cpp2
-rw-r--r--src/parsers/show.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/apt.cpp b/src/apt.cpp
index c329835..b5adb26 100644
--- a/src/apt.cpp
+++ b/src/apt.cpp
@@ -20,13 +20,13 @@
#include <tdeapplication.h>
#include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <tdeio/slavebase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
diff --git a/src/dpkg.cpp b/src/dpkg.cpp
index 98cf151..7ab742f 100644
--- a/src/dpkg.cpp
+++ b/src/dpkg.cpp
@@ -13,7 +13,7 @@
#include "dpkg.h"
#include "debug.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqstringlist.h>
diff --git a/src/parsers/list.cpp b/src/parsers/list.cpp
index 9484d9d..3010b86 100644
--- a/src/parsers/list.cpp
+++ b/src/parsers/list.cpp
@@ -12,7 +12,7 @@
#include "../apt.h"
#include <tdeio/slavebase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqregexp.h>
#include <kurl.h>
diff --git a/src/parsers/policy.cpp b/src/parsers/policy.cpp
index 3b8e8ed..72ccadf 100644
--- a/src/parsers/policy.cpp
+++ b/src/parsers/policy.cpp
@@ -11,7 +11,7 @@
#include "parsers.h"
#include "../apt.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <qhtmlstream.h>
#include <tqregexp.h>
diff --git a/src/parsers/show.cpp b/src/parsers/show.cpp
index 5ffbc82..254ec9b 100644
--- a/src/parsers/show.cpp
+++ b/src/parsers/show.cpp
@@ -11,7 +11,7 @@
#include "parsers.h"
#include "../apt.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqregexp.h>
static const TQString