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 /libkcddb | |
| parent | 9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff) | |
| download | tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libkcddb')
| -rw-r--r-- | libkcddb/categories.cpp | 2 | ||||
| -rw-r--r-- | libkcddb/cddb.cpp | 2 | ||||
| -rw-r--r-- | libkcddb/cdinfodialogbase.ui.h | 2 | ||||
| -rw-r--r-- | libkcddb/cdinfoencodingwidget.cpp | 4 | ||||
| -rw-r--r-- | libkcddb/config.cpp | 2 | ||||
| -rw-r--r-- | libkcddb/genres.cpp | 2 | ||||
| -rw-r--r-- | libkcddb/kcmcddb/cddbconfigwidget.cpp | 4 | ||||
| -rw-r--r-- | libkcddb/kcmcddb/kcmcddb.cpp | 6 |
8 files changed, 12 insertions, 12 deletions
diff --git a/libkcddb/categories.cpp b/libkcddb/categories.cpp index 5b86a5f5..c334a332 100644 --- a/libkcddb/categories.cpp +++ b/libkcddb/categories.cpp @@ -7,7 +7,7 @@ // #include <categories.h> -#include <klocale.h> +#include <tdelocale.h> KCDDB::Categories::Categories() { diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp index e79f74a3..23b429ab 100644 --- a/libkcddb/cddb.cpp +++ b/libkcddb/cddb.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <kstringhandler.h> -#include <klocale.h> +#include <tdelocale.h> #include "cddb.h" diff --git a/libkcddb/cdinfodialogbase.ui.h b/libkcddb/cdinfodialogbase.ui.h index 93d3b2cc..f09702d1 100644 --- a/libkcddb/cdinfodialogbase.ui.h +++ b/libkcddb/cdinfodialogbase.ui.h @@ -10,7 +10,7 @@ #include <tqtextcodec.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcharsets.h> #include "cdinfoencodingwidget.h" diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp index 18b08363..f2a7e578 100644 --- a/libkcddb/cdinfoencodingwidget.cpp +++ b/libkcddb/cdinfoencodingwidget.cpp @@ -21,8 +21,8 @@ #include <tqlistbox.h> #include <tqlabel.h> #include <tqtextcodec.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcharsets.h> #include "cdinfoencodingwidget.h" diff --git a/libkcddb/config.cpp b/libkcddb/config.cpp index 5c4a82f2..41be28cb 100644 --- a/libkcddb/config.cpp +++ b/libkcddb/config.cpp @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <libkcddb/config.h> diff --git a/libkcddb/genres.cpp b/libkcddb/genres.cpp index 423e80fc..385b40d8 100644 --- a/libkcddb/genres.cpp +++ b/libkcddb/genres.cpp @@ -7,7 +7,7 @@ // #include <genres.h> -#include <klocale.h> +#include <tdelocale.h> KCDDB::Genres::Genres() { diff --git a/libkcddb/kcmcddb/cddbconfigwidget.cpp b/libkcddb/kcmcddb/cddbconfigwidget.cpp index c6c6f7f3..0de1f7ba 100644 --- a/libkcddb/kcmcddb/cddbconfigwidget.cpp +++ b/libkcddb/kcmcddb/cddbconfigwidget.cpp @@ -29,9 +29,9 @@ #include <tqlineedit.h> #include <tdefiledialog.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <keditlistbox.h> #include <tqwidgetstack.h> #include <kurlrequester.h> diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp index 8ce6a6dd..cda14763 100644 --- a/libkcddb/kcmcddb/kcmcddb.cpp +++ b/libkcddb/kcmcddb/kcmcddb.cpp @@ -29,10 +29,10 @@ #include <tqbuttongroup.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfigdialogmanager.h> #include "cddbconfigwidget.h" |