diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /tdeioslave/media/libmediacommon | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/media/libmediacommon')
7 files changed, 7 insertions, 7 deletions
diff --git a/tdeioslave/media/libmediacommon/actionlistboxitem.cpp b/tdeioslave/media/libmediacommon/actionlistboxitem.cpp index 271d2e487..9fd3b2bfb 100644 --- a/tdeioslave/media/libmediacommon/actionlistboxitem.cpp +++ b/tdeioslave/media/libmediacommon/actionlistboxitem.cpp @@ -19,7 +19,7 @@ #include "actionlistboxitem.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpixmap.h> diff --git a/tdeioslave/media/libmediacommon/medium.cpp b/tdeioslave/media/libmediacommon/medium.cpp index 7b97fb1a0..ca526ea49 100644 --- a/tdeioslave/media/libmediacommon/medium.cpp +++ b/tdeioslave/media/libmediacommon/medium.cpp @@ -19,7 +19,7 @@ #include "medium.h" #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> const TQString Medium::SEPARATOR = "---"; diff --git a/tdeioslave/media/libmediacommon/notifieraction.cpp b/tdeioslave/media/libmediacommon/notifieraction.cpp index 0dfc4110e..5222b9e65 100644 --- a/tdeioslave/media/libmediacommon/notifieraction.cpp +++ b/tdeioslave/media/libmediacommon/notifieraction.cpp @@ -20,7 +20,7 @@ #include "notifieraction.h" #include <tqfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kicontheme.h> diff --git a/tdeioslave/media/libmediacommon/notifiernothingaction.cpp b/tdeioslave/media/libmediacommon/notifiernothingaction.cpp index 6a86ad92f..b1c4bae3d 100644 --- a/tdeioslave/media/libmediacommon/notifiernothingaction.cpp +++ b/tdeioslave/media/libmediacommon/notifiernothingaction.cpp @@ -19,7 +19,7 @@ #include "notifiernothingaction.h" -#include <klocale.h> +#include <tdelocale.h> NotifierNothingAction::NotifierNothingAction() : NotifierAction() diff --git a/tdeioslave/media/libmediacommon/notifieropenaction.cpp b/tdeioslave/media/libmediacommon/notifieropenaction.cpp index 4d6d8025c..110b9fe28 100644 --- a/tdeioslave/media/libmediacommon/notifieropenaction.cpp +++ b/tdeioslave/media/libmediacommon/notifieropenaction.cpp @@ -19,7 +19,7 @@ #include "notifieropenaction.h" -#include <klocale.h> +#include <tdelocale.h> NotifierOpenAction::NotifierOpenAction() : NotifierAction() diff --git a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp index c7bece4f8..2405dfb39 100644 --- a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp +++ b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp @@ -24,7 +24,7 @@ #include <tqfileinfo.h> #include <kstddirs.h> #include <kdesktopfile.h> -#include <klocale.h> +#include <tdelocale.h> NotifierServiceAction::NotifierServiceAction() : NotifierAction() diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp index 254e591cb..a7dc7ee21 100644 --- a/tdeioslave/media/libmediacommon/notifiersettings.cpp +++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp @@ -19,7 +19,7 @@ #include "notifiersettings.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kdesktopfile.h> #include <kstandarddirs.h> #include <tqdir.h> |