summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/matrix
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:16:04 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:16:04 -0600
commit990bf92fa5cefbe5ebb34a172d18bb3df745bd7a (patch)
treea458e45739951ac897cb2ca9cd172a30bdcc6e2f /src/gui/editors/matrix
parentfb3718a55f355cd22f9eb9fa4e89cd3b84b8c9ca (diff)
downloadrosegarden-990bf92fa5cefbe5ebb34a172d18bb3df745bd7a.tar.gz
rosegarden-990bf92fa5cefbe5ebb34a172d18bb3df745bd7a.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/editors/matrix')
-rw-r--r--src/gui/editors/matrix/MatrixEraser.cpp2
-rw-r--r--src/gui/editors/matrix/MatrixMover.cpp2
-rw-r--r--src/gui/editors/matrix/MatrixPainter.cpp2
-rw-r--r--src/gui/editors/matrix/MatrixResizer.cpp2
-rw-r--r--src/gui/editors/matrix/MatrixSelector.cpp2
-rw-r--r--src/gui/editors/matrix/MatrixTool.cpp2
-rw-r--r--src/gui/editors/matrix/MatrixView.cpp4
7 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/editors/matrix/MatrixEraser.cpp b/src/gui/editors/matrix/MatrixEraser.cpp
index 7665066..ffd1a59 100644
--- a/src/gui/editors/matrix/MatrixEraser.cpp
+++ b/src/gui/editors/matrix/MatrixEraser.cpp
@@ -34,7 +34,7 @@
#include "MatrixStaff.h"
#include "MatrixTool.h"
#include "MatrixView.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include <kglobal.h>
#include <tqiconset.h>
#include <tqstring.h>
diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp
index d2955fe..50344ab 100644
--- a/src/gui/editors/matrix/MatrixMover.cpp
+++ b/src/gui/editors/matrix/MatrixMover.cpp
@@ -43,7 +43,7 @@
#include "MatrixTool.h"
#include "MatrixView.h"
#include "MatrixVLayout.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include <kglobal.h>
#include <tqiconset.h>
#include <tqpoint.h>
diff --git a/src/gui/editors/matrix/MatrixPainter.cpp b/src/gui/editors/matrix/MatrixPainter.cpp
index a6b0a15..e48e4ed 100644
--- a/src/gui/editors/matrix/MatrixPainter.cpp
+++ b/src/gui/editors/matrix/MatrixPainter.cpp
@@ -42,7 +42,7 @@
#include "MatrixStaff.h"
#include "MatrixTool.h"
#include "MatrixView.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include <kglobal.h>
#include <tqiconset.h>
#include <tqpoint.h>
diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp
index ff7760a..167d464 100644
--- a/src/gui/editors/matrix/MatrixResizer.cpp
+++ b/src/gui/editors/matrix/MatrixResizer.cpp
@@ -40,7 +40,7 @@
#include "MatrixStaff.h"
#include "MatrixTool.h"
#include "MatrixView.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include <kglobal.h>
#include <tqiconset.h>
#include <tqpoint.h>
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index 72060af..f118bfb 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -46,7 +46,7 @@
#include "MatrixStaff.h"
#include "MatrixTool.h"
#include "MatrixView.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include <kglobal.h>
#include <kapplication.h>
#include <tdeconfig.h>
diff --git a/src/gui/editors/matrix/MatrixTool.cpp b/src/gui/editors/matrix/MatrixTool.cpp
index a478aa3..62cfd90 100644
--- a/src/gui/editors/matrix/MatrixTool.cpp
+++ b/src/gui/editors/matrix/MatrixTool.cpp
@@ -27,7 +27,7 @@
#include "gui/general/EditTool.h"
#include "MatrixView.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqstring.h>
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 099ef06..8353ce2 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -104,14 +104,14 @@
#include "sound/SequencerDataBlock.h"
#include <klocale.h>
#include <kstddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kcombobox.h>
#include <tdeconfig.h>
#include <kdockwidget.h>
#include <kglobal.h>
#include <kmessagebox.h>
#include <kstatusbar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <kxmlguiclient.h>
#include <tqcanvas.h>
#include <tqcursor.h>