Rename additional header files to avoid conflicts with KDE4

14 files changed, 35 insertions, 35 deletions

diff --git a/kgpg/CMakeLists.txt b/kgpg/CMakeLists.txt
index 3bd5905..3121421 100644
--- a/kgpg/CMakeLists.txt
+++ b/kgpg/CMakeLists.txt
@@ -40,7 +40,7 @@ tde_add_executable( kgpg AUTOMOC
     keyexport.ui sourceselect.ui
     kgpgsettings.kcfgc conf_servers.ui
     conf_ui2.ui conf_misc.ui
-  LINK kabc-shared tdeutils-shared tdeprint-shared
+  LINK tdeabc-shared tdeutils-shared tdeprint-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/kgpg/detailedconsole.cpp b/kgpg/detailedconsole.cpp
index 2fe2ce3..3eab40e 100644
--- a/kgpg/detailedconsole.cpp
+++ b/kgpg/detailedconsole.cpp
@@ -21,10 +21,10 @@
 #include <tqvgroupbox.h>
 #include <tqtextedit.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdelistbox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kgpgoptions.h"
 #include "detailedconsole.h"
diff --git a/kgpg/keygener.cpp b/kgpg/keygener.cpp
index 26ecebe..30fd99c 100644
--- a/kgpg/keygener.cpp
+++ b/kgpg/keygener.cpp
@@ -28,8 +28,8 @@
 #include <tqbuttongroup.h>
 #include <tqhbuttongroup.h>
 #include <tqvbuttongroup.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "keygener.h"
 
diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp
index 06c6e04..1de61af 100644
--- a/kgpg/keyinfowidget.cpp
+++ b/kgpg/keyinfowidget.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tqdatetime.h>
 #include <tqfile.h>
@@ -23,7 +23,7 @@
 #include <kpassivepopup.h>
 #include <tdeaction.h>
 #include <tqregexp.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqimage.h>
 #include <kdatepicker.h>
 #include <tqpushbutton.h>
@@ -36,7 +36,7 @@
 #include <klineedit.h>
 #include <ktrader.h>
 #include <kservice.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "keyinfowidget.h"
 #include "keyproperties.h"
diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp
index f8d00c9..364de3a 100644
--- a/kgpg/keyservers.cpp
+++ b/kgpg/keyservers.cpp
@@ -23,7 +23,7 @@
 #include <kiconloader.h>
 #include <kcombobox.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtextcodec.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
@@ -35,7 +35,7 @@
 #include <tqregexp.h>
 #include <tqcursor.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kprocio.h>
 #include <tdelistview.h>
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index 7febe6b..c711e3a 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -26,13 +26,13 @@
 #include <tqmovie.h>
 #include <tqcstring.h>
 #include <tqhbuttongroup.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kactivelabel.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <tqregexp.h>
 #include <tdecmdlineargs.h>
@@ -45,7 +45,7 @@
 #include <tqlayout.h>
 #include <tqbuttongroup.h>
 #include <kiconloader.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <twin.h>
 #include <kprocess.h>
 #include <kprocio.h>
diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp
index 212d9a3..b60ee8d 100644
--- a/kgpg/kgpgeditor.cpp
+++ b/kgpg/kgpgeditor.cpp
@@ -19,7 +19,7 @@
 
 #include <tdeaction.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqcstring.h>
@@ -31,12 +31,12 @@
 #include <tqtextcodec.h>
 #include <tqpainter.h>
 #include <kprinter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <tqcheckbox.h>
 #include <kurlrequester.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/renamedlg.h>
 #include <kedittoolbar.h>
diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp
index 965a9d9..637198b 100644
--- a/kgpg/kgpginterface.cpp
+++ b/kgpg/kgpginterface.cpp
@@ -27,8 +27,8 @@
 #include <tdeio/netaccess.h>
 #include <tqcheckbox.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 #include <kmdcodec.h>
 #include <klineedit.h>
@@ -43,7 +43,7 @@
 #include <tqfile.h>
 #include <kled.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "kgpginterface.h"
 #include "listkeys.h"
diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp
index 9c408b7..66fbc45 100644
--- a/kgpg/kgpglibrary.cpp
+++ b/kgpg/kgpglibrary.cpp
@@ -18,10 +18,10 @@
 #include <tqhbox.h>
 #include <tqvbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <tqfile.h>
 #include <kpassivepopup.h>
diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp
index 8c6e92d..37533ae 100644
--- a/kgpg/kgpgoptions.cpp
+++ b/kgpg/kgpgoptions.cpp
@@ -25,14 +25,14 @@
 #include <tqfile.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocio.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqpushbutton.h>
 #include <tqfont.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp
index aafa0fb..0c044f7 100644
--- a/kgpg/kgpgview.cpp
+++ b/kgpg/kgpgview.cpp
@@ -26,11 +26,11 @@
 #include <tqregexp.h>
 
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
 #include <kurldrag.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqfile.h>
 #include <tqlayout.h>
 #include <kbuttonbox.h>
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index 7b2b56f..f42e6b7 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -36,7 +36,7 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqtooltip.h>
 #include <tqheader.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <kprocess.h>
 #include <kprocio.h>
@@ -54,7 +54,7 @@
 #include <tdefiledialog.h>
 #include <tdeshortcut.h>
 #include <tdestdaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktip.h>
 #include <krun.h>
 #include <kprinter.h>
@@ -63,10 +63,10 @@
 #include <dcopclient.h>
 #include <klineedit.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addresseedialog.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addresseedialog.h>
 #include <kdesktopfile.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
diff --git a/kgpg/main.cpp b/kgpg/main.cpp
index 77c344c..44f4b7e 100644
--- a/kgpg/main.cpp
+++ b/kgpg/main.cpp
@@ -16,14 +16,14 @@
  ***************************************************************************/
 
 #include <tqstring.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 #include <kuniqueapplication.h>
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kgpg.h"
 
 static const char description[] =
diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp
index 59864f7..7ae2eb3 100644
--- a/kgpg/popuppublic.cpp
+++ b/kgpg/popuppublic.cpp
@@ -32,7 +32,7 @@
 #include <tdelistview.h>
 #include <kprocess.h>
 #include <kprocio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaccel.h>
 #if KDE_IS_VERSION( 3, 2, 90 )
 #include <tdelistviewsearchline.h>