diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:32 -0600 |
| commit | 793cf2dff35dffe3ec4c7b24252947dde758a1b2 (patch) | |
| tree | 7d9972d99ed281a36418ae9f5fc128e3c951532c /kaudiocreator | |
| parent | 04f764aaf273340e1d5811d4216dd8127cacc5db (diff) | |
| download | tdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.tar.gz tdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kaudiocreator')
| -rw-r--r-- | kaudiocreator/Makefile.am | 2 | ||||
| -rw-r--r-- | kaudiocreator/encoder_prefs.kcfgc | 2 | ||||
| -rw-r--r-- | kaudiocreator/encoderconfigimp.cpp | 4 | ||||
| -rw-r--r-- | kaudiocreator/jobqueimp.cpp | 2 | ||||
| -rw-r--r-- | kaudiocreator/kaudiocreator.h | 2 | ||||
| -rw-r--r-- | kaudiocreator/prefs.kcfgc | 2 | ||||
| -rw-r--r-- | kaudiocreator/ripper.cpp | 2 | ||||
| -rw-r--r-- | kaudiocreator/ripper.h | 2 | ||||
| -rw-r--r-- | kaudiocreator/tracksimp.cpp | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/kaudiocreator/Makefile.am b/kaudiocreator/Makefile.am index ba0f65ad..1f926de6 100644 --- a/kaudiocreator/Makefile.am +++ b/kaudiocreator/Makefile.am @@ -35,7 +35,7 @@ appdatadir = $(kde_datadir)/kaudiocreator servicedata_DATA = audiocd_extract.desktop servicedatadir = $(kde_datadir)/konqueror/servicemenus -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update update_DATA = kaudiocreator-meta.upd kaudiocreator-libkcddb.upd update_SCRIPTS = upgrade-kaudiocreator-metadata.sh diff --git a/kaudiocreator/encoder_prefs.kcfgc b/kaudiocreator/encoder_prefs.kcfgc index 075a4321..c34a8641 100644 --- a/kaudiocreator/encoder_prefs.kcfgc +++ b/kaudiocreator/encoder_prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kaudiocreator_encoders.kcfg #IncludeFiles=defines.h ClassName=EncoderPrefs diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp index cc4d1ad5..b02ca614 100644 --- a/kaudiocreator/encoderconfigimp.cpp +++ b/kaudiocreator/encoderconfigimp.cpp @@ -24,10 +24,10 @@ #include <tqpushbutton.h> #include <tqlineedit.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kmessagebox.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> /** * Constructor. diff --git a/kaudiocreator/jobqueimp.cpp b/kaudiocreator/jobqueimp.cpp index 81c0431d..1083f738 100644 --- a/kaudiocreator/jobqueimp.cpp +++ b/kaudiocreator/jobqueimp.cpp @@ -24,7 +24,7 @@ #include <tqpushbutton.h> #include <tqlabel.h> #include <tqpainter.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h index 0ba8f6aa..5624c563 100644 --- a/kaudiocreator/kaudiocreator.h +++ b/kaudiocreator/kaudiocreator.h @@ -22,7 +22,7 @@ #define KAUDIOCREATOR_H #include <kmainwindow.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> class KJanusWidget; class TracksImp; diff --git a/kaudiocreator/prefs.kcfgc b/kaudiocreator/prefs.kcfgc index dc784e77..1b3d28ff 100644 --- a/kaudiocreator/prefs.kcfgc +++ b/kaudiocreator/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kaudiocreator.kcfg #IncludeFiles=defines.h ClassName=Prefs diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp index e2366fd7..2060278f 100644 --- a/kaudiocreator/ripper.cpp +++ b/kaudiocreator/ripper.cpp @@ -27,7 +27,7 @@ #include <kmessagebox.h> #include <knotifyclient.h> #include <kstandarddirs.h> -#include <kio/scheduler.h> +#include <tdeio/scheduler.h> /** * Constructor, load settings. diff --git a/kaudiocreator/ripper.h b/kaudiocreator/ripper.h index 3804b8ad..1d79c0e8 100644 --- a/kaudiocreator/ripper.h +++ b/kaudiocreator/ripper.h @@ -22,7 +22,7 @@ #define RIPPER_H #include "job.h" -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include <tqmap.h> #include <tqptrlist.h> diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp index c9296547..73656e07 100644 --- a/kaudiocreator/tracksimp.cpp +++ b/kaudiocreator/tracksimp.cpp @@ -23,7 +23,7 @@ #include <fixx11h.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include <kdebug.h> #include <kinputdialog.h> |