summaryrefslogtreecommitdiffstats
path: root/atlantik
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:03:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:03:32 -0600
commit1a4615a891172a58eff43f5ef0cd150b67798f4e (patch)
tree10cb98b2e3578be42f305684bb404c4eb8247ae2 /atlantik
parent891c539927a94a67f8c8482b10f95af8dea8b63f (diff)
downloadtdegames-1a4615a891172a58eff43f5ef0cd150b67798f4e.tar.gz
tdegames-1a4615a891172a58eff43f5ef0cd150b67798f4e.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'atlantik')
-rw-r--r--atlantik/client/atlantik.cpp2
-rw-r--r--atlantik/client/eventlogwidget.cpp2
-rw-r--r--atlantik/client/monopigator.h2
-rw-r--r--atlantik/kio_atlantik/Makefile.am2
-rw-r--r--atlantik/kio_atlantik/kio_atlantik.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp
index 0b3923e7..64650ba7 100644
--- a/atlantik/client/atlantik.cpp
+++ b/atlantik/client/atlantik.cpp
@@ -26,7 +26,7 @@
#include <kaction.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <knotifyclient.h>
diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp
index 6bc81b04..c6c83896 100644
--- a/atlantik/client/eventlogwidget.cpp
+++ b/atlantik/client/eventlogwidget.cpp
@@ -23,7 +23,7 @@
#include <klocale.h>
#include <klistview.h>
#include <kdialogbase.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kiconloader.h>
#include <kpushbutton.h>
#include <kstringhandler.h>
diff --git a/atlantik/client/monopigator.h b/atlantik/client/monopigator.h
index 1a16943f..c174b6f4 100644
--- a/atlantik/client/monopigator.h
+++ b/atlantik/client/monopigator.h
@@ -22,7 +22,7 @@
#include <tqlistview.h>
#include <tqtimer.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <kurl.h>
class KExtendedSocket;
diff --git a/atlantik/kio_atlantik/Makefile.am b/atlantik/kio_atlantik/Makefile.am
index 69279666..39579cd8 100644
--- a/atlantik/kio_atlantik/Makefile.am
+++ b/atlantik/kio_atlantik/Makefile.am
@@ -12,4 +12,4 @@ kdelnk_DATA = atlantik.protocol
kdelnkdir = $(kde_servicesdir)
messages:
- $(XGETTEXT) *.cpp -o $(podir)/kio_atlantik.pot
+ $(XGETTEXT) *.cpp -o $(podir)/tdeio_atlantik.pot
diff --git a/atlantik/kio_atlantik/kio_atlantik.cpp b/atlantik/kio_atlantik/kio_atlantik.cpp
index d999e51b..4305867b 100644
--- a/atlantik/kio_atlantik/kio_atlantik.cpp
+++ b/atlantik/kio_atlantik/kio_atlantik.cpp
@@ -25,7 +25,7 @@
#define KDE_3_1_FEATURES
#endif
#endif
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
#include <kinstance.h>
#include <kprocess.h>