summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:47:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:47:16 -0600
commitd2910e9ab720e8c03bab5723a34192ad2ac4a2f0 (patch)
tree33e6c8ea366f446695cd2d08d5eda53d0c8d144d
parent6b869db09c92b749de56236f373ccb2136eee302 (diff)
downloadknights-d2910e9ab720e8c03bab5723a34192ad2ac4a2f0.tar.gz
knights-d2910e9ab720e8c03bab5723a34192ad2ac4a2f0.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--knights/accel.cpp2
-rw-r--r--knights/audio.h2
-rw-r--r--knights/core.cpp2
-rw-r--r--knights/dlg_promote.h2
-rw-r--r--knights/dlg_settings.h2
-rw-r--r--knights/io_internet.cpp2
-rw-r--r--knights/knights.cpp6
-rw-r--r--knights/main.cpp2
-rw-r--r--knights/match.cpp2
-rw-r--r--knights/pgn.h4
-rw-r--r--knights/proto_xboard.cpp2
-rw-r--r--knights/resource.cpp2
-rw-r--r--knights/resource.h2
-rw-r--r--knights/setpagedisplay.cpp2
-rw-r--r--knights/tab_pgnview.cpp2
-rw-r--r--knights/tabbox.cpp2
-rw-r--r--knights/tabpage.cpp2
-rw-r--r--knights/wiz_setup.cpp2
18 files changed, 21 insertions, 21 deletions
diff --git a/knights/accel.cpp b/knights/accel.cpp
index 99aca35..bed8bb7 100644
--- a/knights/accel.cpp
+++ b/knights/accel.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
#include "accel.moc"
-#include <klocale.h>
+#include <tdelocale.h>
Accel::Accel( TQWidget *parent, TQObject *target ) : TDEAccel( parent )
{
diff --git a/knights/audio.h b/knights/audio.h
index 10ab8b7..cb54840 100644
--- a/knights/audio.h
+++ b/knights/audio.h
@@ -20,7 +20,7 @@
#include "definitions.h"
#include <kurl.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
/**
*@author Troy Corbin Jr.
diff --git a/knights/core.cpp b/knights/core.cpp
index a7ea87c..666547f 100644
--- a/knights/core.cpp
+++ b/knights/core.cpp
@@ -17,7 +17,7 @@
/* KDE */
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
/* TQt */
#include <tqpushbutton.h>
diff --git a/knights/dlg_promote.h b/knights/dlg_promote.h
index aaae71a..83f7b5d 100644
--- a/knights/dlg_promote.h
+++ b/knights/dlg_promote.h
@@ -18,7 +18,7 @@
#ifndef DLG_PROMOTE_H
#define DLG_PROMOTE_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpixmap.h>
#include <tqstring.h>
#include <tqdialog.h>
diff --git a/knights/dlg_settings.h b/knights/dlg_settings.h
index 62d04a5..e233253 100644
--- a/knights/dlg_settings.h
+++ b/knights/dlg_settings.h
@@ -18,7 +18,7 @@
#ifndef DLG_SETTINGS_H
#define DLG_SETTINGS_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#include <tqwidget.h>
#include <tqlayout.h>
diff --git a/knights/io_internet.cpp b/knights/io_internet.cpp
index a3610f1..e29888c 100644
--- a/knights/io_internet.cpp
+++ b/knights/io_internet.cpp
@@ -18,7 +18,7 @@
/* KDE */
#include <ksock.h>
#include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
/* TQt */
#include <tqobject.h>
diff --git a/knights/knights.cpp b/knights/knights.cpp
index 7c14b10..0567f85 100644
--- a/knights/knights.cpp
+++ b/knights/knights.cpp
@@ -24,13 +24,13 @@
#include "dlg_settings.h"
#include "dlg_newmatch.h"
/* KDE */
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
#include <kicontheme.h>
#include <kkeydialog.h>
#include <kcombobox.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
/* KFile */
#include <tdefiledialog.h>
/* TQt */
diff --git a/knights/main.cpp b/knights/main.cpp
index 5235fcc..2880e44 100644
--- a/knights/main.cpp
+++ b/knights/main.cpp
@@ -17,7 +17,7 @@
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "knights.h"
diff --git a/knights/match.cpp b/knights/match.cpp
index cd35460..4db34a9 100644
--- a/knights/match.cpp
+++ b/knights/match.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
#include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "match.moc"
#include "board_base.h"
#include "board_2d.h"
diff --git a/knights/pgn.h b/knights/pgn.h
index 4afa46f..161bb9a 100644
--- a/knights/pgn.h
+++ b/knights/pgn.h
@@ -18,8 +18,8 @@
#ifndef PGN_H
#define PGN_H
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
#include <tdeio/netaccess.h>
#include <tqobject.h>
#include <tqstring.h>
diff --git a/knights/proto_xboard.cpp b/knights/proto_xboard.cpp
index 9be0fed..1c2fbd0 100644
--- a/knights/proto_xboard.cpp
+++ b/knights/proto_xboard.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqtimer.h>
#include <tqstringlist.h>
#include <tqregexp.h>
diff --git a/knights/resource.cpp b/knights/resource.cpp
index a8f4a81..f3d8ed6 100644
--- a/knights/resource.cpp
+++ b/knights/resource.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
/* KDE */
#include <kstddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <ksimpleconfig.h>
#include <tdeconfig.h>
#include <kiconloader.h>
diff --git a/knights/resource.h b/knights/resource.h
index 2876af7..1303b0a 100644
--- a/knights/resource.h
+++ b/knights/resource.h
@@ -25,7 +25,7 @@
/* KDE */
#include <kapp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcursor.h>
#include <tdelistview.h>
#include <tdecmdlineargs.h>
diff --git a/knights/setpagedisplay.cpp b/knights/setpagedisplay.cpp
index 135d1aa..aadb059 100644
--- a/knights/setpagedisplay.cpp
+++ b/knights/setpagedisplay.cpp
@@ -17,7 +17,7 @@
#include "setpagedisplay.moc"
#include <kstddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcolordialog.h>
#include <tdefontdialog.h>
#include <tqstyle.h>
diff --git a/knights/tab_pgnview.cpp b/knights/tab_pgnview.cpp
index 3290e1f..9476d60 100644
--- a/knights/tab_pgnview.cpp
+++ b/knights/tab_pgnview.cpp
@@ -23,7 +23,7 @@
#include <tqregexp.h>
#include <tqtextstream.h>
#include <kstddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
tab_pgnView::tab_pgnView(pgn *parent, resource *Rsrc ) : KnightsTextView(0,Rsrc)
{
diff --git a/knights/tabbox.cpp b/knights/tabbox.cpp
index 8f9ecdf..3a3099e 100644
--- a/knights/tabbox.cpp
+++ b/knights/tabbox.cpp
@@ -19,7 +19,7 @@
#include "tabpage.h"
#include "resource.h"
#include "accel.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstyle.h>
#include <tqtabwidget.h>
diff --git a/knights/tabpage.cpp b/knights/tabpage.cpp
index b571751..62503a2 100644
--- a/knights/tabpage.cpp
+++ b/knights/tabpage.cpp
@@ -21,7 +21,7 @@
#include "resource.h"
#include <kiconloader.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqtoolbutton.h>
diff --git a/knights/wiz_setup.cpp b/knights/wiz_setup.cpp
index ec27175..0bdaa7a 100644
--- a/knights/wiz_setup.cpp
+++ b/knights/wiz_setup.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kprocess.h>
#include <kstddirs.h>
#include <tqstringlist.h>