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/builder/main.cpp                  | 4 ++--
 arts/builder/menumaker.h               | 2 +-
 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 +-
 arts/tools/artsactions.cpp             | 6 +++---
 arts/tools/artscontrolapplet_private.h | 4 ++--
 arts/tools/audiomanager.cpp            | 2 +-
 arts/tools/environmentview.cpp         | 2 +-
 arts/tools/fftscopeview.cpp            | 4 ++--
 arts/tools/main.cpp                    | 2 +-
 arts/tools/main.h                      | 2 +-
 arts/tools/mediatypesview.cpp          | 2 +-
 arts/tools/midimanagerview.cpp         | 2 +-
 arts/tools/midimanagerview.h           | 2 +-
 17 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'arts')

diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index f33d360a..62dcdb43 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -41,13 +41,13 @@
 
 #include <kdebug.h>
 #include <arts/debug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kinputdialog.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <tdefiledialog.h>
 #include <ksavefile.h>
 #include <kmessagebox.h>
diff --git a/arts/builder/menumaker.h b/arts/builder/menumaker.h
index f1368d73..fa3c0c20 100644
--- a/arts/builder/menumaker.h
+++ b/arts/builder/menumaker.h
@@ -1,7 +1,7 @@
 #ifndef __MENUMAKER_H__
 #define __MENUMAKER_H__
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqobject.h>
 #include <string>
 #include <list>
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
diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp
index 4dd331b8..f0dee6fd 100644
--- a/arts/tools/artsactions.cpp
+++ b/arts/tools/artsactions.cpp
@@ -20,9 +20,9 @@
 
 #include "artsactions.h"
 
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kglobal.h>
 //#include <kdebug.h>
diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h
index 08959f16..0cb5e140 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -26,8 +26,8 @@
 #include <tqlabel.h>
 #include <tqslider.h>
 #include <tqpushbutton.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <tqfont.h>
 
 #include <kartsserver.h>
diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp
index 25acaf5a..9bca14b1 100644
--- a/arts/tools/audiomanager.cpp
+++ b/arts/tools/audiomanager.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 
 using namespace std;
diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp
index d8c21224..8c84e8d2 100644
--- a/arts/tools/environmentview.cpp
+++ b/arts/tools/environmentview.cpp
@@ -26,7 +26,7 @@
 #include <tqfile.h>
 #include <tqpushbutton.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kartswidget.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp
index 9eb1c019..c8124c0b 100644
--- a/arts/tools/fftscopeview.cpp
+++ b/arts/tools/fftscopeview.cpp
@@ -25,8 +25,8 @@
 #include <tqlayout.h>
 #include <tqcursor.h>
 #include <tqtimer.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kartswidget.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp
index 4f508d98..3f22e53a 100644
--- a/arts/tools/main.cpp
+++ b/arts/tools/main.cpp
@@ -38,7 +38,7 @@
 #include <tqlabel.h>
 #include <tqslider.h>
 #include <tqpushbutton.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kled.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/arts/tools/main.h b/arts/tools/main.h
index a92c4061..ae2819b7 100644
--- a/arts/tools/main.h
+++ b/arts/tools/main.h
@@ -27,7 +27,7 @@
 #include <tqmessagebox.h>
 #include <kapplication.h>
 #include <tqframe.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <klocale.h>
diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp
index 683e8152..6091461d 100644
--- a/arts/tools/mediatypesview.cpp
+++ b/arts/tools/mediatypesview.cpp
@@ -22,7 +22,7 @@
     */
 
 #include <tqlayout.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kartsserver.h>
 #include <map>
diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp
index ae729347..62d54da0 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -32,7 +32,7 @@
 #include <tqlayout.h>
 #include <tqpainter.h>
 #include <stdio.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <soundserver.h>
diff --git a/arts/tools/midimanagerview.h b/arts/tools/midimanagerview.h
index 5b05936d..e5cd1467 100644
--- a/arts/tools/midimanagerview.h
+++ b/arts/tools/midimanagerview.h
@@ -26,7 +26,7 @@
 #ifndef ARTS_TOOLS_MIDIMANAGERVIEW_H
 #define ARTS_TOOLS_MIDIMANAGERVIEW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include "artsmidi.h"
 #include <map>
 
-- 
cgit v1.2.3