diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:16:04 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:16:04 -0600 |
commit | 990bf92fa5cefbe5ebb34a172d18bb3df745bd7a (patch) | |
tree | a458e45739951ac897cb2ca9cd172a30bdcc6e2f /src/gui/editors/notation/NotationView.cpp | |
parent | fb3718a55f355cd22f9eb9fa4e89cd3b84b8c9ca (diff) | |
download | rosegarden-990bf92fa5cefbe5ebb34a172d18bb3df745bd7a.tar.gz rosegarden-990bf92fa5cefbe5ebb34a172d18bb3df745bd7a.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/editors/notation/NotationView.cpp')
-rw-r--r-- | src/gui/editors/notation/NotationView.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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> |