diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:06 -0600 |
| commit | 71049a71c6648791e95cf421b19047415a2c4c84 (patch) | |
| tree | 4f75fdaee1cce5a44f58f1f54980099f50a82b10 /konq-plugins/kimgalleryplugin | |
| parent | 6fe537d6dff11f4c638c51ed1f652765b63f8591 (diff) | |
| download | tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.tar.gz tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/kimgalleryplugin')
| -rw-r--r-- | konq-plugins/kimgalleryplugin/imgallerydialog.cpp | 4 | ||||
| -rw-r--r-- | konq-plugins/kimgalleryplugin/imgalleryplugin.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp index 1214647..e86dd57 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp @@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA. #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdefontdialog.h> #include <kiconloader.h> @@ -38,7 +38,7 @@ Boston, MA 02110-1301, USA. #include <knuminput.h> #include <kcolorbutton.h> #include <kurlrequester.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include "imgallerydialog.h" diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index a3e7795..a4d255c 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -30,10 +30,10 @@ Boston, MA 02110-1301, USA. #include <tqstylesheet.h> #include <tdeaction.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcharsets.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurl.h> #include <tdeapplication.h> #include <kimageio.h> |