summaryrefslogtreecommitdiffstats
path: root/kode
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
commitcfb328d59024a251690b6e47c9f8d343fd8c241c (patch)
tree7c11070cd07e5e023a26ddcfa41832c208c63732 /kode
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kode')
-rw-r--r--kode/CMakeLists.txt2
-rw-r--r--kode/kodemain.cpp8
-rw-r--r--kode/kwsdl/kung/binaryinputfield.cpp6
-rw-r--r--kode/kwsdl/kung/dispatcher.cpp4
-rw-r--r--kode/kwsdl/kung/inputdialog.cpp2
-rw-r--r--kode/kwsdl/kung/listinputfield.cpp2
-rw-r--r--kode/kwsdl/kung/main.cpp2
-rw-r--r--kode/kwsdl/kung/outputdialog.cpp2
-rw-r--r--kode/kwsdl/main.cpp2
-rw-r--r--kode/kwsdl/schema/fileprovider.cpp2
-rw-r--r--kode/kxml_compiler/creator.cpp4
-rw-r--r--kode/kxml_compiler/creator.h4
-rw-r--r--kode/kxml_compiler/kxml_compiler.cpp4
-rw-r--r--kode/kxml_compiler/parser.cpp4
-rw-r--r--kode/kxml_compiler/parser.h4
15 files changed, 26 insertions, 26 deletions
diff --git a/kode/CMakeLists.txt b/kode/CMakeLists.txt
index 179a539e1..e2255d9a2 100644
--- a/kode/CMakeLists.txt
+++ b/kode/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
tde_add_executable( kode
SOURCES kodemain.cpp
- LINK kode-shared kabc-shared
+ LINK kode-shared tdeabc-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index 8c2e3a364..e91be0c86 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -24,16 +24,16 @@
#include "license.h"
#include "automakefile.h"
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
#include <ksavefile.h>
diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp
index 95ea292e2..b0fb78b00 100644
--- a/kode/kwsdl/kung/binaryinputfield.cpp
+++ b/kode/kwsdl/kung/binaryinputfield.cpp
@@ -22,12 +22,12 @@
#include <tdefiledialog.h>
#include <tdeio/netaccess.h>
#include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kmimemagic.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/part.h>
#include <tdeparts/componentfactory.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqfile.h>
#include <tqlabel.h>
diff --git a/kode/kwsdl/kung/dispatcher.cpp b/kode/kwsdl/kung/dispatcher.cpp
index 58ac17d19..5c65d0c48 100644
--- a/kode/kwsdl/kung/dispatcher.cpp
+++ b/kode/kwsdl/kung/dispatcher.cpp
@@ -24,8 +24,8 @@
#include <tqwidget.h>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "generalconversationmanager.h"
#include "inputdialog.h"
diff --git a/kode/kwsdl/kung/inputdialog.cpp b/kode/kwsdl/kung/inputdialog.cpp
index 17aa601b0..353494e21 100644
--- a/kode/kwsdl/kung/inputdialog.cpp
+++ b/kode/kwsdl/kung/inputdialog.cpp
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "inputdialog.h"
diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp
index 4a6921c07..539e3de2c 100644
--- a/kode/kwsdl/kung/listinputfield.cpp
+++ b/kode/kwsdl/kung/listinputfield.cpp
@@ -23,7 +23,7 @@
#include <tqlistbox.h>
#include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <schema/simpletype.h>
diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp
index 9f236c3cf..2dadbe9dd 100644
--- a/kode/kwsdl/kung/main.cpp
+++ b/kode/kwsdl/kung/main.cpp
@@ -23,7 +23,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqtimer.h>
diff --git a/kode/kwsdl/kung/outputdialog.cpp b/kode/kwsdl/kung/outputdialog.cpp
index 6cdb7e579..e8d676434 100644
--- a/kode/kwsdl/kung/outputdialog.cpp
+++ b/kode/kwsdl/kung/outputdialog.cpp
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "outputdialog.h"
diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp
index ab40e3a33..5ba4f533c 100644
--- a/kode/kwsdl/main.cpp
+++ b/kode/kwsdl/main.cpp
@@ -25,7 +25,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqdir.h>
#include <tqfile.h>
diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp
index 945f7261f..ed5606fd2 100644
--- a/kode/kwsdl/schema/fileprovider.cpp
+++ b/kode/kwsdl/schema/fileprovider.cpp
@@ -26,7 +26,7 @@
#include <tqfile.h>
#include <tdeio/job.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include "fileprovider.h"
diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp
index b46a99eb2..bc330eaf9 100644
--- a/kode/kxml_compiler/creator.cpp
+++ b/kode/kxml_compiler/creator.cpp
@@ -29,9 +29,9 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/kode/kxml_compiler/creator.h b/kode/kxml_compiler/creator.h
index c0018fd5e..39cac4c6b 100644
--- a/kode/kxml_compiler/creator.h
+++ b/kode/kxml_compiler/creator.h
@@ -31,9 +31,9 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp
index 87c3bb1d3..317515b6b 100644
--- a/kode/kxml_compiler/kxml_compiler.cpp
+++ b/kode/kxml_compiler/kxml_compiler.cpp
@@ -29,9 +29,9 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp
index 163213f99..5fc72f97a 100644
--- a/kode/kxml_compiler/parser.cpp
+++ b/kode/kxml_compiler/parser.cpp
@@ -28,9 +28,9 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/kode/kxml_compiler/parser.h b/kode/kxml_compiler/parser.h
index 07052787e..9f0f21a18 100644
--- a/kode/kxml_compiler/parser.h
+++ b/kode/kxml_compiler/parser.h
@@ -28,9 +28,9 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>