summaryrefslogtreecommitdiffstats
path: root/src/gui/editors
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 00:56:23 -0600
committerTimothy Pearson <[email protected]>2013-01-27 00:56:23 -0600
commit20d323dbbfc6fd6b6ecb6de707e7cf86d2b0a4ed (patch)
tree7d550525e0385669bb07dc4abd0f686f321b75de /src/gui/editors
parentd4c3b9d53d39aade596dc71b71575fc38299995b (diff)
downloadrosegarden-20d323dbbfc6fd6b6ecb6de707e7cf86d2b0a4ed.tar.gz
rosegarden-20d323dbbfc6fd6b6ecb6de707e7cf86d2b0a4ed.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/editors')
-rw-r--r--src/gui/editors/eventlist/EventView.cpp2
-rw-r--r--src/gui/editors/matrix/MatrixSelector.cpp2
-rw-r--r--src/gui/editors/matrix/MatrixView.cpp2
-rw-r--r--src/gui/editors/notation/NotationEraser.cpp2
-rw-r--r--src/gui/editors/notation/NotationHLayout.cpp2
-rw-r--r--src/gui/editors/notation/NotationStaff.cpp2
-rw-r--r--src/gui/editors/notation/NotationStrings.cpp2
-rw-r--r--src/gui/editors/notation/NotationView.cpp2
-rw-r--r--src/gui/editors/notation/NoteFontFactory.cpp2
-rw-r--r--src/gui/editors/notation/NoteInserter.cpp2
-rw-r--r--src/gui/editors/notation/NotePixmapFactory.cpp2
-rw-r--r--src/gui/editors/parameters/SegmentParameterBox.cpp2
-rw-r--r--src/gui/editors/parameters/TrackParameterBox.cpp2
-rw-r--r--src/gui/editors/segment/MarkerEditor.cpp2
-rw-r--r--src/gui/editors/segment/PlayList.cpp4
-rw-r--r--src/gui/editors/segment/TrackEditor.cpp2
-rw-r--r--src/gui/editors/segment/TriggerSegmentManager.cpp2
-rw-r--r--src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp2
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionView.cpp2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp2
-rw-r--r--src/gui/editors/tempo/TempoView.cpp2
21 files changed, 22 insertions, 22 deletions
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp
index c902a93..b804d17 100644
--- a/src/gui/editors/eventlist/EventView.cpp
+++ b/src/gui/editors/eventlist/EventView.cpp
@@ -60,7 +60,7 @@
#include "gui/kdeext/KTmpStatusMsg.h"
#include "gui/dialogs/EventFilterDialog.h"
#include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <kstatusbar.h>
#include <kstddirs.h>
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index 5b3dd26..c9c3b32 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -49,7 +49,7 @@
#include <kaction.h>
#include <kglobal.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqdialog.h>
#include <tqiconset.h>
#include <tqpoint.h>
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 5f69a39..f7665c9 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -106,7 +106,7 @@
#include <kstddirs.h>
#include <kaction.h>
#include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdockwidget.h>
#include <kglobal.h>
#include <kmessagebox.h>
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index 50929f4..c12d87a 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -35,7 +35,7 @@
#include "NotationView.h"
#include "NotePixmapFactory.h"
#include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqiconset.h>
#include <tqstring.h>
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index 32a47e2..50fb0f6 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -46,7 +46,7 @@
#include "NotationProperties.h"
#include "NotationStaff.h"
#include "NotePixmapFactory.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqobject.h>
#include <cmath>
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 3be47ae..f49b632 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -62,7 +62,7 @@
#include "NotePixmapFactory.h"
#include "NotePixmapParameters.h"
#include "NoteStyleFactory.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kmessagebox.h>
#include <tqcanvas.h>
#include <tqpainter.h>
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index f81ad1e..24d5c9d 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -32,7 +32,7 @@
#include "base/Exception.h"
#include "base/NotationTypes.h"
#include "gui/configuration/GeneralConfigurationPage.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqstring.h>
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 032b8cb..02b8539 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -182,7 +182,7 @@
#include "HeadersGroup.h"
#include <kaction.h>
#include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include <klineeditdlg.h>
#include <kmessagebox.h>
diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp
index 9099b58..9760734 100644
--- a/src/gui/editors/notation/NoteFontFactory.cpp
+++ b/src/gui/editors/notation/NoteFontFactory.cpp
@@ -35,7 +35,7 @@
#include "gui/kdeext/KStartupLogo.h"
#include "NoteFont.h"
#include "NoteFontMap.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include <kmessagebox.h>
#include <tqdir.h>
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index a2b6b56..3db308f 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -51,7 +51,7 @@
#include "NoteStyleFactory.h"
#include <kaction.h>
#include <kcommand.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqiconset.h>
#include <tqregexp.h>
#include <tqstring.h>
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index 7474d4e..f34eeaa 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -30,7 +30,7 @@
#include <klocale.h>
#include <kstddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include "misc/Strings.h"
#include "document/ConfigGroups.h"
#include "base/Exception.h"
diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp
index 2eb39f8..4562520 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.cpp
+++ b/src/gui/editors/parameters/SegmentParameterBox.cpp
@@ -58,7 +58,7 @@
#include <kcolordialog.h>
#include <kcombobox.h>
#include <kcommand.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klineeditdlg.h>
#include <ktabwidget.h>
#include <tqbutton.h>
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index d627b01..62920b4 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -61,7 +61,7 @@
#include "sound/PluginIdentifier.h"
#include <kcolordialog.h>
#include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klineeditdlg.h>
#include <kmessagebox.h>
#include <ksqueezedtextlabel.h>
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>
diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp
index 7d7346f..4386cb2 100644
--- a/src/gui/editors/tempo/TempoView.cpp
+++ b/src/gui/editors/tempo/TempoView.cpp
@@ -46,7 +46,7 @@
#include "TempoListItem.h"
#include <kaction.h>
#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klistview.h>
#include <kxmlguiclient.h>
#include <tqbuttongroup.h>