From 6946130bb142337c633a25f34f11f9cd0e12d5de Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:57:10 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kolf/config.cpp                    | 2 +-
 kolf/game.cpp                      | 4 ++--
 kolf/game.h                        | 2 +-
 kolf/kcomboboxdialog.cpp           | 4 ++--
 kolf/kcomboboxdialog.h             | 2 +-
 kolf/kolf.cpp                      | 6 +++---
 kolf/main.cpp                      | 2 +-
 kolf/newgame.cpp                   | 6 +++---
 kolf/objects/poolball/poolball.cpp | 2 +-
 kolf/objects/test/test.cpp         | 2 +-
 kolf/pluginloader.cpp              | 2 +-
 kolf/printdialogpage.cpp           | 2 +-
 kolf/scoreboard.cpp                | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'kolf')

diff --git a/kolf/config.cpp b/kolf/config.cpp
index 7c333755..7dba99fd 100644
--- a/kolf/config.cpp
+++ b/kolf/config.cpp
@@ -2,7 +2,7 @@
 #include <tqlayout.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "config.h"
 
diff --git a/kolf/game.cpp b/kolf/game.cpp
index 8544cbd6..3c6978fd 100644
--- a/kolf/game.cpp
+++ b/kolf/game.cpp
@@ -8,9 +8,9 @@
 #include <kdebug.h>
 #include <knuminput.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpixmapeffect.h>
 #include <kprinter.h>
 #include <kstandarddirs.h>
diff --git a/kolf/game.h b/kolf/game.h
index ee940802..fcbeec4e 100644
--- a/kolf/game.h
+++ b/kolf/game.h
@@ -2,7 +2,7 @@
 #define GAME_H
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpixmap.h>
 #include <arts/kplayobject.h>
 #include <arts/kartsserver.h>
diff --git a/kolf/kcomboboxdialog.cpp b/kolf/kcomboboxdialog.cpp
index 72fdcb57..228e4b3e 100644
--- a/kolf/kcomboboxdialog.cpp
+++ b/kolf/kcomboboxdialog.cpp
@@ -26,11 +26,11 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kcomboboxdialog.h"
 
diff --git a/kolf/kcomboboxdialog.h b/kolf/kcomboboxdialog.h
index b55d68d1..c533a305 100644
--- a/kolf/kcomboboxdialog.h
+++ b/kolf/kcomboboxdialog.h
@@ -28,7 +28,7 @@
 #include <tqstringlist.h>
 
 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TQCheckBox;
 class KHistoryCombo;
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index 2fe55956..ec7fffef 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -4,12 +4,12 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 #include <kscoredialog.h>
 #include <kstandarddirs.h>
diff --git a/kolf/main.cpp b/kolf/main.cpp
index 235ef614..a7b33cda 100644
--- a/kolf/main.cpp
+++ b/kolf/main.cpp
@@ -2,7 +2,7 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index d4e4e00a..45eb4b1a 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -2,13 +2,13 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 #include <kscoredialog.h>
 #include <kstandarddirs.h>
 #include <kseparator.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kurllabel.h>
 
diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp
index 147c8e1e..58e62deb 100644
--- a/kolf/objects/poolball/poolball.cpp
+++ b/kolf/objects/poolball/poolball.cpp
@@ -5,7 +5,7 @@
 #include <tqlayout.h>
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp
index 7e0fe011..45124f9c 100644
--- a/kolf/objects/test/test.cpp
+++ b/kolf/objects/test/test.cpp
@@ -5,7 +5,7 @@
 #include <tqlayout.h>
 #include <tqslider.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
diff --git a/kolf/pluginloader.cpp b/kolf/pluginloader.cpp
index 9f320856..3adb7e3f 100644
--- a/kolf/pluginloader.cpp
+++ b/kolf/pluginloader.cpp
@@ -5,7 +5,7 @@
 #include <tqobject.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 #include <klibloader.h>
diff --git a/kolf/printdialogpage.cpp b/kolf/printdialogpage.cpp
index e8733c81..0a9759a7 100644
--- a/kolf/printdialogpage.cpp
+++ b/kolf/printdialogpage.cpp
@@ -2,7 +2,7 @@
 #include <tqlayout.h>
 #include <tqwidget.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kdebug.h>
 
diff --git a/kolf/scoreboard.cpp b/kolf/scoreboard.cpp
index 717dbc36..17c29bce 100644
--- a/kolf/scoreboard.cpp
+++ b/kolf/scoreboard.cpp
@@ -1,5 +1,5 @@
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqtable.h>
-- 
cgit v1.2.1