summaryrefslogtreecommitdiffstats
path: root/src/kvpnc.cpp
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/kvpnc.cpp
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/kvpnc.cpp')
-rw-r--r--src/kvpnc.cpp14
1 files changed, 7 insertions, 7 deletions
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();