summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/guitar
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:51:32 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:51:32 -0600
commit5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb (patch)
tree7fdeb64e5bef896a23bdf46847e3ffd3ec460cda /src/gui/editors/guitar
parent3f02581883759395fcd3935ec1d88ddca4895f32 (diff)
downloadrosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.tar.gz
rosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/editors/guitar')
-rw-r--r--src/gui/editors/guitar/Fingering.cpp2
-rw-r--r--src/gui/editors/guitar/GuitarChordEditorDialog.cpp4
-rw-r--r--src/gui/editors/guitar/GuitarChordSelectorDialog.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/editors/guitar/Fingering.cpp b/src/gui/editors/guitar/Fingering.cpp
index 59459e9..caa98fe 100644
--- a/src/gui/editors/guitar/Fingering.cpp
+++ b/src/gui/editors/guitar/Fingering.cpp
@@ -29,7 +29,7 @@
#include <tqstringlist.h>
#include <sstream>
#include <algorithm>
-#include <klocale.h>
+#include <tdelocale.h>
namespace Rosegarden
{
diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
index 8a4fb3e..79bec1e 100644
--- a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
@@ -30,8 +30,8 @@
#include <klineedit.h>
#include <tqcombobox.h>
#include <tqspinbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstddirs.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
index accbcc5..c1a6165 100644
--- a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
@@ -34,8 +34,8 @@
#include <tqcombobox.h>
#include <tqpushbutton.h>
#include <tqlabel.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstddirs.h>
namespace Rosegarden