diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:15:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:15:27 -0600 |
| commit | fed45b4784b8549ff469d60b89905cc02a0d33e0 (patch) | |
| tree | 527ecf1ec909a082a00c67b67e1075db134f5061 /src/kvpnc.cpp | |
| parent | f82b690456f092331869310752a6938260ffbfcd (diff) | |
| download | kvpnc-fed45b4784b8549ff469d60b89905cc02a0d33e0.tar.gz kvpnc-fed45b4784b8549ff469d60b89905cc02a0d33e0.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/kvpnc.cpp')
| -rw-r--r-- | src/kvpnc.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp index 0138598..8c34bd4 100644 --- a/src/kvpnc.cpp +++ b/src/kvpnc.cpp @@ -77,13 +77,13 @@ #include <kmessagebox.h> #include <tdeio/netaccess.h> #include <ktempfile.h> -#include <klistview.h> +#include <tdelistview.h> #include <kglobal.h> #include <kstandarddirs.h> #include <knuminput.h> #include <tdewallet.h> #include <kinputdialog.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <tdefiledialog.h> #include "kvpnc.h" @@ -13992,7 +13992,7 @@ void KVpnc::readFromStderr_ipsecwhack() } } -void KVpnc::readFromStdout_ipsecwhacklisten() +void KVpnc::readFromStdout_ipsecwhactdelisten() { if ( IpsecWhackListenProcess == 0 || IpsecGotError ) return; @@ -14142,7 +14142,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten() } } -void KVpnc::readFromStderr_ipsecwhacklisten() +void KVpnc::readFromStderr_ipsecwhactdelisten() { bool abort = false; if ( IpsecWhackListenProcess ==0 || IpsecGotError ) @@ -14168,8 +14168,8 @@ void KVpnc::readFromStderr_ipsecwhacklisten() else { // we have to give some time to sleep and try again... - connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) ); - connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) ); + connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) ); + connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) ); IpsecWhackListenProcess->tryTerminate(); sleep ( 2 ); if ( IpsecWhackListenProcess->isRunning() ) @@ -21416,13 +21416,13 @@ void KVpnc::ipsecStarted() IpsecWhackListenProcess->addArgument ( "whack" ); IpsecWhackListenProcess->addArgument ( "--listen" ); - connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) ); - connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) ); + connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) ); + connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) ); if ( !IpsecWhackListenProcess->start ( env ) ) { - disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) ); - disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) ); + disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) ); + disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) ); delete IpsecWhackListenProcess; IpsecWhackListenProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --listen" ) ); |