diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:51:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:51:32 -0600 |
| commit | 5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb (patch) | |
| tree | 7fdeb64e5bef896a23bdf46847e3ffd3ec460cda /src/gui/general | |
| parent | 3f02581883759395fcd3935ec1d88ddca4895f32 (diff) | |
| download | rosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.tar.gz rosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/general')
| -rw-r--r-- | src/gui/general/EditToolBox.cpp | 2 | ||||
| -rw-r--r-- | src/gui/general/EditView.cpp | 4 | ||||
| -rw-r--r-- | src/gui/general/EditViewBase.cpp | 4 | ||||
| -rw-r--r-- | src/gui/general/MidiPitchLabel.cpp | 2 | ||||
| -rw-r--r-- | src/gui/general/PresetGroup.cpp | 4 | ||||
| -rw-r--r-- | src/gui/general/PresetHandlerDialog.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/general/EditToolBox.cpp b/src/gui/general/EditToolBox.cpp index 48fa7e4..19b0714 100644 --- a/src/gui/general/EditToolBox.cpp +++ b/src/gui/general/EditToolBox.cpp @@ -30,7 +30,7 @@ #include "EditView.h" #include <tqobject.h> #include <tqstring.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> namespace Rosegarden { diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp index 551e48a..0ad2e69 100644 --- a/src/gui/general/EditView.cpp +++ b/src/gui/general/EditView.cpp @@ -27,7 +27,7 @@ #include <tqlayout.h> #include "base/BaseProperties.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include "misc/Debug.h" #include "misc/Strings.h" @@ -82,7 +82,7 @@ #include <tdeaction.h> #include <kcommand.h> #include <kdockwidget.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kstddirs.h> #include <ktabwidget.h> diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp index 5194349..0591a8c 100644 --- a/src/gui/general/EditViewBase.cpp +++ b/src/gui/general/EditViewBase.cpp @@ -27,7 +27,7 @@ #include <tqlayout.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstddirs.h> #include "misc/Debug.h" #include "base/Clipboard.h" @@ -49,7 +49,7 @@ #include <tdeconfig.h> #include <kdockwidget.h> #include <kedittoolbar.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kkeydialog.h> #include <tdemainwindow.h> #include <kstatusbar.h> diff --git a/src/gui/general/MidiPitchLabel.cpp b/src/gui/general/MidiPitchLabel.cpp index 82667b6..ba42587 100644 --- a/src/gui/general/MidiPitchLabel.cpp +++ b/src/gui/general/MidiPitchLabel.cpp @@ -28,7 +28,7 @@ #include "document/ConfigGroups.h" #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> diff --git a/src/gui/general/PresetGroup.cpp b/src/gui/general/PresetGroup.cpp index 9eb17ba..353b7d4 100644 --- a/src/gui/general/PresetGroup.cpp +++ b/src/gui/general/PresetGroup.cpp @@ -33,9 +33,9 @@ #include "gui/general/ClefIndex.h" #include "base/Exception.h" #include "CategoryElement.h" -#include <klocale.h> +#include <tdelocale.h> #include <kstddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqfile.h> #include <tqfileinfo.h> #include <tqregexp.h> diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp index a1ce9d5..1dc7db1 100644 --- a/src/gui/general/PresetHandlerDialog.cpp +++ b/src/gui/general/PresetHandlerDialog.cpp @@ -30,7 +30,7 @@ #include <tqlayout.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include "misc/Debug.h" #include "document/ConfigGroups.h" #include "CategoryElement.h" |