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/application | |
| 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/application')
| -rw-r--r-- | src/gui/application/RosegardenApplication.cpp | 2 | ||||
| -rw-r--r-- | src/gui/application/RosegardenGUIApp.cpp | 6 | ||||
| -rw-r--r-- | src/gui/application/RosegardenGUIApp.cpp.orig | 6 | ||||
| -rw-r--r-- | src/gui/application/RosegardenGUIView.cpp | 2 | ||||
| -rw-r--r-- | src/gui/application/main.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp index f358c2a..10add69 100644 --- a/src/gui/application/RosegardenApplication.cpp +++ b/src/gui/application/RosegardenApplication.cpp @@ -42,7 +42,7 @@ #include <tqsessionmanager.h> #include <tqstring.h> #include <dcopclient.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstatusbar.h> diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp index b4e0c6f..8e529d4 100644 --- a/src/gui/application/RosegardenGUIApp.cpp +++ b/src/gui/application/RosegardenGUIApp.cpp @@ -176,14 +176,14 @@ #include <dcopobject.h> #include <dcopref.h> #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdcopactionproxy.h> #include <kdockwidget.h> #include <kedittoolbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kinputdialog.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kkeydialog.h> #include <klocale.h> #include <kmainwindow.h> diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig index 7d82eda..4007322 100644 --- a/src/gui/application/RosegardenGUIApp.cpp.orig +++ b/src/gui/application/RosegardenGUIApp.cpp.orig @@ -176,14 +176,14 @@ #include <dcopobject.h> #include <dcopref.h> #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdcopactionproxy.h> #include <kdockwidget.h> #include <kedittoolbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kinputdialog.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kkeydialog.h> #include <klocale.h> #include <kmainwindow.h> diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp index 878df77..ea12c38 100644 --- a/src/gui/application/RosegardenGUIView.cpp +++ b/src/gui/application/RosegardenGUIView.cpp @@ -80,7 +80,7 @@ #include "sound/AudioFileManager.h" #include "sound/MappedEvent.h" #include <kcommand.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kprocess.h> #include <tqapplication.h> diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp index 1269353..538e71b 100644 --- a/src/gui/application/main.cpp +++ b/src/gui/application/main.cpp @@ -29,7 +29,7 @@ #include <kaboutdata.h> #include <klocale.h> #include <dcopclient.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kstddirs.h> #include <ktip.h> |