diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:58:20 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:58:20 -0600 |
commit | 6915c95d7c4a42d19ebbec3c87c1e308b20ec272 (patch) | |
tree | 027fb6e879e17c2d65cbea9eab5c9da028618972 /krec | |
parent | 9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff) | |
download | tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'krec')
-rw-r--r-- | krec/krecconfig_files.cpp | 2 | ||||
-rw-r--r-- | krec/krecconfig_fileswidget.cpp | 2 | ||||
-rw-r--r-- | krec/krecconfigure.cpp | 4 | ||||
-rw-r--r-- | krec/krecexport_wave.cpp | 2 | ||||
-rw-r--r-- | krec/krecfile.cpp | 6 | ||||
-rw-r--r-- | krec/krecfileview.cpp | 2 | ||||
-rw-r--r-- | krec/krecfileviewhelpers.cpp | 2 | ||||
-rw-r--r-- | krec/krecfileviewhelpers.h | 2 | ||||
-rw-r--r-- | krec/krecfilewidgets.cpp | 2 | ||||
-rw-r--r-- | krec/krecnewproperties.cpp | 2 | ||||
-rw-r--r-- | krec/krecord.cpp | 4 | ||||
-rw-r--r-- | krec/main.cpp | 2 | ||||
-rw-r--r-- | krec/mp3_export/krecexport_mp3.cpp | 6 | ||||
-rw-r--r-- | krec/ogg_export/krecexport_ogg.cpp | 6 |
14 files changed, 22 insertions, 22 deletions
diff --git a/krec/krecconfig_files.cpp b/krec/krecconfig_files.cpp index 9ad1f2fa..31df79aa 100644 --- a/krec/krecconfig_files.cpp +++ b/krec/krecconfig_files.cpp @@ -26,7 +26,7 @@ #include <tqlabel.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> typedef KGenericFactory<KRecConfigFiles, TQWidget> KRecConfigFilesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_krec_files, KRecConfigFilesFactory( "krec" ) ) diff --git a/krec/krecconfig_fileswidget.cpp b/krec/krecconfig_fileswidget.cpp index 8eb4dda4..42fcd11d 100644 --- a/krec/krecconfig_fileswidget.cpp +++ b/krec/krecconfig_fileswidget.cpp @@ -23,7 +23,7 @@ #include <tqlineedit.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> KRecConfigFilesWidget::KRecConfigFilesWidget( TQWidget* p, const char* n ) diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp index f08bf48c..5063c461 100644 --- a/krec/krecconfigure.cpp +++ b/krec/krecconfigure.cpp @@ -27,8 +27,8 @@ #include <tqlabel.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> typedef KGenericFactory<KRecConfigGeneral, TQWidget> KRecConfigGeneralFactory; diff --git a/krec/krecexport_wave.cpp b/krec/krecexport_wave.cpp index 6224283e..47fb0470 100644 --- a/krec/krecexport_wave.cpp +++ b/krec/krecexport_wave.cpp @@ -17,7 +17,7 @@ #include "krecglobal.h" #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqfile.h> #include <tqtimer.h> #include <kgenericfactory.h> diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp index cfd2ef6b..864b4c43 100644 --- a/krec/krecfile.cpp +++ b/krec/krecfile.cpp @@ -21,14 +21,14 @@ #include <kdebug.h> #include <tdeapplication.h> #include <ktempdir.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <ktar.h> #include <tdeio/job.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <tqdir.h> #include <tqfileinfo.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqtimer.h> #include <tqdatastream.h> diff --git a/krec/krecfileview.cpp b/krec/krecfileview.cpp index a5a989d8..bdf62adb 100644 --- a/krec/krecfileview.cpp +++ b/krec/krecfileview.cpp @@ -20,7 +20,7 @@ #include "krecglobal.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> #include <tqpainter.h> diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp index 4472a3c6..2ca5b582 100644 --- a/krec/krecfileviewhelpers.cpp +++ b/krec/krecfileviewhelpers.cpp @@ -17,7 +17,7 @@ #include "krecglobal.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> #include <tqpainter.h> diff --git a/krec/krecfileviewhelpers.h b/krec/krecfileviewhelpers.h index 85e0f48e..695b9105 100644 --- a/krec/krecfileviewhelpers.h +++ b/krec/krecfileviewhelpers.h @@ -18,7 +18,7 @@ #include <tqlabel.h> #include <tqstring.h> #include <tqpoint.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> class TQBoxLayout; class AKLabel; diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp index 69c7a5ca..c0b778de 100644 --- a/krec/krecfilewidgets.cpp +++ b/krec/krecfilewidgets.cpp @@ -18,7 +18,7 @@ #include "krecglobal.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> #include <tqpainter.h> diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp index fc713a1a..8f5f7385 100644 --- a/krec/krecnewproperties.cpp +++ b/krec/krecnewproperties.cpp @@ -31,7 +31,7 @@ #include <tqfont.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> KRecNewProperties::KRecNewProperties( TQWidget* p, const char* n ) : TQDialog( p,n, 0, TQt::WType_Dialog|TQt::WStyle_Customize|TQt::WStyle_DialogBorder ) diff --git a/krec/krecord.cpp b/krec/krecord.cpp index 955c8b89..0e122979 100644 --- a/krec/krecord.cpp +++ b/krec/krecord.cpp @@ -26,8 +26,8 @@ #include <arts/kaudioplaystream.h> #include <arts/kaudiorecordstream.h> #include <tdefiledialog.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> #include <tdeaction.h> diff --git a/krec/main.cpp b/krec/main.cpp index 75333177..b530078d 100644 --- a/krec/main.cpp +++ b/krec/main.cpp @@ -18,7 +18,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include "krecord.h" diff --git a/krec/mp3_export/krecexport_mp3.cpp b/krec/mp3_export/krecexport_mp3.cpp index 312a91e0..79d0f4ad 100644 --- a/krec/mp3_export/krecexport_mp3.cpp +++ b/krec/mp3_export/krecexport_mp3.cpp @@ -17,16 +17,16 @@ #include "krecglobal.h" #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqfile.h> #include <tqtimer.h> #include <kgenericfactory.h> #include <stdlib.h> #include <time.h> #include <tqdatetime.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // Error code definitions from lame.h static const char *lame_error[] = diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp index f8bc9799..32ff777a 100644 --- a/krec/ogg_export/krecexport_ogg.cpp +++ b/krec/ogg_export/krecexport_ogg.cpp @@ -21,7 +21,7 @@ #include "krecglobal.h" #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqfile.h> #include <tqtimer.h> #include <tdeconfig.h> @@ -29,8 +29,8 @@ #include <time.h> #include <tqdatetime.h> #include <kgenericfactory.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> K_EXPORT_COMPONENT_FACTORY( libkrecexport_ogg, KGenericFactory<KRecExport_OGG> ) |