summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:53:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:53:07 -0600
commit7d844b6f8b3fdfc496d0c0cff61db77e81816ec4 (patch)
treea2b9d9e9609985a6af4aa9919bd99ed038e27797
parent56cf03c72b257cbd447f8519e3af4c56c9b1f35b (diff)
downloadlibkipi-7d844b6f8b3fdfc496d0c0cff61db77e81816ec4.tar.gz
libkipi-7d844b6f8b3fdfc496d0c0cff61db77e81816ec4.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--libkipi/libkipi/batchprogressdialog.cpp2
-rw-r--r--libkipi/libkipi/imagecollection.cpp2
-rw-r--r--libkipi/libkipi/imagecollectionselector.cpp4
-rw-r--r--libkipi/libkipi/imagecollectionshared.cpp2
-rw-r--r--libkipi/libkipi/imagedialog.cpp2
-rw-r--r--libkipi/libkipi/uploadwidget.cpp4
6 files changed, 8 insertions, 8 deletions
diff --git a/libkipi/libkipi/batchprogressdialog.cpp b/libkipi/libkipi/batchprogressdialog.cpp
index 8b51990..5244a71 100644
--- a/libkipi/libkipi/batchprogressdialog.cpp
+++ b/libkipi/libkipi/batchprogressdialog.cpp
@@ -42,7 +42,7 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprogress.h>
#include <kinstance.h>
#include <tdeconfig.h>
diff --git a/libkipi/libkipi/imagecollection.cpp b/libkipi/libkipi/imagecollection.cpp
index 67b208a..3afcb8f 100644
--- a/libkipi/libkipi/imagecollection.cpp
+++ b/libkipi/libkipi/imagecollection.cpp
@@ -23,7 +23,7 @@
// KDE includes.
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// Local includes.
diff --git a/libkipi/libkipi/imagecollectionselector.cpp b/libkipi/libkipi/imagecollectionselector.cpp
index 470cd1e..9a58fa3 100644
--- a/libkipi/libkipi/imagecollectionselector.cpp
+++ b/libkipi/libkipi/imagecollectionselector.cpp
@@ -34,8 +34,8 @@
#include <kbuttonbox.h>
#include <kdialog.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeio/previewjob.h>
// KIPI includes.
diff --git a/libkipi/libkipi/imagecollectionshared.cpp b/libkipi/libkipi/imagecollectionshared.cpp
index 4bf9d80..e032f2f 100644
--- a/libkipi/libkipi/imagecollectionshared.cpp
+++ b/libkipi/libkipi/imagecollectionshared.cpp
@@ -22,7 +22,7 @@
// KDE Includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
// Local Includes.
diff --git a/libkipi/libkipi/imagedialog.cpp b/libkipi/libkipi/imagedialog.cpp
index fe1a140..1fb25a6 100644
--- a/libkipi/libkipi/imagedialog.cpp
+++ b/libkipi/libkipi/imagedialog.cpp
@@ -34,7 +34,7 @@
#include <kdebug.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeio/previewjob.h>
#include <tdeapplication.h>
diff --git a/libkipi/libkipi/uploadwidget.cpp b/libkipi/libkipi/uploadwidget.cpp
index 60f8744..93f49ec 100644
--- a/libkipi/libkipi/uploadwidget.cpp
+++ b/libkipi/libkipi/uploadwidget.cpp
@@ -30,9 +30,9 @@
// KDE includes
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/jobclasses.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeversion.h>
#if TDE_VERSION >= 0x30200