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/rulers | |
| 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/rulers')
| -rw-r--r-- | src/gui/rulers/ControlRuler.cpp | 2 | ||||
| -rw-r--r-- | src/gui/rulers/LoopRuler.cpp | 2 | ||||
| -rw-r--r-- | src/gui/rulers/MarkerRuler.cpp | 2 | ||||
| -rw-r--r-- | src/gui/rulers/TempoRuler.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp index f1dd4e7..76a5a47 100644 --- a/src/gui/rulers/ControlRuler.cpp +++ b/src/gui/rulers/ControlRuler.cpp @@ -39,7 +39,7 @@ #include "gui/general/EditView.h" #include "gui/general/RosegardenCanvasView.h" #include "gui/widgets/TextFloat.h" -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqcanvas.h> #include <tqcolor.h> #include <tqcursor.h> diff --git a/src/gui/rulers/LoopRuler.cpp b/src/gui/rulers/LoopRuler.cpp index b8b45fe..cd6932e 100644 --- a/src/gui/rulers/LoopRuler.cpp +++ b/src/gui/rulers/LoopRuler.cpp @@ -37,7 +37,7 @@ #include <tqwidget.h> #include <tqtooltip.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqpainter.h> #include <tqpointarray.h> #include "document/RosegardenGUIDoc.h" diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp index af8c27f..7bb97eb 100644 --- a/src/gui/rulers/MarkerRuler.cpp +++ b/src/gui/rulers/MarkerRuler.cpp @@ -49,7 +49,7 @@ #include <tqstring.h> #include <tqwidget.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstddirs.h> #include <tqtooltip.h> diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp index 6f9fe65..fe81cf2 100644 --- a/src/gui/rulers/TempoRuler.cpp +++ b/src/gui/rulers/TempoRuler.cpp @@ -40,7 +40,7 @@ #include "gui/general/GUIPalette.h" #include "gui/widgets/TextFloat.h" #include "TempoColour.h" -#include <kaction.h> +#include <tdeaction.h> #include <kglobal.h> #include <kxmlguiclient.h> #include <kxmlguifactory.h> |