diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:16:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:16:04 -0600 |
| commit | 990bf92fa5cefbe5ebb34a172d18bb3df745bd7a (patch) | |
| tree | a458e45739951ac897cb2ca9cd172a30bdcc6e2f /src/gui/general | |
| 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/general')
| -rw-r--r-- | src/gui/general/EditView.cpp | 2 | ||||
| -rw-r--r-- | src/gui/general/EditViewBase.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp index 06b365a..7c75195 100644 --- a/src/gui/general/EditView.cpp +++ b/src/gui/general/EditView.cpp @@ -79,7 +79,7 @@ #include "gui/rulers/ControlRuler.h" #include "gui/rulers/PropertyControlRuler.h" #include "RosegardenCanvasView.h" -#include <kaction.h> +#include <tdeaction.h> #include <kcommand.h> #include <kdockwidget.h> #include <kglobal.h> diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp index 7a26a67..f7f8e93 100644 --- a/src/gui/general/EditViewBase.cpp +++ b/src/gui/general/EditViewBase.cpp @@ -44,16 +44,16 @@ #include "gui/dialogs/TimeDialog.h" #include "gui/general/EditViewTimeSigNotifier.h" #include "gui/kdeext/KTmpStatusMsg.h" -#include <kaction.h> +#include <tdeaction.h> #include <kcommand.h> #include <tdeconfig.h> #include <kdockwidget.h> #include <kedittoolbar.h> #include <kglobal.h> #include <kkeydialog.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kstatusbar.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kstdaction.h> #include <kxmlguiclient.h> #include <tqaccel.h> |