summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:56:09 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:56:09 -0600
commit5d9cfd6445320359a5695938285767010142df54 (patch)
tree271da9cc59c867fab671ba98ede2943ae1ec1842 /src
parent7db1efb556d99f5c7640f9ca3df0e3aea917e04e (diff)
downloadkvpnc-5d9cfd6445320359a5695938285767010142df54.tar.gz
kvpnc-5d9cfd6445320359a5695938285767010142df54.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/importipsecprofiledialog.cpp4
-rw-r--r--src/importopenvpnprofiledialog.cpp4
-rw-r--r--src/importprofiledialog.cpp4
-rw-r--r--src/kvpnc.cpp14
-rw-r--r--src/kvpncconfig.h2
-rw-r--r--src/mainview.h2
-rw-r--r--src/newprofilewizard.cpp2
7 files changed, 16 insertions, 16 deletions
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>