diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:55:17 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:55:17 -0600 |
commit | 45e371f7ffece317ed9466f032cb0fe9520461f1 (patch) | |
tree | 2f292babc95fbea695a578de46bed15fb2b61fc8 /lib | |
parent | 5e4f00a9911f1b6360a49f869fe10620325beaba (diff) | |
download | kpilot-45e371f7ffece317ed9466f032cb0fe9520461f1.tar.gz kpilot-45e371f7ffece317ed9466f032cb0fe9520461f1.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'lib')
-rw-r--r-- | lib/idmapper.h | 2 | ||||
-rw-r--r-- | lib/kpilotdevicelink.cc | 4 | ||||
-rw-r--r-- | lib/kpilotlink.cc | 4 | ||||
-rw-r--r-- | lib/kpilotlocallink.cc | 4 | ||||
-rw-r--r-- | lib/options.cc | 2 | ||||
-rw-r--r-- | lib/syncAction.cc | 2 |
6 files changed, 9 insertions, 9 deletions
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" |