From 41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:20:33 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 konquest/fleetdlg.h | 2 +-
 konquest/mainwin.cc | 4 ++--
 konquest/mainwin.h  | 2 +-
 konquest/scoredlg.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'konquest')

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>
 
-- 
cgit v1.2.1