summaryrefslogtreecommitdiffstats
path: root/kipi-plugins/picasawebexport
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:53:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:53:01 -0600
commit7f7536ce977e7a4a00727244246fc71062a76721 (patch)
tree7deaba7d507a5bb63df96afb8d82ac336db80221 /kipi-plugins/picasawebexport
parentca974a522c029a32b1f01571806e93edb56883e1 (diff)
downloadkipi-plugins-7f7536ce977e7a4a00727244246fc71062a76721.tar.gz
kipi-plugins-7f7536ce977e7a4a00727244246fc71062a76721.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kipi-plugins/picasawebexport')
-rw-r--r--kipi-plugins/picasawebexport/picasaweblogin.cpp2
-rw-r--r--kipi-plugins/picasawebexport/picasawebtalker.cpp4
-rw-r--r--kipi-plugins/picasawebexport/picasawebwidget.cpp2
-rw-r--r--kipi-plugins/picasawebexport/picasawebwindow.cpp4
-rw-r--r--kipi-plugins/picasawebexport/plugin_picasawebexport.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/kipi-plugins/picasawebexport/picasaweblogin.cpp b/kipi-plugins/picasawebexport/picasaweblogin.cpp
index 9fcad57..d319dc4 100644
--- a/kipi-plugins/picasawebexport/picasaweblogin.cpp
+++ b/kipi-plugins/picasawebexport/picasaweblogin.cpp
@@ -31,7 +31,7 @@
// KDE includes.
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// Local includes.
diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp
index c38af3d..c48a80a 100644
--- a/kipi-plugins/picasawebexport/picasawebtalker.cpp
+++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp
@@ -43,14 +43,14 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/job.h>
#include <kdebug.h>
#include <kmimetype.h>
#include <kstandarddirs.h>
#include <kmdcodec.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/jobclasses.h>
#include <kurl.h>
diff --git a/kipi-plugins/picasawebexport/picasawebwidget.cpp b/kipi-plugins/picasawebexport/picasawebwidget.cpp
index 08c6ab5..dbb4dc7 100644
--- a/kipi-plugins/picasawebexport/picasawebwidget.cpp
+++ b/kipi-plugins/picasawebexport/picasawebwidget.cpp
@@ -40,7 +40,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
diff --git a/kipi-plugins/picasawebexport/picasawebwindow.cpp b/kipi-plugins/picasawebexport/picasawebwindow.cpp
index 4024bda..76fb780 100644
--- a/kipi-plugins/picasawebexport/picasawebwindow.cpp
+++ b/kipi-plugins/picasawebexport/picasawebwindow.cpp
@@ -43,8 +43,8 @@
#include <khelpmenu.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kiconloader.h>
#include <tdehtml_part.h>
diff --git a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
index 209a31a..7e8583e 100644
--- a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
+++ b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
@@ -29,7 +29,7 @@ extern "C"
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>