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/themedesigner | |
| parent | d21f600cd26a3c713e33fd7065b6e769825d86ed (diff) | |
| download | digikam-fa6008238fe6befd362a23c8767775a744e22bc2.tar.gz digikam-fa6008238fe6befd362a23c8767775a744e22bc2.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'digikam/themedesigner')
| -rw-r--r-- | digikam/themedesigner/main.cpp | 4 | ||||
| -rw-r--r-- | digikam/themedesigner/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | digikam/themedesigner/themedicongroupitem.cpp | 2 | ||||
| -rw-r--r-- | digikam/themedesigner/themediconitem.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/digikam/themedesigner/main.cpp b/digikam/themedesigner/main.cpp index 0b66671..27bc745 100644 --- a/digikam/themedesigner/main.cpp +++ b/digikam/themedesigner/main.cpp @@ -31,8 +31,8 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/themedesigner/mainwindow.cpp b/digikam/themedesigner/mainwindow.cpp index e9c6ccb..3b93fb2 100644 --- a/digikam/themedesigner/mainwindow.cpp +++ b/digikam/themedesigner/mainwindow.cpp @@ -39,13 +39,13 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kcolordialog.h> #include <kcolorbutton.h> #include <tdeapplication.h> #include <kiconloader.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kuser.h> // Local includes. diff --git a/digikam/themedesigner/themedicongroupitem.cpp b/digikam/themedesigner/themedicongroupitem.cpp index 585bd52..1da37fd 100644 --- a/digikam/themedesigner/themedicongroupitem.cpp +++ b/digikam/themedesigner/themedicongroupitem.cpp @@ -28,7 +28,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/themedesigner/themediconitem.cpp b/digikam/themedesigner/themediconitem.cpp index 939e12b..2ed7df8 100644 --- a/digikam/themedesigner/themediconitem.cpp +++ b/digikam/themedesigner/themediconitem.cpp @@ -33,8 +33,8 @@ // KDE includes. -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kiconloader.h> |