From 2dec1ab21eff318618d755b0557a33a1d10af649 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:16:15 -0600
Subject: [PATCH] Rename many classes and header files to avoid conflicts with
 KDE4

---
 src/cdopener.cpp              | 2 +-
 src/configenvironmentpage.cpp | 2 +-
 src/configpluginspage.cpp     | 2 +-
 src/dirdialog.cpp             | 2 +-
 src/filelist.cpp              | 6 +++---
 src/filelist.h                | 2 +-
 src/logviewer.cpp             | 2 +-
 src/logviewer.h               | 2 +-
 src/optionsdetailed.cpp       | 2 +-
 src/optionssimple.cpp         | 2 +-
 src/outputdirectory.cpp       | 2 +-
 src/replaygainfilelist.cpp    | 6 +++---
 src/replaygainfilelist.h      | 2 +-
 src/soundkonverter.cpp        | 4 ++--
 src/soundkonverter.h          | 2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/cdopener.cpp b/src/cdopener.cpp
index 1105562..d664def 100755
--- a/src/cdopener.cpp
+++ b/src/cdopener.cpp
@@ -6,7 +6,7 @@
 #include "ripperpluginloader.h"
 #include "combobutton.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
diff --git a/src/configenvironmentpage.cpp b/src/configenvironmentpage.cpp
index 98ae506..d1b9ee2 100755
--- a/src/configenvironmentpage.cpp
+++ b/src/configenvironmentpage.cpp
@@ -6,7 +6,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 //#include <keditlistbox.h>
 //#include <kurlrequester.h>
 #include <tdefiledialog.h>
diff --git a/src/configpluginspage.cpp b/src/configpluginspage.cpp
index c051381..e3cc232 100755
--- a/src/configpluginspage.cpp
+++ b/src/configpluginspage.cpp
@@ -23,7 +23,7 @@
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 //#include <kurl.h>
 
 ConfigPluginsPage::ConfigPluginsPage( Config* _config, TQWidget* parent, const char* name )
diff --git a/src/dirdialog.cpp b/src/dirdialog.cpp
index 1e2521f..ad80dfd 100755
--- a/src/dirdialog.cpp
+++ b/src/dirdialog.cpp
@@ -12,7 +12,7 @@
 #include <klineedit.h>
 #include <kpushbutton.h>
 // #include <kurlrequester.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdefiledialog.h>
 
 DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *name, bool modal, WFlags f )
diff --git a/src/filelist.cpp b/src/filelist.cpp
index c99f203..a984fe1 100755
--- a/src/filelist.cpp
+++ b/src/filelist.cpp
@@ -11,9 +11,9 @@
 #include "convertpluginloader.h" // NOTE DEBUG
 
 #include <klocale.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <kmimetype.h>
 #include <kurl.h>
 #include <kmountpoint.h>
diff --git a/src/filelist.h b/src/filelist.h
index bd13d4c..c74bb21 100755
--- a/src/filelist.h
+++ b/src/filelist.h
@@ -3,7 +3,7 @@
 #ifndef FILELIST_H
 #define FILELIST_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "conversionoptions.h"
 
diff --git a/src/logviewer.cpp b/src/logviewer.cpp
index 611b1fb..7bcc7fc 100755
--- a/src/logviewer.cpp
+++ b/src/logviewer.cpp
@@ -9,7 +9,7 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 #include <kurl.h>
 //#include <kdebug.h>
diff --git a/src/logviewer.h b/src/logviewer.h
index 0665e0d..8da12c1 100755
--- a/src/logviewer.h
+++ b/src/logviewer.h
@@ -3,7 +3,7 @@
 #ifndef LOGVIEWER_H
 #define LOGVIEWER_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialog.h>
 
 
diff --git a/src/optionsdetailed.cpp b/src/optionsdetailed.cpp
index d26747a..3b84dc9 100755
--- a/src/optionsdetailed.cpp
+++ b/src/optionsdetailed.cpp
@@ -13,7 +13,7 @@
 #include <klocale.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <klineedit.h>
 #include <kinputdialog.h>
 //#include <kdebug.h>
diff --git a/src/optionssimple.cpp b/src/optionssimple.cpp
index 21cb257..e2d35ae 100755
--- a/src/optionssimple.cpp
+++ b/src/optionssimple.cpp
@@ -13,7 +13,7 @@
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 //#include <kdebug.h>
 #include <kpushbutton.h>
 
diff --git a/src/outputdirectory.cpp b/src/outputdirectory.cpp
index 0a9270f..f1473a8 100755
--- a/src/outputdirectory.cpp
+++ b/src/outputdirectory.cpp
@@ -18,7 +18,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kuser.h>
diff --git a/src/replaygainfilelist.cpp b/src/replaygainfilelist.cpp
index 1abbb89..8c1a4e5 100755
--- a/src/replaygainfilelist.cpp
+++ b/src/replaygainfilelist.cpp
@@ -17,9 +17,9 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <kmessagebox.h>
 #include <kmountpoint.h>
 #include <kprogress.h>
diff --git a/src/replaygainfilelist.h b/src/replaygainfilelist.h
index 7a0e118..a1e3b90 100755
--- a/src/replaygainfilelist.h
+++ b/src/replaygainfilelist.h
@@ -3,7 +3,7 @@
 #ifndef REPLAYGAINFILELIST_H
 #define REPLAYGAINFILELIST_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqdatetime.h>
 
diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp
index 49dc23c..98b7544 100755
--- a/src/soundkonverter.cpp
+++ b/src/soundkonverter.cpp
@@ -25,9 +25,9 @@
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <kpushbutton.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 //#include <kmenubar.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
 #include <kmessagebox.h>
diff --git a/src/soundkonverter.h b/src/soundkonverter.h
index b2f95bd..56ae136 100755
--- a/src/soundkonverter.h
+++ b/src/soundkonverter.h
@@ -5,7 +5,7 @@
 
 #include "dcopinterface.h"
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class Config;
 class Options;