From 4bc3dcd8cbc23e1470e121e25a83d57c22e61b26 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:00:38 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp         | 4 ++--
 kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kaddressbook-plugins')

diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
index cb9e461..a068e4b 100644
--- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
+++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
@@ -32,8 +32,8 @@
 #include <tqfile.h>
 #include <tqmap.h>
 
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>
diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
index 0d0ffbd..48a3901 100644
--- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
+++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-- 
cgit v1.2.1