Rename many classes and header files to avoid conflicts with KDE4

9 files changed, 10 insertions, 10 deletions

diff --git a/src/gui/editors/notation/ClefInserter.cpp b/src/gui/editors/notation/ClefInserter.cpp
index 097fc5e..28198a2 100644
--- a/src/gui/editors/notation/ClefInserter.cpp
+++ b/src/gui/editors/notation/ClefInserter.cpp
@@ -36,7 +36,7 @@
 #include "NotationTool.h"
 #include "NotationView.h"
 #include "NotePixmapFactory.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqiconset.h>
 #include <tqstring.h>
 
diff --git a/src/gui/editors/notation/GuitarChordInserter.cpp b/src/gui/editors/notation/GuitarChordInserter.cpp
index b730dd3..0885b66 100644
--- a/src/gui/editors/notation/GuitarChordInserter.cpp
+++ b/src/gui/editors/notation/GuitarChordInserter.cpp
@@ -40,7 +40,7 @@
 #include "NotationTool.h"
 #include "NotationView.h"
 #include "NotePixmapFactory.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqdialog.h>
 #include <tqiconset.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index 198943e..fab2b4d 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -34,7 +34,7 @@
 #include "NotationTool.h"
 #include "NotationView.h"
 #include "NotePixmapFactory.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <tqiconset.h>
 #include <tqstring.h>
diff --git a/src/gui/editors/notation/NotationSelector.cpp b/src/gui/editors/notation/NotationSelector.cpp
index 549b2a5..c6d1c68 100644
--- a/src/gui/editors/notation/NotationSelector.cpp
+++ b/src/gui/editors/notation/NotationSelector.cpp
@@ -48,7 +48,7 @@
 #include "NotationTool.h"
 #include "NotationView.h"
 #include "NotePixmapFactory.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqapplication.h>
 #include <tqiconset.h>
 #include <tqrect.h>
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index f77bb36..d8fe2c6 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -180,7 +180,7 @@
 #include "sound/MappedEvent.h"
 #include "TextInserter.h"
 #include "HeadersGroup.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
@@ -192,7 +192,7 @@
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <ktempfile.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kxmlguiclient.h>
 #include <tqbrush.h>
 #include <tqcanvas.h>
diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp
index 709041e..2474ec1 100644
--- a/src/gui/editors/notation/NoteFontViewer.cpp
+++ b/src/gui/editors/notation/NoteFontViewer.cpp
@@ -29,7 +29,7 @@
 #include "FontViewFrame.h"
 #include <kcombobox.h>
 #include <kdialogbase.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tqlabel.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index 932b2cf..de1ba52 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -49,7 +49,7 @@
 #include "NotationStaff.h"
 #include "NotePixmapFactory.h"
 #include "NoteStyleFactory.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <tdeconfig.h>
 #include <tqiconset.h>
diff --git a/src/gui/editors/notation/RestInserter.cpp b/src/gui/editors/notation/RestInserter.cpp
index 674ce60..2dccf65 100644
--- a/src/gui/editors/notation/RestInserter.cpp
+++ b/src/gui/editors/notation/RestInserter.cpp
@@ -39,7 +39,7 @@
 #include "NotationView.h"
 #include "NoteInserter.h"
 #include "NotePixmapFactory.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <tqiconset.h>
 #include <tqregexp.h>
diff --git a/src/gui/editors/notation/TextInserter.cpp b/src/gui/editors/notation/TextInserter.cpp
index 90674fb..84a832e 100644
--- a/src/gui/editors/notation/TextInserter.cpp
+++ b/src/gui/editors/notation/TextInserter.cpp
@@ -39,7 +39,7 @@
 #include "NotationView.h"
 #include "NotePixmapFactory.h"
 #include "NotationElement.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqdialog.h>
 #include <tqiconset.h>
 #include <tqstring.h>