diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:44:25 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:44:25 -0600 |
| commit | fa6008238fe6befd362a23c8767775a744e22bc2 (patch) | |
| tree | e1cd2545f72128efed02d79e501397ced82e36bc /digikam/libs/imageproperties | |
| parent | d21f600cd26a3c713e33fd7065b6e769825d86ed (diff) | |
| download | digikam-fa6008238fe6befd362a23c8767775a744e22bc2.tar.gz digikam-fa6008238fe6befd362a23c8767775a744e22bc2.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'digikam/libs/imageproperties')
10 files changed, 17 insertions, 17 deletions
diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp index 5d1d487..0427840 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp +++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp @@ -35,7 +35,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kdialogbase.h> diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp index 7fe479c..296ea35 100644 --- a/digikam/libs/imageproperties/imagedescedittab.cpp +++ b/digikam/libs/imageproperties/imagedescedittab.cpp @@ -39,14 +39,14 @@ // KDE includes. -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kcursor.h> #include <tdeapplication.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ktextedit.h> #include <tdeconfig.h> #include <klineedit.h> diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp index 53b758d..7388444 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp @@ -41,7 +41,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <ksqueezedtextlabel.h> #include <tdeapplication.h> #include <tdeconfig.h> diff --git a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp index d28f8cb..5a48aae 100644 --- a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp +++ b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp @@ -32,7 +32,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kdialogbase.h> diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.cpp b/digikam/libs/imageproperties/imagepropertiessidebar.cpp index 8e89d09..9f1dccc 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebar.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebar.cpp @@ -29,11 +29,11 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> // Local includes. diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp index 4c948b6..6a13df1 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp @@ -28,11 +28,11 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> // Local includes. diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp index 7e3c92a..e360622 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp @@ -31,11 +31,11 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> // Local includes. diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp index b75ad4c..952bb64 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.cpp +++ b/digikam/libs/imageproperties/imagepropertiestab.cpp @@ -35,7 +35,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include <tdefileitem.h> #include <ksqueezedtextlabel.h> diff --git a/digikam/libs/imageproperties/navigatebarwidget.cpp b/digikam/libs/imageproperties/navigatebarwidget.cpp index ea01df0..ba923cf 100644 --- a/digikam/libs/imageproperties/navigatebarwidget.cpp +++ b/digikam/libs/imageproperties/navigatebarwidget.cpp @@ -29,7 +29,7 @@ #include <ksqueezedtextlabel.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp index 7258563..4191962 100644 --- a/digikam/libs/imageproperties/talbumlistview.cpp +++ b/digikam/libs/imageproperties/talbumlistview.cpp @@ -29,14 +29,14 @@ // KDE includes. #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kcursor.h> #include <tdeapplication.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdialogbase.h> // Local includes. |