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

---
 configdialog/kbfxconfigapp.h         | 2 +-
 configdialog/kbfxconfigdlgplugins.ui | 2 +-
 kbfxlib/common/kbfxfontchooser.h     | 2 +-
 src/kbfxbutton.h                     | 2 +-
 src/kbfxplasmaindexview.h            | 2 +-
 src/kbfxspinx.h                      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configdialog/kbfxconfigapp.h b/configdialog/kbfxconfigapp.h
index b4fc74b..7876e32 100644
--- a/configdialog/kbfxconfigapp.h
+++ b/configdialog/kbfxconfigapp.h
@@ -53,7 +53,7 @@
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 #include <krun.h>
diff --git a/configdialog/kbfxconfigdlgplugins.ui b/configdialog/kbfxconfigdlgplugins.ui
index fcfe392..d262944 100644
--- a/configdialog/kbfxconfigdlgplugins.ui
+++ b/configdialog/kbfxconfigdlgplugins.ui
@@ -385,6 +385,6 @@
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>kcombobox.h</includehint>
-    <includehint>kactionselector.h</includehint>
+    <includehint>tdeactionselector.h</includehint>
 </includehints>
 </UI>
diff --git a/kbfxlib/common/kbfxfontchooser.h b/kbfxlib/common/kbfxfontchooser.h
index d216719..9ad1e80 100644
--- a/kbfxlib/common/kbfxfontchooser.h
+++ b/kbfxlib/common/kbfxfontchooser.h
@@ -21,7 +21,7 @@
 #define KBFX_FONT_CHOOSER_H
 
 #include <kdialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tqwidget.h>
diff --git a/src/kbfxbutton.h b/src/kbfxbutton.h
index bc10cfd..e59280e 100644
--- a/src/kbfxbutton.h
+++ b/src/kbfxbutton.h
@@ -35,7 +35,7 @@
 #include <kimageeffect.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 
 #include <kbfxconfig.h>
diff --git a/src/kbfxplasmaindexview.h b/src/kbfxplasmaindexview.h
index d38deb8..99d40ab 100644
--- a/src/kbfxplasmaindexview.h
+++ b/src/kbfxplasmaindexview.h
@@ -25,7 +25,7 @@
 #include <tqcanvas.h>
 
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <kbfxdatastack.h>
 #include <kbfxplasmapixmapprovider.h>
diff --git a/src/kbfxspinx.h b/src/kbfxspinx.h
index d0bc1ce..d5f0145 100644
--- a/src/kbfxspinx.h
+++ b/src/kbfxspinx.h
@@ -45,7 +45,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpanelapplet.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 #include <kuser.h>
 
-- 
cgit v1.2.1