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

---
 lib/idmapper.h          | 2 +-
 lib/kpilotdevicelink.cc | 4 ++--
 lib/kpilotlink.cc       | 4 ++--
 lib/kpilotlocallink.cc  | 4 ++--
 lib/options.cc          | 2 +-
 lib/syncAction.cc       | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/idmapper.h b/lib/idmapper.h
index b2ff0ef..8344fe2 100644
--- a/lib/idmapper.h
+++ b/lib/idmapper.h
@@ -31,7 +31,7 @@
 
 #include "pi-macros.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class IDMapperPrivate;
 
diff --git a/lib/kpilotdevicelink.cc b/lib/kpilotdevicelink.cc
index 84e26da..bd751c2 100644
--- a/lib/kpilotdevicelink.cc
+++ b/lib/kpilotdevicelink.cc
@@ -51,11 +51,11 @@
 #include <tqthread.h>
 #include <tqsocketnotifier.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "pilotUser.h"
 #include "pilotSysInfo.h"
diff --git a/lib/kpilotlink.cc b/lib/kpilotlink.cc
index 42e78ed..098b688 100644
--- a/lib/kpilotlink.cc
+++ b/lib/kpilotlink.cc
@@ -52,11 +52,11 @@
 #include <tqdatetime.h>
 #include <tqthread.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "pilotUser.h"
 #include "pilotSysInfo.h"
diff --git a/lib/kpilotlocallink.cc b/lib/kpilotlocallink.cc
index 5f93a47..cf301c7 100644
--- a/lib/kpilotlocallink.cc
+++ b/lib/kpilotlocallink.cc
@@ -52,11 +52,11 @@
 #include <tqdatetime.h>
 #include <tqthread.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "pilotSerialDatabase.h"
 #include "pilotLocalDatabase.h"
diff --git a/lib/options.cc b/lib/options.cc
index 84474c6..ad755c9 100644
--- a/lib/options.cc
+++ b/lib/options.cc
@@ -35,7 +35,7 @@
 
 #include <tqsize.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
 
diff --git a/lib/syncAction.cc b/lib/syncAction.cc
index 444226e..2ca7361 100644
--- a/lib/syncAction.cc
+++ b/lib/syncAction.cc
@@ -49,7 +49,7 @@
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 
 #include "syncAction.moc"
-- 
cgit v1.2.1