summaryrefslogtreecommitdiffstats
path: root/konquest
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:20:33 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:20:33 -0600
commit41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6 (patch)
tree63976c277d171292373b91b4f23aeb84c4712e9e /konquest
parent58a97ed3af5e4df6c4a58d043b0c267bd97056a9 (diff)
downloadtdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.tar.gz
tdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'konquest')
-rw-r--r--konquest/fleetdlg.h2
-rw-r--r--konquest/mainwin.cc4
-rw-r--r--konquest/mainwin.h2
-rw-r--r--konquest/scoredlg.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/konquest/fleetdlg.h b/konquest/fleetdlg.h
index a82ebfa9..d7425207 100644
--- a/konquest/fleetdlg.h
+++ b/konquest/fleetdlg.h
@@ -1,7 +1,7 @@
#ifndef FLEETDLG_H
#define FLEETDLG_H
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqdialog.h>
diff --git a/konquest/mainwin.cc b/konquest/mainwin.cc
index fdc44e13..cc19110e 100644
--- a/konquest/mainwin.cc
+++ b/konquest/mainwin.cc
@@ -6,9 +6,9 @@
#include <klocale.h>
#include <kglobal.h>
#include <kmenubar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <kstdgameaction.h>
diff --git a/konquest/mainwin.h b/konquest/mainwin.h
index 63a68c0d..36c31038 100644
--- a/konquest/mainwin.h
+++ b/konquest/mainwin.h
@@ -1,7 +1,7 @@
#ifndef _MAIN_WIN_H
#define _MAIN_WIN_H
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include "gameboard.h"
diff --git a/konquest/scoredlg.h b/konquest/scoredlg.h
index 22fbc549..ee1e5c1b 100644
--- a/konquest/scoredlg.h
+++ b/konquest/scoredlg.h
@@ -1,7 +1,7 @@
#ifndef _SCOREDLG_H_
#define _SCOREDLG_H_
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqdialog.h>