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/editors/notation | |
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/editors/notation')
-rw-r--r-- | src/gui/editors/notation/NotationEraser.cpp | 2 | ||||
-rw-r--r-- | src/gui/editors/notation/NotationHLayout.cpp | 2 | ||||
-rw-r--r-- | src/gui/editors/notation/NotationStaff.cpp | 2 | ||||
-rw-r--r-- | src/gui/editors/notation/NotationStrings.cpp | 2 | ||||
-rw-r--r-- | src/gui/editors/notation/NotationView.cpp | 2 | ||||
-rw-r--r-- | src/gui/editors/notation/NoteFontFactory.cpp | 2 | ||||
-rw-r--r-- | src/gui/editors/notation/NoteInserter.cpp | 2 | ||||
-rw-r--r-- | src/gui/editors/notation/NotePixmapFactory.cpp | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp index 50929f4..c12d87a 100644 --- a/src/gui/editors/notation/NotationEraser.cpp +++ b/src/gui/editors/notation/NotationEraser.cpp @@ -35,7 +35,7 @@ #include "NotationView.h" #include "NotePixmapFactory.h" #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqiconset.h> #include <tqstring.h> diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp index 32a47e2..50fb0f6 100644 --- a/src/gui/editors/notation/NotationHLayout.cpp +++ b/src/gui/editors/notation/NotationHLayout.cpp @@ -46,7 +46,7 @@ #include "NotationProperties.h" #include "NotationStaff.h" #include "NotePixmapFactory.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <tqobject.h> #include <cmath> diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp index 3be47ae..f49b632 100644 --- a/src/gui/editors/notation/NotationStaff.cpp +++ b/src/gui/editors/notation/NotationStaff.cpp @@ -62,7 +62,7 @@ #include "NotePixmapFactory.h" #include "NotePixmapParameters.h" #include "NoteStyleFactory.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <tqcanvas.h> #include <tqpainter.h> diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp index f81ad1e..24d5c9d 100644 --- a/src/gui/editors/notation/NotationStrings.cpp +++ b/src/gui/editors/notation/NotationStrings.cpp @@ -32,7 +32,7 @@ #include "base/Exception.h" #include "base/NotationTypes.h" #include "gui/configuration/GeneralConfigurationPage.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <tqstring.h> diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp index 032b8cb..02b8539 100644 --- a/src/gui/editors/notation/NotationView.cpp +++ b/src/gui/editors/notation/NotationView.cpp @@ -182,7 +182,7 @@ #include "HeadersGroup.h" #include <kaction.h> #include <kcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <klineeditdlg.h> #include <kmessagebox.h> diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp index 9099b58..9760734 100644 --- a/src/gui/editors/notation/NoteFontFactory.cpp +++ b/src/gui/editors/notation/NoteFontFactory.cpp @@ -35,7 +35,7 @@ #include "gui/kdeext/KStartupLogo.h" #include "NoteFont.h" #include "NoteFontMap.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kmessagebox.h> #include <tqdir.h> diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp index a2b6b56..3db308f 100644 --- a/src/gui/editors/notation/NoteInserter.cpp +++ b/src/gui/editors/notation/NoteInserter.cpp @@ -51,7 +51,7 @@ #include "NoteStyleFactory.h" #include <kaction.h> #include <kcommand.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqiconset.h> #include <tqregexp.h> #include <tqstring.h> diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp index 7474d4e..f34eeaa 100644 --- a/src/gui/editors/notation/NotePixmapFactory.cpp +++ b/src/gui/editors/notation/NotePixmapFactory.cpp @@ -30,7 +30,7 @@ #include <klocale.h> #include <kstddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "misc/Strings.h" #include "document/ConfigGroups.h" #include "base/Exception.h" |