From 5d9cfd6445320359a5695938285767010142df54 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:56:09 -0600
Subject: [PATCH] Rename a number of libraries and executables to avoid
 conflicts with KDE4

---
 acinclude.m4                       |  8 ++++----
 src/importipsecprofiledialog.cpp   |  4 ++--
 src/importopenvpnprofiledialog.cpp |  4 ++--
 src/importprofiledialog.cpp        |  4 ++--
 src/kvpnc.cpp                      | 14 +++++++-------
 src/kvpncconfig.h                  |  2 +-
 src/mainview.h                     |  2 +-
 src/newprofilewizard.cpp           |  2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 9bf2deb..4ae0030 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/src/importipsecprofiledialog.cpp b/src/importipsecprofiledialog.cpp
index 2809a59..d762d3f 100644
--- a/src/importipsecprofiledialog.cpp
+++ b/src/importipsecprofiledialog.cpp
@@ -23,10 +23,10 @@
 ***************************************************************************/
 //BEGIN INCLUDES
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
diff --git a/src/importopenvpnprofiledialog.cpp b/src/importopenvpnprofiledialog.cpp
index 04bcefa..d4264ba 100644
--- a/src/importopenvpnprofiledialog.cpp
+++ b/src/importopenvpnprofiledialog.cpp
@@ -23,10 +23,10 @@
 ***************************************************************************/
 //BEGIN INCLUDES
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
diff --git a/src/importprofiledialog.cpp b/src/importprofiledialog.cpp
index 2a885b7..82a5f89 100644
--- a/src/importprofiledialog.cpp
+++ b/src/importprofiledialog.cpp
@@ -19,10 +19,10 @@
 ***************************************************************************/
 //BEGIN INCLUDES
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index 4524d26..f109d0a 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -75,7 +75,7 @@
 #include <kstddirs.h>
 #include <klineeditdlg.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 #include <klistview.h>
 #include <kglobal.h>
@@ -84,7 +84,7 @@
 #include <tdewallet.h>
 #include <kinputdialog.h>
 #include <kactioncollection.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "kvpnc.h"
 #include "mainview.h"
@@ -5145,16 +5145,16 @@ void KVpnc::connectClicked()
 				if ( GlobalConfig->currentProfile->getAuthType() == VpnAccountData::psk )
 				{
 					// write psk.<profile>.key
-					TQFile Pskfile ( tmpPath + "psk." + ProfileName + ".key" );
-					stream.setDevice ( &Pskfile );
-					if ( Pskfile.open ( IO_WriteOnly ) )
+					TQFile Pstdefile ( tmpPath + "psk." + ProfileName + ".key" );
+					stream.setDevice ( &Pstdefile );
+					if ( Pstdefile.open ( IO_WriteOnly ) )
 					{
 						stream << GlobalConfig->currentProfile->getPreSharedKey() << "\n";
-						Pskfile.close();
+						Pstdefile.close();
 					}
 					else
 					{
-						GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( Pskfile.name() ),GlobalConfig->error );
+						GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( Pstdefile.name() ),GlobalConfig->error );
 					}
 
 					stream.unsetDevice();
diff --git a/src/kvpncconfig.h b/src/kvpncconfig.h
index 3d52d9d..a2c2c00 100644
--- a/src/kvpncconfig.h
+++ b/src/kvpncconfig.h
@@ -33,7 +33,7 @@
 #include <tqtextedit.h>
 #include <tqcolor.h>
 #include <tqstringlist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdewallet.h>
 #include <kstatusbar.h>
 
diff --git a/src/mainview.h b/src/mainview.h
index 4a4c0b4..e8bf453 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 #include <kprocess.h>
 #include <tqprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "mainviewbase.h"
 #include "kvpnckicker.h"
 #include "debugoutputtextedit.h"
diff --git a/src/newprofilewizard.cpp b/src/newprofilewizard.cpp
index 69fec28..3086137 100644
--- a/src/newprofilewizard.cpp
+++ b/src/newprofilewizard.cpp
@@ -33,7 +33,7 @@
 #include <kurlrequester.h>
 #include <knuminput.h>
 #include <kpassdlg.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqspinbox.h>
 #include <tqcursor.h>
 #include <tqbuttongroup.h>