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/editors/segment/MarkerEditor.cpp                      | 2 +-
 src/gui/editors/segment/PlayList.cpp                          | 4 ++--
 src/gui/editors/segment/TrackEditor.cpp                       | 2 +-
 src/gui/editors/segment/TriggerSegmentManager.cpp             | 2 +-
 src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp | 2 +-
 src/gui/editors/segment/segmentcanvas/CompositionView.cpp     | 2 +-
 src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/gui/editors/segment')

diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 0f25aeb..c6c2dd8 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kstddirs.h>
 #include <kstdaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "misc/Debug.h"
 #include "misc/Strings.h"
 #include "base/Composition.h"
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index 9bd2079..58d59cc 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -30,8 +30,8 @@
 #include <tqlayout.h>
 
 #include <klocale.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kurl.h>
 #include <tqframe.h>
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index cb8db68..6be14b5 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -28,7 +28,7 @@
 #include <kapplication.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstddirs.h>
 #include "misc/Debug.h"
 #include "document/ConfigGroups.h"
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index 60dde0c..8bfb621 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -55,7 +55,7 @@
 #include <kmessagebox.h>
 #include <kstdaccel.h>
 #include <kstdaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqaccel.h>
 #include <tqdialog.h>
 #include <tqframe.h>
diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
index 3515e16..b6f7518 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
@@ -38,7 +38,7 @@
 #include <tqapplication.h>
 
 #include <kapp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 namespace Rosegarden {
 
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index fe52f26..89290fa 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -64,7 +64,7 @@
 #include <tqstring.h>
 #include <tqwidget.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <algorithm>
 
 
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
index c1b1f4b..02f3670 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
@@ -47,7 +47,7 @@
 #include "SegmentTool.h"
 #include "SegmentToolBox.h"
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqcursor.h>
 #include <tqevent.h>
 #include <tqpoint.h>
-- 
cgit v1.2.3