summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/matrix/MatrixView.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:51:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:51:32 -0600
commit5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb (patch)
tree7fdeb64e5bef896a23bdf46847e3ffd3ec460cda /src/gui/editors/matrix/MatrixView.cpp
parent3f02581883759395fcd3935ec1d88ddca4895f32 (diff)
downloadrosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.tar.gz
rosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/editors/matrix/MatrixView.cpp')
-rw-r--r--src/gui/editors/matrix/MatrixView.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 8353ce2..5b3e411 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -102,14 +102,14 @@
#include "PianoKeyboard.h"
#include "sound/MappedEvent.h"
#include "sound/SequencerDataBlock.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstddirs.h>
#include <tdeaction.h>
#include <kcombobox.h>
#include <tdeconfig.h>
#include <kdockwidget.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
#include <kstatusbar.h>
#include <tdetoolbar.h>
#include <kxmlguiclient.h>