From 7251ddd58d498d631dc56bc00849f61cb4acdabd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:26:01 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/kvpnc.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/kvpnc.cpp') diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp index c79d956..afd1140 100644 --- a/src/kvpnc.cpp +++ b/src/kvpnc.cpp @@ -357,9 +357,9 @@ KVpnc::~KVpnc() void KVpnc::initAction() { - disconnectedIcon = KGlobal::iconLoader() ->loadIcon ( "disconnected", KIcon::NoGroup, 22 ); - connectedIcon = KGlobal::iconLoader() ->loadIcon ( "connected", KIcon::NoGroup, 22 ); - connectingIcon = KGlobal::iconLoader() ->loadIcon ( "connecting", KIcon::NoGroup, 22 ); + disconnectedIcon = TDEGlobal::iconLoader() ->loadIcon ( "disconnected", KIcon::NoGroup, 22 ); + connectedIcon = TDEGlobal::iconLoader() ->loadIcon ( "connected", KIcon::NoGroup, 22 ); + connectingIcon = TDEGlobal::iconLoader() ->loadIcon ( "connecting", KIcon::NoGroup, 22 ); setIcon ( disconnectedIcon ); ( void* ) KStdAction::quit ( this, TQT_SLOT ( quitCalled() ), actionCollection() ); @@ -537,7 +537,7 @@ void KVpnc::slotSettings() { if ( !GlobalConfig->logfile.isOpen() ) { - KStandardDirs * dirs = KGlobal::dirs(); + KStandardDirs * dirs = TDEGlobal::dirs(); TQString logfileName = TQString ( dirs->saveLocation ( "data" ) ); TQString logfilePath = TQString ( logfileName + "/kvpnc/kvpnc.log" ); //KMessageBox::information( this, "info", logfileName ); @@ -1000,7 +1000,7 @@ void KVpnc::restore() void KVpnc::saveProperties ( KConfig* c ) { - TQString saveDir = KGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); + TQString saveDir = TDEGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); c = new KSimpleConfig ( saveDir + "list", false ); c->setGroup ( "Saved Session" ); @@ -1010,7 +1010,7 @@ void KVpnc::saveProperties ( KConfig* c ) void KVpnc::readProperties ( KConfig* c ) { - TQString saveDir = KGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); + TQString saveDir = TDEGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); c = new KSimpleConfig ( saveDir + "list", true ); c->setGroup ( "Saved Session" ); delete c; @@ -7973,12 +7973,12 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getExecuteCmdBeforeConnect() ) executeCommandBeforeConnect(); - SshProcess = new KProcess; + SshProcess = new TDEProcess; *SshProcess << GlobalConfig->pathToSsh ; // SshProcess->setExecutable(GlobalConfig->pathToSsh); /* - connect(m_process, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotProcessExited(KProcess*)));*/ + connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotProcessExited(TDEProcess*)));*/ // TQString AskPassScript= tmpPath+"ssh."+GlobalConfig->currentProfile->getName()+".askpass.sh"; // @@ -8144,8 +8144,8 @@ void KVpnc::connectClicked() } - connect ( SshProcess, TQT_SIGNAL ( receivedStdout ( KProcess *, char *, int ) ), this, TQT_SLOT ( readFromStdout_ssh ( KProcess *, char *, int ) ) ); - connect ( SshProcess, TQT_SIGNAL ( receivedStderr ( KProcess *, char *, int ) ), this, TQT_SLOT ( readFromStderr_ssh ( KProcess *, char *, int ) ) ); + connect ( SshProcess, TQT_SIGNAL ( receivedStdout ( TDEProcess *, char *, int ) ), this, TQT_SLOT ( readFromStdout_ssh ( TDEProcess *, char *, int ) ) ); + connect ( SshProcess, TQT_SIGNAL ( receivedStderr ( TDEProcess *, char *, int ) ), this, TQT_SLOT ( readFromStderr_ssh ( TDEProcess *, char *, int ) ) ); // connect( SshProcess, TQT_SIGNAL( processExited() ), this, TQT_SLOT( sshExited() ) ); GlobalConfig->appendLogEntry ( i18n ( "Trying to connect to server \"%1\" with ...\n" ).arg ( GlobalConfig->currentProfile->getGateway() ) ,GlobalConfig->info ); @@ -8179,11 +8179,11 @@ void KVpnc::connectClicked() return; } -// SshProcess->setUsePty(KProcess::All ,true); +// SshProcess->setUsePty(TDEProcess::All ,true); -// if ( !SshProcess->start(KProcess::NotifyOnExit,KProcess::Communication(KProcess::All))) -// if ( !SshProcess->start(KProcess::RunMode(KProcess::NotifyOnExit),KProcess::Communication(KProcess::All))) - if ( !SshProcess->start ( KProcess::NotifyOnExit, KProcess::All ) ) +// if ( !SshProcess->start(TDEProcess::NotifyOnExit,TDEProcess::Communication(TDEProcess::All))) +// if ( !SshProcess->start(TDEProcess::RunMode(TDEProcess::NotifyOnExit),TDEProcess::Communication(TDEProcess::All))) + if ( !SshProcess->start ( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( "ssh" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "ssh" ) , GlobalConfig->error ); @@ -11370,7 +11370,7 @@ void KVpnc::vpnTypesInfoClicked() { this->slotStatusMsg ( i18n ( "Calling KVpnc website..." ), ID_FLASH_MSG ); TQString donateurl = "http://home.gna.org/kvpnc/en/donate.html"; - TQString browser = TQString ( KConfigGroup ( KGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" ); + TQString browser = TQString ( KConfigGroup ( TDEGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" ); if ( browser.isEmpty() ) browser = "konqueror"; @@ -11407,7 +11407,7 @@ void KVpnc::vpnTypesInfoClicked() void KVpnc::reportBugClicked() { TQString bugreporturl = "http://bugs.trinitydesktop.org"; - TQString browser = TQString ( KConfigGroup ( KGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" ); + TQString browser = TQString ( KConfigGroup ( TDEGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" ); if ( browser.isEmpty() ) browser = "konqueror"; @@ -17719,7 +17719,7 @@ void KVpnc::readFromStderr_vtun() } } -void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) +void KVpnc::readFromStdout_ssh ( TDEProcess *, char *buffer, int buflen ) { // while ( SshProcess->canReadLineStdout() ) // { @@ -18133,7 +18133,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) } } -void KVpnc::readFromStderr_ssh ( KProcess *, char *buffer, int buflen ) +void KVpnc::readFromStderr_ssh ( TDEProcess *, char *buffer, int buflen ) { // while ( SshProcess->canReadLineStderr() ) // { @@ -22918,7 +22918,7 @@ void KVpnc::saveGuiOptions() void KVpnc::startConnectionStatusCheck() { - KStandardDirs * dirs = KGlobal::dirs(); + KStandardDirs * dirs = TDEGlobal::dirs(); TQString PingCheckScript = TQString ( dirs->findResource ( "data", "kvpnc/ping_check.sh" ) ); //GlobalConfig->appendLogEntry( TQString("PingCheckScript : " +PingCheckScript), GlobalConfig->debug); ConnectionStatusCheckProcess = new TQProcess ( this ); -- cgit v1.2.1