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

---
 src/gui/configuration/AudioConfigurationPage.cpp        | 4 ++--
 src/gui/configuration/AudioPropertiesPage.cpp           | 8 ++++----
 src/gui/configuration/ColourConfigurationPage.cpp       | 2 +-
 src/gui/configuration/ConfigurationPage.cpp             | 2 +-
 src/gui/configuration/DocumentMetaConfigurationPage.cpp | 2 +-
 src/gui/configuration/GeneralConfigurationPage.cpp      | 4 ++--
 src/gui/configuration/HeadersConfigurationPage.cpp      | 2 +-
 src/gui/configuration/LatencyConfigurationPage.cpp      | 2 +-
 src/gui/configuration/MIDIConfigurationPage.cpp         | 4 ++--
 src/gui/configuration/MatrixConfigurationPage.cpp       | 2 +-
 src/gui/configuration/NotationConfigurationPage.cpp     | 2 +-
 src/gui/configuration/TabbedConfigurationPage.cpp       | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/gui/configuration')

diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp
index f740dd5..43c143a 100644
--- a/src/gui/configuration/AudioConfigurationPage.cpp
+++ b/src/gui/configuration/AudioConfigurationPage.cpp
@@ -39,8 +39,8 @@
 #include "sound/MappedEvent.h"
 #include "TabbedConfigurationPage.h"
 #include <kcombobox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqcstring.h>
diff --git a/src/gui/configuration/AudioPropertiesPage.cpp b/src/gui/configuration/AudioPropertiesPage.cpp
index 8713cd0..d076ad5 100644
--- a/src/gui/configuration/AudioPropertiesPage.cpp
+++ b/src/gui/configuration/AudioPropertiesPage.cpp
@@ -32,10 +32,10 @@
 #include "gui/studio/AudioPluginManager.h"
 #include "sound/AudioFileManager.h"
 #include "TabbedConfigurationPage.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdiskfreesp.h>
-#include <kfiledialog.h>
-#include <kfile.h>
+#include <tdefiledialog.h>
+#include <tdefile.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
 #include <tqdialog.h>
@@ -93,7 +93,7 @@ AudioPropertiesPage::AudioPropertiesPage(RosegardenGUIDoc *doc,
 void
 AudioPropertiesPage::calculateStats()
 {
-    // This stolen from KDE libs kfile/kpropertiesdialog.cpp
+    // This stolen from KDE libs tdefile/kpropertiesdialog.cpp
     //
     TQString mountPoint = TDEIO::findPathMountPoint(m_path->text());
     KDiskFreeSp * job = new KDiskFreeSp;
diff --git a/src/gui/configuration/ColourConfigurationPage.cpp b/src/gui/configuration/ColourConfigurationPage.cpp
index 18c5576..45191f2 100644
--- a/src/gui/configuration/ColourConfigurationPage.cpp
+++ b/src/gui/configuration/ColourConfigurationPage.cpp
@@ -37,7 +37,7 @@
 #include "gui/widgets/ColourTable.h"
 #include "TabbedConfigurationPage.h"
 #include <kcolordialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinputdialog.h>
 #include <tqcolor.h>
 #include <tqframe.h>
diff --git a/src/gui/configuration/ConfigurationPage.cpp b/src/gui/configuration/ConfigurationPage.cpp
index d0e2369..31d13f0 100644
--- a/src/gui/configuration/ConfigurationPage.cpp
+++ b/src/gui/configuration/ConfigurationPage.cpp
@@ -26,7 +26,7 @@
 #include "ConfigurationPage.h"
 
 #include "document/RosegardenGUIDoc.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqwidget.h>
 #include <algorithm>
 
diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.cpp b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
index 2261ba2..c554633 100644
--- a/src/gui/configuration/DocumentMetaConfigurationPage.cpp
+++ b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
@@ -42,7 +42,7 @@
 #include "gui/configuration/HeadersConfigurationPage.h"
 #include "gui/general/GUIPalette.h"
 #include "TabbedConfigurationPage.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <tqframe.h>
 #include <tqlabel.h>
diff --git a/src/gui/configuration/GeneralConfigurationPage.cpp b/src/gui/configuration/GeneralConfigurationPage.cpp
index 3b7864a..0dff640 100644
--- a/src/gui/configuration/GeneralConfigurationPage.cpp
+++ b/src/gui/configuration/GeneralConfigurationPage.cpp
@@ -36,8 +36,8 @@
 #include "sound/SoundDriver.h"
 #include "TabbedConfigurationPage.h"
 #include <kcombobox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index 2282261..98780b0 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -32,7 +32,7 @@
 #include "misc/Strings.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <tqgroupbox.h>
diff --git a/src/gui/configuration/LatencyConfigurationPage.cpp b/src/gui/configuration/LatencyConfigurationPage.cpp
index dd7bf19..09a940f 100644
--- a/src/gui/configuration/LatencyConfigurationPage.cpp
+++ b/src/gui/configuration/LatencyConfigurationPage.cpp
@@ -30,7 +30,7 @@
 #include "ConfigurationPage.h"
 #include "document/RosegardenGUIDoc.h"
 #include "TabbedConfigurationPage.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
diff --git a/src/gui/configuration/MIDIConfigurationPage.cpp b/src/gui/configuration/MIDIConfigurationPage.cpp
index 9cbfd82..6f521b0 100644
--- a/src/gui/configuration/MIDIConfigurationPage.cpp
+++ b/src/gui/configuration/MIDIConfigurationPage.cpp
@@ -39,8 +39,8 @@
 #include "sound/MappedEvent.h"
 #include "TabbedConfigurationPage.h"
 #include <kcombobox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqcstring.h>
diff --git a/src/gui/configuration/MatrixConfigurationPage.cpp b/src/gui/configuration/MatrixConfigurationPage.cpp
index 0178e3e..6e49433 100644
--- a/src/gui/configuration/MatrixConfigurationPage.cpp
+++ b/src/gui/configuration/MatrixConfigurationPage.cpp
@@ -31,7 +31,7 @@
 #include "document/ConfigGroups.h"
 #include "gui/editors/matrix/MatrixView.h"
 #include "TabbedConfigurationPage.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <tqstring.h>
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index 191abac..85625d7 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -44,7 +44,7 @@
 #include "gui/widgets/QuantizeParameters.h"
 #include "TabbedConfigurationPage.h"
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfontrequester.h>
 #include <kmessagebox.h>
 #include <tqcheckbox.h>
diff --git a/src/gui/configuration/TabbedConfigurationPage.cpp b/src/gui/configuration/TabbedConfigurationPage.cpp
index fa26a5c..ae13d21 100644
--- a/src/gui/configuration/TabbedConfigurationPage.cpp
+++ b/src/gui/configuration/TabbedConfigurationPage.cpp
@@ -27,7 +27,7 @@
 
 #include "ConfigurationPage.h"
 #include "document/RosegardenGUIDoc.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <tqstring.h>
 #include <tqtabwidget.h>
-- 
cgit v1.2.1