summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:45:56 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:45:56 -0600
commit1246b1dacd883eff42d9b518537e7bbc457d3ed7 (patch)
tree6386b16f1425c7c4e02c3178d746426c87c19e6c
parentf64adcdb65616f865d909b3795f5983d7abe40d1 (diff)
downloadkdpkg-1246b1dacd883eff42d9b518537e7bbc457d3ed7.tar.gz
kdpkg-1246b1dacd883eff42d9b518537e7bbc457d3ed7.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--kdpkg-install/install.cpp2
-rw-r--r--kdpkg-install/main.cpp2
-rw-r--r--kdpkg/kdpkg.cpp2
-rw-r--r--kdpkg/main.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/kdpkg-install/install.cpp b/kdpkg-install/install.cpp
index 7dc27b9..95420a3 100644
--- a/kdpkg-install/install.cpp
+++ b/kdpkg-install/install.cpp
@@ -20,7 +20,7 @@
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kurlrequester.h>
#include <tdeaboutapplication.h>
diff --git a/kdpkg-install/main.cpp b/kdpkg-install/main.cpp
index 1ba32ed..0ce2b64 100644
--- a/kdpkg-install/main.cpp
+++ b/kdpkg-install/main.cpp
@@ -23,7 +23,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static TDECmdLineOptions options[] =
diff --git a/kdpkg/kdpkg.cpp b/kdpkg/kdpkg.cpp
index e6c0928..8fd1e41 100644
--- a/kdpkg/kdpkg.cpp
+++ b/kdpkg/kdpkg.cpp
@@ -19,7 +19,7 @@
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kgenericfactory.h>
#include <tdeaboutapplication.h>
#include <kurlrequester.h>
diff --git a/kdpkg/main.cpp b/kdpkg/main.cpp
index 700330a..cacb438 100644
--- a/kdpkg/main.cpp
+++ b/kdpkg/main.cpp
@@ -23,7 +23,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static TDECmdLineOptions options[] =