From 1a4615a891172a58eff43f5ef0cd150b67798f4e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:03:32 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kolf/canvasitem.cpp                | 2 +-
 kolf/floater.cpp                   | 2 +-
 kolf/game.cpp                      | 4 ++--
 kolf/kcomboboxdialog.cpp           | 2 +-
 kolf/kolf.cpp                      | 6 +++---
 kolf/newgame.cpp                   | 4 ++--
 kolf/objects/poolball/poolball.cpp | 2 +-
 kolf/objects/test/test.cpp         | 2 +-
 kolf/slope.cpp                     | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'kolf')

diff --git a/kolf/canvasitem.cpp b/kolf/canvasitem.cpp
index 2da0ee8c..3acacba2 100644
--- a/kolf/canvasitem.cpp
+++ b/kolf/canvasitem.cpp
@@ -1,6 +1,6 @@
 #include <tqcanvas.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "game.h"
 #include "canvasitem.h"
diff --git a/kolf/floater.cpp b/kolf/floater.cpp
index f0103595..b2a13ce6 100644
--- a/kolf/floater.cpp
+++ b/kolf/floater.cpp
@@ -1,7 +1,7 @@
 #include <tqlabel.h>
 #include <tqslider.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "floater.h"
 
diff --git a/kolf/game.cpp b/kolf/game.cpp
index e3d455cd..8aeb09cb 100644
--- a/kolf/game.cpp
+++ b/kolf/game.cpp
@@ -3,11 +3,11 @@
 #include <arts/kplayobjectfactory.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <knuminput.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
diff --git a/kolf/kcomboboxdialog.cpp b/kolf/kcomboboxdialog.cpp
index b567e74e..72fdcb57 100644
--- a/kolf/kcomboboxdialog.cpp
+++ b/kolf/kcomboboxdialog.cpp
@@ -28,7 +28,7 @@
 
 #include <klocale.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index 99d7bbfc..b933c333 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -1,11 +1,11 @@
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kmimetype.h>
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index e4c653e1..6ef8d95d 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -1,5 +1,5 @@
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kmessagebox.h>
@@ -9,7 +9,7 @@
 #include <kseparator.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurllabel.h>
 
 #include <tqcheckbox.h>
diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp
index a87dd301..2b5e7f98 100644
--- a/kolf/objects/poolball/poolball.cpp
+++ b/kolf/objects/poolball/poolball.cpp
@@ -10,7 +10,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kolf/statedb.h>
 #include <kolf/canvasitem.h>
diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp
index 331975fc..f5ed6753 100644
--- a/kolf/objects/test/test.cpp
+++ b/kolf/objects/test/test.cpp
@@ -9,7 +9,7 @@
 #include <klibloader.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "test.h"
 
diff --git a/kolf/slope.cpp b/kolf/slope.cpp
index b01385bf..c5dc9031 100644
--- a/kolf/slope.cpp
+++ b/kolf/slope.cpp
@@ -7,7 +7,7 @@
 
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kpixmapeffect.h>
 #include <kstandarddirs.h>
-- 
cgit v1.2.1