diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:56:23 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:56:23 -0600 |
| commit | 20d323dbbfc6fd6b6ecb6de707e7cf86d2b0a4ed (patch) | |
| tree | 7d550525e0385669bb07dc4abd0f686f321b75de /src/gui/general | |
| parent | d4c3b9d53d39aade596dc71b71575fc38299995b (diff) | |
| download | rosegarden-20d323dbbfc6fd6b6ecb6de707e7cf86d2b0a4ed.tar.gz rosegarden-20d323dbbfc6fd6b6ecb6de707e7cf86d2b0a4ed.zip | |
Rename a number of libraries and executables 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 | 2 | ||||
| -rw-r--r-- | src/gui/general/GUIPalette.cpp | 2 | ||||
| -rw-r--r-- | src/gui/general/MidiPitchLabel.cpp | 2 | ||||
| -rw-r--r-- | src/gui/general/PresetHandlerDialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/general/PresetHandlerDialog.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp index c8e36eb..661236c 100644 --- a/src/gui/general/EditView.cpp +++ b/src/gui/general/EditView.cpp @@ -28,7 +28,7 @@ #include "base/BaseProperties.h" #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "misc/Debug.h" #include "misc/Strings.h" #include "ActiveItem.h" diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp index 0795b5f..ca8211a 100644 --- a/src/gui/general/EditViewBase.cpp +++ b/src/gui/general/EditViewBase.cpp @@ -46,7 +46,7 @@ #include "gui/kdeext/KTmpStatusMsg.h" #include <kaction.h> #include <kcommand.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdockwidget.h> #include <kedittoolbar.h> #include <kglobal.h> diff --git a/src/gui/general/GUIPalette.cpp b/src/gui/general/GUIPalette.cpp index e43d1de..0a3bd91 100644 --- a/src/gui/general/GUIPalette.cpp +++ b/src/gui/general/GUIPalette.cpp @@ -28,7 +28,7 @@ #include "base/Colour.h" #include "document/ConfigGroups.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <tqcolor.h> diff --git a/src/gui/general/MidiPitchLabel.cpp b/src/gui/general/MidiPitchLabel.cpp index 17138df..7b46812 100644 --- a/src/gui/general/MidiPitchLabel.cpp +++ b/src/gui/general/MidiPitchLabel.cpp @@ -27,7 +27,7 @@ #include <kapplication.h> #include "document/ConfigGroups.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <tqstring.h> diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp index 79124e4..a5f77d9 100644 --- a/src/gui/general/PresetHandlerDialog.cpp +++ b/src/gui/general/PresetHandlerDialog.cpp @@ -37,7 +37,7 @@ #include "PresetElement.h" #include "PresetGroup.h" #include <kcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialogbase.h> #include <tqbuttongroup.h> #include <tqdialog.h> diff --git a/src/gui/general/PresetHandlerDialog.h b/src/gui/general/PresetHandlerDialog.h index 83c617f..6d7b3b6 100644 --- a/src/gui/general/PresetHandlerDialog.h +++ b/src/gui/general/PresetHandlerDialog.h @@ -97,7 +97,7 @@ protected slots: // changes. void slotCategoryIndexChanged(int index); - // write out settings to kconfig data for next time and call accept() + // write out settings to tdeconfig data for next time and call accept() void slotOk(); }; // PresetHandlerDialog |