Rename many classes and header files to avoid conflicts with KDE4

15 files changed, 18 insertions, 18 deletions

diff --git a/atlantik/ChangeLog b/atlantik/ChangeLog
index b16274aa..6b84a3a9 100644
--- a/atlantik/ChangeLog
+++ b/atlantik/ChangeLog
@@ -97,7 +97,7 @@
 - use disability to join game when size == MAX in gameupdate (games in
   updategamelist now have canbejoined boolean attribute)
 - using playerupdate for player list in SelectConfiguration
-- use portfolioview instead of klistview for players during config
+- use portfolioview instead of tdelistview for players during config
 - better handling of display messages from server
 - fixed token animation
 
diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp
index 9557b80b..565ff0c6 100644
--- a/atlantik/client/atlantik.cpp
+++ b/atlantik/client/atlantik.cpp
@@ -23,7 +23,7 @@
 #include <tqpopupmenu.h>
 
 #include <kaboutapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <tdeconfig.h>
@@ -34,7 +34,7 @@
 #include <kstatusbar.h>
 #include <kstdgameaction.h>
 #include <kstdaction.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <tdeversion.h>
 #undef KDE_3_2_FEATURES
diff --git a/atlantik/client/atlantik.h b/atlantik/client/atlantik.h
index 7370204c..2d41c35f 100644
--- a/atlantik/client/atlantik.h
+++ b/atlantik/client/atlantik.h
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqptrlist.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "configdlg.h"
 #include "portfolioview.h"
diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp
index 064aa71e..43733a7b 100644
--- a/atlantik/client/eventlogwidget.cpp
+++ b/atlantik/client/eventlogwidget.cpp
@@ -21,7 +21,7 @@
 #include <tqdatetime.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
diff --git a/atlantik/client/selectconfiguration_widget.h b/atlantik/client/selectconfiguration_widget.h
index bf293e40..c95f6091 100644
--- a/atlantik/client/selectconfiguration_widget.h
+++ b/atlantik/client/selectconfiguration_widget.h
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqvgroupbox.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 
 class TQCheckBox;
diff --git a/atlantik/client/selectgame_widget.h b/atlantik/client/selectgame_widget.h
index 0f8427a0..59ed600a 100644
--- a/atlantik/client/selectgame_widget.h
+++ b/atlantik/client/selectgame_widget.h
@@ -20,7 +20,7 @@
 #include <tqwidget.h>
 #include <tqlayout.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 
 class AtlanticCore;
diff --git a/atlantik/client/selectserver_widget.h b/atlantik/client/selectserver_widget.h
index ef8965fa..485cc8cb 100644
--- a/atlantik/client/selectserver_widget.h
+++ b/atlantik/client/selectserver_widget.h
@@ -22,7 +22,7 @@
 #include <tqradiobutton.h>
 
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 
 #include "monopigator.h"
diff --git a/atlantik/libatlantikui/auction_widget.h b/atlantik/libatlantikui/auction_widget.h
index 6bf93220..775944e0 100644
--- a/atlantik/libatlantikui/auction_widget.h
+++ b/atlantik/libatlantikui/auction_widget.h
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqmap.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQVGroupBox;
 class TQSpinBox;
diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp
index 75837b99..242ae778 100644
--- a/atlantik/libatlantikui/estatedetails.cpp
+++ b/atlantik/libatlantikui/estatedetails.cpp
@@ -24,7 +24,7 @@
 #include <kdialog.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpixmap.h>
 #include <kpushbutton.h>
diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp
index 5cb865e5..4481117c 100644
--- a/atlantik/libatlantikui/estateview.cpp
+++ b/atlantik/libatlantikui/estateview.cpp
@@ -26,7 +26,7 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kpixmapeffect.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 
diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.cpp b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
index ffcf6728..f437cf62 100644
--- a/atlantik/libatlantikui/kwrappedlistviewitem.cpp
+++ b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 
 #include <kglobalsettings.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kwordwrap.h>
 
 #include "kwrappedlistviewitem.h"
diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.h b/atlantik/libatlantikui/kwrappedlistviewitem.h
index 09e91a29..13907348 100644
--- a/atlantik/libatlantikui/kwrappedlistviewitem.h
+++ b/atlantik/libatlantikui/kwrappedlistviewitem.h
@@ -28,7 +28,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KWordWrap;
 
diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp
index ce8474d1..d0ab8e92 100644
--- a/atlantik/libatlantikui/portfolioview.cpp
+++ b/atlantik/libatlantikui/portfolioview.cpp
@@ -22,7 +22,7 @@
 #include <kiconeffect.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 #include <atlantic_core.h>
diff --git a/atlantik/libatlantikui/trade_widget.cpp b/atlantik/libatlantikui/trade_widget.cpp
index f581af6a..f6bd126c 100644
--- a/atlantik/libatlantikui/trade_widget.cpp
+++ b/atlantik/libatlantikui/trade_widget.cpp
@@ -27,14 +27,14 @@
 #include <tqspinbox.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <atlantic_core.h>
 #include <player.h>
diff --git a/atlantik/pics/toolbar/Makefile.am b/atlantik/pics/toolbar/Makefile.am
index 76f0a0a7..82a0ad7a 100644
--- a/atlantik/pics/toolbar/Makefile.am
+++ b/atlantik/pics/toolbar/Makefile.am
@@ -1,2 +1,2 @@
-atlantiktoolbardir = $(kde_datadir)/atlantik/icons
-atlantiktoolbar_ICON = AUTO
+atlantitdetoolbardir = $(kde_datadir)/atlantik/icons
+atlantitdetoolbar_ICON = AUTO