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

---
 arts/gui/kde/Makefile.am           | 2 +-
 arts/gui/kde/dbtest.cpp            | 2 +-
 arts/gui/kde/kvolumefader_impl.cpp | 4 ++--
 arts/gui/kde/tdepopupbox_impl.cpp  | 6 +++---
 arts/gui/kde/tdepopupbox_private.h | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'arts/gui')

diff --git a/arts/gui/kde/Makefile.am b/arts/gui/kde/Makefile.am
index d772e884..c61e1db3 100644
--- a/arts/gui/kde/Makefile.am
+++ b/arts/gui/kde/Makefile.am
@@ -10,7 +10,7 @@ libartsgui_kde_la_SOURCES = kwidget_impl.cpp kbutton_impl.cpp \
   kpoti_impl.cpp kpoti.cpp kwidgetrepo.cpp kartswidget.cpp \
   klineedit_impl.cpp khbox_impl.cpp kvbox_impl.cpp kspinbox_impl.cpp \
   kcombobox_impl.cpp kfader.cpp kfader_impl.cpp kgraph_impl.cpp kgraph.cpp \
-  kgraphline_impl.cpp kframe_impl.cpp klayoutbox_impl.cpp kpopupbox_impl.cpp \
+  kgraphline_impl.cpp kframe_impl.cpp klayoutbox_impl.cpp tdepopupbox_impl.cpp \
   klevelmeter_impl.cpp klevelmeter_small.cpp klevelmeter_linebars.cpp \
   klevelmeter_normalbars.cpp klevelmeter_firebars.cpp \
   ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.cpp
diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp
index 12e88df6..38ef5f7e 100644
--- a/arts/gui/kde/dbtest.cpp
+++ b/arts/gui/kde/dbtest.cpp
@@ -4,7 +4,7 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kstdaction.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kdebug.h>
 
 #include <dbtest.h>
diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp
index a6621155..15fc8c8a 100644
--- a/arts/gui/kde/kvolumefader_impl.cpp
+++ b/arts/gui/kde/kvolumefader_impl.cpp
@@ -27,8 +27,8 @@
 #include <tqfontmetrics.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kinputdialog.h>
 
 KVolumeFader_impl::KVolumeFader_impl( TQFrame* w )
diff --git a/arts/gui/kde/tdepopupbox_impl.cpp b/arts/gui/kde/tdepopupbox_impl.cpp
index a4ac6fa2..2e8803df 100644
--- a/arts/gui/kde/tdepopupbox_impl.cpp
+++ b/arts/gui/kde/tdepopupbox_impl.cpp
@@ -19,8 +19,8 @@
 
     */
 
-#include "kpopupbox_impl.h"
-#include "kpopupbox_private.h"
+#include "tdepopupbox_impl.h"
+#include "tdepopupbox_private.h"
 
 #include <tqlayout.h>
 
@@ -128,7 +128,7 @@ void TDEPopupBox_widget::name( std::string n ) {
 
 REGISTER_IMPLEMENTATION( TDEPopupBox_impl );
 
-#include "kpopupbox_private.moc"
+#include "tdepopupbox_private.moc"
 
 // vim: sw=4 ts=4
 
diff --git a/arts/gui/kde/tdepopupbox_private.h b/arts/gui/kde/tdepopupbox_private.h
index 9750625b..9e22ae15 100644
--- a/arts/gui/kde/tdepopupbox_private.h
+++ b/arts/gui/kde/tdepopupbox_private.h
@@ -62,7 +62,7 @@ private:
 	OwnWidget *_artswidget;
 };
 
-// See kpopupbox_impl.h - The eventmapper isn't needed at present, but perhaps in the future...
+// See tdepopupbox_impl.h - The eventmapper isn't needed at present, but perhaps in the future...
 
 /*class TDEPopupBoxEventMapper : public TQObject {
    Q_OBJECT
-- 
cgit v1.2.3