Rename old tq methods that no longer need a unique name

1 files changed, 224 insertions, 224 deletions

diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index 23c24e4..26eef17 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -179,7 +179,7 @@ KVpnc::KVpnc ( KApplication *parent, TQWidget*, const char *name ) : KMainWindow
 		TQTextStream stream ( &file );
 		if ( file.open ( IO_WriteOnly ) )
 		{
-			stream << "created at: " << TQDate().tqcurrentDate().toString ( "yyyyMMdd" ) << TQTime().currentTime().toString ( "hhmm" ) << "\n";
+			stream << "created at: " << TQDate().currentDate().toString ( "yyyyMMdd" ) << TQTime().currentTime().toString ( "hhmm" ) << "\n";
 			file.close();
 		}
 		else
@@ -215,7 +215,7 @@ KVpnc::KVpnc ( KApplication *parent, TQWidget*, const char *name ) : KMainWindow
 	{
 		mw->DebugOutput->hide();
 		// 		setMinimumSize(0,0);
-		// 		this->resize( tqminimumSizeHint() );
+		// 		this->resize( minimumSizeHint() );
 	}
 	DebugconsoleAction ->setChecked ( GlobalConfig->showDebugConsole );
 	GlobalConfig->LogOutput->setPaper ( TQBrush ( TQColor ( GlobalConfig->DebugBackgroundcolor ) ) );
@@ -524,13 +524,13 @@ void KVpnc::slotSettings()
 	if ( GlobalConfig->showDebugConsole )
 	{
 		mw->DebugOutput->show();
-		//resize( tqminimumSizeHint() );
+		//resize( minimumSizeHint() );
 	}
 	else
 	{
 		mw->DebugOutput->hide();
 		setMinimumSize ( 0, 0 );
-		this->resize ( tqminimumSizeHint() );
+		this->resize ( minimumSizeHint() );
 	}
 
 	if ( GlobalConfig->writeLogFile )
@@ -549,7 +549,7 @@ void KVpnc::slotSettings()
 			}
 			else
 			{
-				GlobalConfig->logFileStream << i18n ( "Log session started at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+				GlobalConfig->logFileStream << i18n ( "Log session started at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
 			}
 		}
 	}
@@ -558,7 +558,7 @@ void KVpnc::slotSettings()
 		if ( GlobalConfig->logfile.isOpen() )
 		{
 			//TQTextStream s( &logfile );
-			GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+			GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
 			GlobalConfig->logfile.close();
 		}
 	}
@@ -686,7 +686,7 @@ void KVpnc:: quitCalled()
 					if ( GlobalConfig->logfile.isOpen() )
 					{
 						//						TQTextStream s( &logfile );
-						GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+						GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
 						GlobalConfig->logfile.flush();
 						GlobalConfig->logfile.close();
 						GlobalConfig->appPointer->processEvents();
@@ -713,7 +713,7 @@ void KVpnc:: quitCalled()
 				if ( GlobalConfig->logfile.isOpen() )
 				{
 					//						TQTextStream s( &logfile );
-					GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+					GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
 					GlobalConfig->logfile.flush();
 					GlobalConfig->logfile.close();
 					GlobalConfig->appPointer->processEvents();
@@ -740,7 +740,7 @@ void KVpnc:: quitCalled()
 			if ( GlobalConfig->logfile.isOpen() )
 			{
 				//						TQTextStream s( &logfile );
-				GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+				GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
 				GlobalConfig->logfile.flush();
 				GlobalConfig->logfile.close();
 				GlobalConfig->appPointer->processEvents();
@@ -769,7 +769,7 @@ void KVpnc:: quitCalled()
 				if ( GlobalConfig->logfile.isOpen() )
 				{
 					//					TQTextStream s( &logfile );
-					GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+					GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
 					GlobalConfig->logfile.flush();
 					GlobalConfig->logfile.close();
 					GlobalConfig->appPointer->processEvents();
@@ -868,7 +868,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e )
 								if ( GlobalConfig->logfile.isOpen() )
 								{
 									//								TQTextStream s( &logfile );
-									GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+									GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
 									GlobalConfig->logfile.close();
 									GlobalConfig->appPointer->processEvents();
 								}
@@ -918,7 +918,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e )
 			{
 				if ( GlobalConfig->logfile.isOpen() )
 				{
-					GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::tqcurrentDateTime().toString ( Qt::TextDate ) << endl;
+					GlobalConfig->logFileStream << i18n ( "Log session ended at: " ) << TQDateTime::currentDateTime().toString ( Qt::TextDate ) << endl;
 					GlobalConfig->logfile.flush();
 					GlobalConfig->logfile.close();
 					GlobalConfig->appPointer->processEvents();
@@ -1075,7 +1075,7 @@ void KVpnc::connectClicked()
 		KMessageBox::error ( this, i18n ( "No gateway for profile \"%1\" entered. STOP." ).arg ( GlobalConfig->currentProfile->getName() ) );
 		GlobalConfig->appendLogEntry ( i18n ( "No gateway for profile \"%1\" entered. STOP." ).arg ( GlobalConfig->currentProfile->getName() ), GlobalConfig->error );
 		ok = false;
-		setGuitqStatus ( disconnected );
+		setGuiStatus ( disconnected );
 		return ;
 	}
 
@@ -1095,7 +1095,7 @@ void KVpnc::connectClicked()
 	if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco )
 	{
 
-		//setGuitqStatus(connecting);
+		//setGuiStatus(connecting);
 
 		// looking for vpnc
 		if ( Utils ( GlobalConfig ).getToolInfo ( "vpnc" )->found == false )
@@ -1103,7 +1103,7 @@ void KVpnc::connectClicked()
 			KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vpnc" ).arg ( GlobalConfig->pathToVpnc ) );
 			GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vpnc" ).arg ( GlobalConfig->pathToVpnc ), GlobalConfig->error );
 			ok = false;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 
@@ -1354,7 +1354,7 @@ void KVpnc::connectClicked()
 					AuthRetry = false;
 					if ( GlobalConfig->KvpncDebugLevel > 0 )
 						GlobalConfig->appendLogEntry ( i18n ( "Connect canceled because account data dialog aborted." ), GlobalConfig->debug );
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 					return;
 				}
 			}
@@ -1905,7 +1905,7 @@ void KVpnc::connectClicked()
 			else
 			{
 				GlobalConfig->appendLogEntry ( i18n ( "Creating %1 has been failed." ).arg ( TQString ( "VpncScript" ) ), GlobalConfig->error );
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				timer.stop();
 				return ;
 			}
@@ -1927,7 +1927,7 @@ void KVpnc::connectClicked()
 							KMessageBox::error ( this, i18n ( "Creating of \"%1\" has been failed!" ).arg ( "/dev/net/tun" ) );
 							GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, creating has been failed: stop." ), GlobalConfig->error );
 							disconnectClicked();
-							setGuitqStatus ( disconnected );
+							setGuiStatus ( disconnected );
 							GlobalConfig->status = GlobalConfig->disconnected;
 							return ;
 						}
@@ -1974,7 +1974,7 @@ void KVpnc::connectClicked()
 							KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "tun" ) );
 							GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "tun" ), GlobalConfig->error );
 							disconnectClicked();
-							setGuitqStatus ( disconnected );
+							setGuiStatus ( disconnected );
 							GlobalConfig->status = GlobalConfig->disconnected;
 							return ;
 						}
@@ -2059,7 +2059,7 @@ void KVpnc::connectClicked()
 						KMessageBox::information ( this, i18n ( "Write of \"%1\" has been failed!" ).arg ( VpncConfigFile ) );
 						GlobalConfig->appendLogEntry ( i18n ( "Write of \"%1\" has been failed!" ).arg ( VpncConfigFile ), GlobalConfig->error );
 						disconnectClicked();
-						setGuitqStatus ( disconnected );
+						setGuiStatus ( disconnected );
 						GlobalConfig->status = GlobalConfig->disconnected;
 						return ;
 					}
@@ -2324,7 +2324,7 @@ void KVpnc::connectClicked()
 					KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( "vpnc" ) );
 					GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "vpnc" ), GlobalConfig->error );
 					disconnectClicked();
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 				}
 				else
 				{
@@ -2368,7 +2368,7 @@ void KVpnc::connectClicked()
 			{
 				VpncScript = tmpPath + "vpnc-script." + GlobalConfig->currentProfile->getName(); // vpnc-script.<name>
 				GlobalConfig->appendLogEntry ( i18n ( "Making %1 (%2) excutable failed!" ).arg ( "VpncScript" ).arg ( VpncScript ), GlobalConfig->error );
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				timer.stop();
 				return ;
 			}
@@ -2383,7 +2383,7 @@ void KVpnc::connectClicked()
 			KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vpnclient" ).arg ( GlobalConfig->pathToCiscoVpnc ) );
 			GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vpnclient" ).arg ( GlobalConfig->pathToCiscoVpnc ), GlobalConfig->error );
 			ok = false;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 
@@ -2391,10 +2391,10 @@ void KVpnc::connectClicked()
 			GlobalConfig->appendLogEntry ( i18n ( "vpnclient: %1" ) .arg ( GlobalConfig->pathToCiscoVpnc ), GlobalConfig->debug );
 
 
-		if ( checkCiscoVpnctqStatus() == false )
+		if ( checkCiscoVpncStatus() == false )
 		{
 			startCiscoVpnc();
-			if ( checkCiscoVpnctqStatus() == false )
+			if ( checkCiscoVpncStatus() == false )
 			{
 				KMessageBox::error ( this, i18n ( "The Cisco ipsec interface could not setup!" ) );
 				GlobalConfig->appendLogEntry ( i18n ( "The Cisco ipsec interface could not setup!" ), GlobalConfig->error );
@@ -2602,7 +2602,7 @@ void KVpnc::connectClicked()
 					AuthRetry = false;
 					if ( GlobalConfig->KvpncDebugLevel > 0 )
 						GlobalConfig->appendLogEntry ( i18n ( "Connect canceled because account data dialog aborted." ), GlobalConfig->debug );
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 					return;
 				}
 				GlobalConfig->TmpPassword= GlobalConfig->currentProfile->getUserPassword();
@@ -2836,7 +2836,7 @@ void KVpnc::connectClicked()
 					KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( "vpnclient" ) );
 					GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "vpnclient" ), GlobalConfig->error );
 					disconnectClicked();
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 				}
 				else
 				{
@@ -2862,14 +2862,14 @@ void KVpnc::connectClicked()
 			{
 				// file could not written
 				GlobalConfig->appendLogEntry ( i18n ( "Connect canceled because profile file could not be written." ), GlobalConfig->error );
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				return ;
 			}
 		}
 		else
 		{
 			// ok is false
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 	}
@@ -2881,7 +2881,7 @@ void KVpnc::connectClicked()
 		if ( GlobalConfig->KvpncDebugLevel > 1 )
 			GlobalConfig->appendLogEntry ( i18n ( "racoon" ), GlobalConfig->debug );
 
-		//setGuitqStatus(connecting);
+		//setGuiStatus(connecting);
 		// looking for racoon
 		if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon )
 		{
@@ -2890,7 +2890,7 @@ void KVpnc::connectClicked()
 				KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "racoon" ).arg ( GlobalConfig->pathToRacoon ) );
 				GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "racoon" ).arg ( GlobalConfig->pathToRacoon ), GlobalConfig->error );
 				ok = false;
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				return ;
 			}
 		}
@@ -2902,7 +2902,7 @@ void KVpnc::connectClicked()
 				KMessageBox::error ( this, i18n ( "Unable to find \"%1\" or \"%2\"!" ).arg ( "l2tpd" ).arg ( "xl2tpd" ) );
 				GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" or \"%2\"!" ).arg ( "l2tpd" ).arg ( "xl2tpd" ), GlobalConfig->error );
 				ok = false;
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				return ;
 			}
 		}
@@ -2917,7 +2917,7 @@ void KVpnc::connectClicked()
 			KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "setkey" ).arg ( GlobalConfig->pathToSetkey ) );
 			GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "setkey" ).arg ( GlobalConfig->pathToSetkey ), GlobalConfig->error );
 			ok = false;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 
@@ -2927,7 +2927,7 @@ void KVpnc::connectClicked()
 			KMessageBox::error ( this, i18n ( "Host \"%1\" could not be resolved!" ).arg ( GlobalConfig->currentProfile->getGateway() ) );
 			GlobalConfig->appendLogEntry ( i18n ( "Host \"%1\" could not be resolved!" ).arg ( GlobalConfig->currentProfile->getGateway() ), GlobalConfig->error ) ;
 			ok = false;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return;
 		}
 		else
@@ -3786,7 +3786,7 @@ void KVpnc::connectClicked()
 			else
 			{
 				GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( file.name() ), GlobalConfig->error );
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				return;
 			}
 
@@ -3835,7 +3835,7 @@ void KVpnc::connectClicked()
 			else
 			{
 				GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( file1.name() ), GlobalConfig->error );
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				return;
 			}
 
@@ -3942,7 +3942,7 @@ void KVpnc::connectClicked()
 			else
 			{
 				GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( upfile.name() ), GlobalConfig->error );
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				return;
 			}
 
@@ -3995,7 +3995,7 @@ void KVpnc::connectClicked()
 			else
 			{
 				GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( downfile.name() ), GlobalConfig->error );
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				return;
 			}
 
@@ -4031,7 +4031,7 @@ void KVpnc::connectClicked()
 
 			// 			if (GlobalConfig->currentProfile->useVirtualIP()){
 			// 				if (!setVirtualIP()){
-			// 					setGuitqStatus(disconnected);
+			// 					setGuiStatus(disconnected);
 			// 					return;
 			// 				}
 			//
@@ -4069,7 +4069,7 @@ void KVpnc::connectClicked()
 				if ( GlobalConfig->KvpncDebugLevel > 0 )
 					GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "setkey" ), GlobalConfig->error );
 				KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "setkey." + GlobalConfig->currentProfile->getName() + ".sh" ) );
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 			}
 			else
 			{
@@ -4106,7 +4106,7 @@ void KVpnc::connectClicked()
 			return;
 		}
 
-		//setGuitqStatus(connecting);
+		//setGuiStatus(connecting);
 
 		// looking for ipsec
 
@@ -4115,7 +4115,7 @@ void KVpnc::connectClicked()
 			KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "ipsec (" + IpsecType + ")" ).arg ( GlobalConfig->pathToIpsec ) );
 			GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "ipsec (" + IpsecType + ")" ).arg ( GlobalConfig->pathToIpsec ), GlobalConfig->error );
 			ok = false;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 		if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan )
@@ -4125,7 +4125,7 @@ void KVpnc::connectClicked()
 				KMessageBox::error ( this, i18n ( "Unable to find \"%1\" or \"%2\"!" ).arg ( "l2tpd" ).arg ( "xl2tpd" ) );
 				GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" or \"%2\"!" ).arg ( "l2tpd" ).arg ( "xl2tpd" ), GlobalConfig->error );
 				ok = false;
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				return ;
 			}
 		}
@@ -5050,7 +5050,7 @@ void KVpnc::connectClicked()
 				else
 				{
 					GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecConfigFile.name() ),GlobalConfig->error );
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 					return;
 				}
 
@@ -5101,7 +5101,7 @@ void KVpnc::connectClicked()
 				else
 				{
 					GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".add_ipsec_freeswan.sh" ),GlobalConfig->error );
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 					return;
 				}
 				stream.unsetDevice();
@@ -5138,7 +5138,7 @@ void KVpnc::connectClicked()
 				else
 				{
 					GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ),GlobalConfig->error );
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 					return;
 				}
 
@@ -5167,7 +5167,7 @@ void KVpnc::connectClicked()
 
 				// 			if (GlobalConfig->currentProfile->useVirtualIP()){
 				// 				if (!setVirtualIP()){
-				// 					setGuitqStatus(disconnected);
+				// 					setGuiStatus(disconnected);
 				// 					return;
 				// 				}
 				// 			}
@@ -5227,7 +5227,7 @@ void KVpnc::connectClicked()
 					delete IpsecStartProcess;
 					IpsecStartProcess = 0L;
 					disconnectClicked();
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 				}
 				else
 				{
@@ -5285,20 +5285,20 @@ void KVpnc::connectClicked()
 			else
 			{
 				GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecSecretsFile.name() ),GlobalConfig->error );
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				return;
 			}
 
 		}
 		else
 		{
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 		}
 	} // freeswan
 	/* ============ pptp ================ */
 	else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp )
 	{
-		//setGuitqStatus(connecting);
+		//setGuiStatus(connecting);
 
 		// looking for pppd
 		if ( Utils ( GlobalConfig ).getToolInfo ( "pppd" )->found == false )
@@ -5306,7 +5306,7 @@ void KVpnc::connectClicked()
 			KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "pppd" ).arg ( GlobalConfig->pathToPppd ) );
 			GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "pppd" ).arg ( GlobalConfig->pathToPppd ), GlobalConfig->error );
 			ok = false;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 		if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -5368,7 +5368,7 @@ void KVpnc::connectClicked()
 				KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "ip_gre" ) );
 				GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "ip_gre" ), GlobalConfig->error );
 				disconnectClicked();
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				GlobalConfig->status = GlobalConfig->disconnected;
 				return ;
 			}
@@ -5384,7 +5384,7 @@ void KVpnc::connectClicked()
 		// 		{
 		// 			GlobalConfig->appendLogEntry( i18n( "Remote network is missing, please fill in in profile dialog." ), GlobalConfig->error );
 		// 			ok = false;
-		// 			setGuitqStatus(disconnected);
+		// 			setGuiStatus(disconnected);
 		// 			return;
 		// 		}
 
@@ -6108,7 +6108,7 @@ void KVpnc::connectClicked()
 					if ( !Utils ( GlobalConfig, parent ).loadKernelModule ( "ppp_mppe", parent ) )
 					{
 						GlobalConfig->appendLogEntry ( i18n ( "Loading module \"%1\" and \"%2\" has been failed: stop." ).arg ( "ppp-compress-18" ).arg ( "ppp_mppe" ), GlobalConfig->error );
-						setGuitqStatus ( disconnected );
+						setGuiStatus ( disconnected );
 						disconnectClicked();
 						load_module_ok=false;
 					}
@@ -6155,7 +6155,7 @@ void KVpnc::connectClicked()
 					disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_pptp() ) );
 					disconnect ( PptpProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_pptp() ) );
 					disconnectClicked();
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 				}
 				else
 				{
@@ -6183,7 +6183,7 @@ void KVpnc::connectClicked()
 		{
 			if (AuthRetry)
 				disconnectClicked();
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 	} // pptp
@@ -6191,7 +6191,7 @@ void KVpnc::connectClicked()
 	/* ============ openvpn ================ */
 	else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn )
 	{
-		//setGuitqStatus(connecting);
+		//setGuiStatus(connecting);
 		tmpPath = locateLocal ( "data", "kvpnc/" );
 		TQString OpenvpnSecrectPath = tmpPath + "openvpn." + GlobalConfig->currentProfile->getName() + ".secret";
 
@@ -6201,7 +6201,7 @@ void KVpnc::connectClicked()
 			KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "openvpn" ).arg ( GlobalConfig->pathToOpenvpn ) );
 			GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "openvpn" ).arg ( GlobalConfig->pathToOpenvpn ), GlobalConfig->error );
 			ok = false;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 
@@ -6222,7 +6222,7 @@ void KVpnc::connectClicked()
 					// 						KMessageBox::error( this, i18n( "Unable to find \"%1\" at \"%2\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool) );
 					// 						GlobalConfig->appendLogEntry( i18n( "Unable to find \"%1\" at \"%2\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool ), GlobalConfig->error );
 					// 						ok = false;
-					// 						setGuitqStatus( disconnected );
+					// 						setGuiStatus( disconnected );
 					// 						return ;
 					// 					}
 
@@ -6231,7 +6231,7 @@ void KVpnc::connectClicked()
 						KMessageBox::error ( this, i18n ( "Pkcs11 slot cant be empty!" ) );
 						GlobalConfig->appendLogEntry ( i18n ( "Pkcs11 slot cant be empty!" ), GlobalConfig->error );
 						ok = false;
-						setGuitqStatus ( disconnected );
+						setGuiStatus ( disconnected );
 						return ;
 					}
 					if ( GlobalConfig->currentProfile->getPkcs11Id().isEmpty() )
@@ -6239,7 +6239,7 @@ void KVpnc::connectClicked()
 						KMessageBox::error ( this, i18n ( "Pkcs11 id cant be empty!" ) );
 						GlobalConfig->appendLogEntry ( i18n ( "Pkcs11 id cant be empty!" ), GlobalConfig->error );
 						ok = false;
-						setGuitqStatus ( disconnected );
+						setGuiStatus ( disconnected );
 						return ;
 					}
 					if ( GlobalConfig->currentProfile->getUsePkcs11Providers() && GlobalConfig->currentProfile->getPkcs11Providers().isEmpty() )
@@ -6247,7 +6247,7 @@ void KVpnc::connectClicked()
 						KMessageBox::error ( this, i18n ( "Pkcs11 providers cant be empty!" ) );
 						GlobalConfig->appendLogEntry ( i18n ( "Pkcs11 providers cant be empty!" ), GlobalConfig->error );
 						ok = false;
-						setGuitqStatus ( disconnected );
+						setGuiStatus ( disconnected );
 						return ;
 					}
 				}
@@ -6263,7 +6263,7 @@ void KVpnc::connectClicked()
 							//					KMessageBox::error( 0, i18n( "Certificate file (%1) could not be found. Please check the path of it." ).tqarg( GlobalConfig->currentProfile->getX509Certificate() ), i18n( "File Not Found" ) );
 							//					GlobalConfig->appendLogEntry( i18n( "Certificate file (%1) could not be found. Please check the path of it." ).tqarg( GlobalConfig->currentProfile->getX509Certificate() ), GlobalConfig->error );
 							//					ok = false;
-							//					setGuitqStatus( disconnected );
+							//					setGuiStatus( disconnected );
 							//					return ;
 						}
 						else
@@ -6274,7 +6274,7 @@ void KVpnc::connectClicked()
 								KMessageBox::error ( 0, i18n ( "Private key file (%1) could not be found. Please check the path of it." ).arg ( GlobalConfig->currentProfile->getPrivateKey() ), i18n ( "File Not Found" ) );
 								GlobalConfig->appendLogEntry ( i18n ( "Private key file (%1) could not be found. Please check the path of it." ).arg ( GlobalConfig->currentProfile->getPrivateKey() ) , GlobalConfig->error );
 								ok = false;
-								setGuitqStatus ( disconnected );
+								setGuiStatus ( disconnected );
 								return ;
 							}
 						}
@@ -6286,7 +6286,7 @@ void KVpnc::connectClicked()
 						KMessageBox::error ( 0, i18n ( "CA certificate file (%1) could not be found. Please check the path of it." ).arg ( GlobalConfig->currentProfile->getCaCertificate() ), i18n ( "File Not Found" ) );
 						GlobalConfig->appendLogEntry ( i18n ( "CA certificate file (%1) could not be found. Please check the path of it." ).arg ( GlobalConfig->currentProfile->getCaCertificate() ) , GlobalConfig->error );
 						ok = false;
-						setGuitqStatus ( disconnected );
+						setGuiStatus ( disconnected );
 						return ;
 					}
 				}
@@ -6323,7 +6323,7 @@ void KVpnc::connectClicked()
 						KMessageBox::error ( this, i18n ( "Creating of \"%1\" has been failed!" ).arg ( "/dev/net/tun" ) );
 						GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, creating has been failed: stop." ), GlobalConfig->error );
 						disconnectClicked();
-						setGuitqStatus ( disconnected );
+						setGuiStatus ( disconnected );
 						GlobalConfig->status = GlobalConfig->disconnected;
 						return ;
 					}
@@ -6342,7 +6342,7 @@ void KVpnc::connectClicked()
 					KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "tun" ) );
 					GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "tun" ), GlobalConfig->error );
 					disconnectClicked();
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 					GlobalConfig->status = GlobalConfig->disconnected;
 					return ;
 				}
@@ -7366,7 +7366,7 @@ void KVpnc::connectClicked()
 					// 						GlobalConfig->appendLogEntry( i18n( "Could not connect to %1 management handler!" ).tqarg( "openvpn" ) , GlobalConfig->error );
 					// 						if (OpenvpnProcess != 0)
 					// 							OpenvpnProcess->kill();
-					// 						setGuitqStatus(disconnected);
+					// 						setGuiStatus(disconnected);
 					// 						return;
 					// 					}
 
@@ -7385,7 +7385,7 @@ void KVpnc::connectClicked()
 			} // openvpn
 			else
 			{
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				return ;
 			}
 		}
@@ -7394,7 +7394,7 @@ void KVpnc::connectClicked()
 	/* ============ vtun ================ */
 	else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun )
 	{
-		//setGuitqStatus(connecting);
+		//setGuiStatus(connecting);
 		tmpPath = locateLocal ( "data", "kvpnc/" );
 
 		// looking for vtund
@@ -7403,7 +7403,7 @@ void KVpnc::connectClicked()
 			KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vtund" ).arg ( GlobalConfig->pathToVtund ) );
 			GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "vtund" ).arg ( GlobalConfig->pathToVtund ), GlobalConfig->error );
 			ok = false;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 
@@ -7441,7 +7441,7 @@ void KVpnc::connectClicked()
 					KMessageBox::error ( this, i18n ( "Creating of \"%1\" has been failed!" ).arg ( "/dev/net/tun" ) );
 					GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, creating has been failed: stop." ), GlobalConfig->error );
 					disconnectClicked();
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 					GlobalConfig->status = GlobalConfig->disconnected;
 					return ;
 				}
@@ -7459,7 +7459,7 @@ void KVpnc::connectClicked()
 					KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "tun" ) );
 					GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "tun" ), GlobalConfig->error );
 					disconnectClicked();
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 					GlobalConfig->status = GlobalConfig->disconnected;
 					return ;
 				}
@@ -7718,14 +7718,14 @@ void KVpnc::connectClicked()
 		}
 		else
 		{
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 	}
 	/* ============ ssh ================ */
 	else if ( GlobalConfig->currentProfile != 0 && GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh )
 	{
-		//setGuitqStatus(connecting);
+		//setGuiStatus(connecting);
 		tmpPath = locateLocal ( "data", "kvpnc/" );
 
 		// looking for ssh
@@ -7734,7 +7734,7 @@ void KVpnc::connectClicked()
 			KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "ssh" ).arg ( GlobalConfig->pathToSsh ) );
 			GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "ssh" ).arg ( GlobalConfig->pathToSsh ), GlobalConfig->error );
 			ok = false;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 
@@ -7772,7 +7772,7 @@ void KVpnc::connectClicked()
 					KMessageBox::error ( this, i18n ( "Creating of \"%1\" has been failed!" ).arg ( "/dev/net/tun" ) );
 					GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, creating has been failed: stop." ), GlobalConfig->error );
 					disconnectClicked();
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 					GlobalConfig->status = GlobalConfig->disconnected;
 					return ;
 				}
@@ -7790,7 +7790,7 @@ void KVpnc::connectClicked()
 					KMessageBox::information ( this, i18n ( "Loading of module \"%1\" failed!" ).arg ( "tun" ) );
 					GlobalConfig->appendLogEntry ( i18n ( "Tunnel device is missing, loading module \"%1\" has failed: stop." ).arg ( "tun" ), GlobalConfig->error );
 					disconnectClicked();
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 					GlobalConfig->status = GlobalConfig->disconnected;
 					return ;
 				}
@@ -7998,7 +7998,7 @@ void KVpnc::connectClicked()
 // 			else
 // 			{
 // 				GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( askpassfile.name() ), GlobalConfig->error );
-// 				setGuitqStatus ( disconnected );
+// 				setGuiStatus ( disconnected );
 // 				return;
 // 			}
 //
@@ -8206,7 +8206,7 @@ void KVpnc::connectClicked()
 		}
 		else
 		{
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 	}
@@ -8386,7 +8386,7 @@ void KVpnc::disconnectClicked()
 					DisconnectProcess=0L;
 				}
 
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				durationTimer.stop();
 				disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 				connectionEnded();
@@ -8474,7 +8474,7 @@ void KVpnc::disconnectClicked()
 				delete CiscoVpncProcess;
 				CiscoVpncProcess=0L;
 
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 				connectionEnded();
 			}
@@ -8753,7 +8753,7 @@ void KVpnc::disconnectClicked()
 					}
 				}
 
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 				durationTimer.stop();
 				connectionEnded();
@@ -9005,7 +9005,7 @@ void KVpnc::disconnectClicked()
 				delRouteIpsec();
 				removeIptablesFreeswan();
 				disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				durationTimer.stop();
 				GlobalConfig->currentConnectRetry=0;
 				connectionEnded();
@@ -9489,7 +9489,7 @@ void KVpnc::disconnectClicked()
 							GlobalConfig->appendLogEntry ( i18n ( "File %1 could not opened!" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->error );
 						}
 					}
-					setGuitqStatus ( disconnected );
+					setGuiStatus ( disconnected );
 					GlobalConfig->status = GlobalConfig->disconnected;
 					connectCounter = 0;
 					disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
@@ -9713,7 +9713,7 @@ void KVpnc::disconnectClicked()
 		}
 		// 		ConnectingProcess = 0L;
 
-		setGuitqStatus ( disconnected );
+		setGuiStatus ( disconnected );
 
 		if ( GlobalConfig->currentProfile->getExecuteCmdAfterDisconnect() )
 			executeCommandAfterDisconnect();
@@ -9860,7 +9860,7 @@ void KVpnc::disconnectClicked()
 
 
 
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 				timer.stop();
 				connectionEnded();
@@ -10099,7 +10099,7 @@ void KVpnc::disconnectClicked()
 
 // 			delRouteIpsec();
 			removeIptablesFreeswan();
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 
 			GlobalConfig->currentConnectRetry=0;
 
@@ -10945,7 +10945,7 @@ void KVpnc::disconnectClicked()
 					GlobalConfig->appendLogEntry ( i18n ( "File %1 could not opened!" ).arg ( "/etc/ppp/pap-secrets" ), GlobalConfig->error );
 				}
 			}
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			GlobalConfig->status = GlobalConfig->disconnected;
 			connectCounter = 0;
 			connectionEnded();
@@ -11049,7 +11049,7 @@ void KVpnc::disconnectClicked()
 			connectionEnded();
 		}
 		//connectionEnded();
-		setGuitqStatus ( disconnected );
+		setGuiStatus ( disconnected );
 		ConnectingProcess = -1;
 	}
 	else
@@ -11057,7 +11057,7 @@ void KVpnc::disconnectClicked()
 		prevConnectionState = disconnected;
 		if ( GlobalConfig->KvpncDebugLevel > 0 )
 			GlobalConfig->appendLogEntry ( i18n ( "Not connected.\n" ), GlobalConfig->debug );
-		setGuitqStatus ( disconnected );
+		setGuiStatus ( disconnected );
 		ConnectingProcess = -1;
 	}
 
@@ -11594,7 +11594,7 @@ void KVpnc::readOutputFrom_vpnc()
 
 			connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 			durationTimer.start ( 1000, FALSE );
-			setGuitqStatus ( connected );
+			setGuiStatus ( connected );
 			connectSuccess = false;
 
 			NetworkInterface iface ( GlobalConfig, parent );
@@ -11883,7 +11883,7 @@ void KVpnc::readOutputFrom_vpnc()
 			// 				if ( GlobalConfig->KvpncDebugLevel > 0 )
 			// 					GlobalConfig->appendLogEntry( i18n( "Disconnect script started." ), GlobalConfig->debug );
 			// 			}
-			// 			setGuitqStatus(disconnected);
+			// 			setGuiStatus(disconnected);
 			// 			connectionEnded();
 			// 		}
 			//
@@ -12384,7 +12384,7 @@ void KVpnc::readOutputFrom_ciscovpnc()
 
 			connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 			durationTimer.start ( 1000, FALSE );
-			setGuitqStatus ( connected );
+			setGuiStatus ( connected );
 			connectSuccess = false;
 			GlobalConfig->AuthRetryCount=0;
 
@@ -12553,7 +12553,7 @@ void KVpnc::readFromStdout_racoon()
 					disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 					connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 					durationTimer.start ( 1000, FALSE );
-					setGuitqStatus ( connected );
+					setGuiStatus ( connected );
 
 					doIptablesRacoon();
 					addRouteRacoon();
@@ -12993,7 +12993,7 @@ void KVpnc::readFromStderr_racoon()
 					disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 					connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 					durationTimer.start ( 1000, FALSE );
-					setGuitqStatus ( connected );
+					setGuiStatus ( connected );
 
 					doIptablesRacoon();
 					addRouteRacoon();
@@ -13237,7 +13237,7 @@ void KVpnc::readFromStdout_ipsec()
 				GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec" ) , GlobalConfig->debug );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 	}
@@ -13362,7 +13362,7 @@ void KVpnc::readFromStderr_ipsec()
 			GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "l2tpd" ) , GlobalConfig->error );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 	}
@@ -13761,7 +13761,7 @@ void KVpnc::readFromStdout_ipsecwhack()
 				GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack --listen" ) , GlobalConfig->debug );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 
@@ -13986,7 +13986,7 @@ void KVpnc::readFromStderr_ipsecwhack()
 				GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack --initiate" ) , GlobalConfig->debug );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 	}
@@ -14096,7 +14096,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten()
 				disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 				connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 				durationTimer.start ( 1000, FALSE );
-				setGuitqStatus ( connected );
+				setGuiStatus ( connected );
 
 
 				setFirewallAfterConnect();
@@ -14136,7 +14136,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten()
 // 				GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack --listen" ) , GlobalConfig->debug );
 // 			disconnectClicked();
 // 			GlobalConfig->status = GlobalConfig->disconnected;
-// 			setGuitqStatus ( disconnected );
+// 			setGuiStatus ( disconnected );
 // 			return ;
 // 		}
 	}
@@ -14200,7 +14200,7 @@ void KVpnc::readFromStderr_ipsecwhacklisten()
 				GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack --listen" ) , GlobalConfig->debug );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 	}
@@ -14292,7 +14292,7 @@ void KVpnc::readFromStdout_ipsecwhackstatus()
 // 				GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ipsec whack status" ) , GlobalConfig->debug );
 // 			disconnectClicked();
 // 			GlobalConfig->status = GlobalConfig->disconnected;
-// 			setGuitqStatus ( disconnected );
+// 			setGuiStatus ( disconnected );
 // 			return ;
 // 		}
 	}
@@ -14353,7 +14353,7 @@ void KVpnc::readFromStderr_ipsecwhackstatus()
 // 			GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "l2tpd" ) , GlobalConfig->error );
 // 			disconnectClicked();
 // 			GlobalConfig->status = GlobalConfig->disconnected;
-// 			setGuitqStatus ( disconnected );
+// 			setGuiStatus ( disconnected );
 // 			return ;
 // 		}
 	}
@@ -14858,7 +14858,7 @@ void KVpnc::readFromStdout_tail_racoon()
 					disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 					connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 					durationTimer.start ( 1000, FALSE );
-					setGuitqStatus ( connected );
+					setGuiStatus ( connected );
 
 
 					doIptablesRacoon();
@@ -15063,7 +15063,7 @@ void KVpnc::readFromStdout_racoonctl()
 // 
 // 				connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 // 				durationTimer.start ( 1000, FALSE );
-// 				setGuitqStatus ( connected );
+// 				setGuiStatus ( connected );
 // 
 // 				setFirewallAfterConnect();
 // 				if ( GlobalConfig->currentProfile->getExecuteCmdAfterConnect() )
@@ -15327,7 +15327,7 @@ void KVpnc::readFromStdout_pptp()
 				disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 				connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 				durationTimer.start ( 1000, FALSE );
-				setGuitqStatus ( connected );
+				setGuiStatus ( connected );
 				connectSuccess = false;
 	
 				GlobalConfig->appendLogEntry ( i18n ( "Connection established." ), GlobalConfig->success );
@@ -15589,7 +15589,7 @@ void KVpnc::readFromStdout_pptp()
 	// 						{
 	// 							KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "pppd replace route process" )).tqarg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh")   );
 	// 							// 			disconnectClicked();
-	// 							// 			setGuitqStatus(disconnected);
+	// 							// 			setGuiStatus(disconnected);
 	// 						}
 	// 						else
 	// 						{
@@ -15625,7 +15625,7 @@ void KVpnc::readFromStdout_pptp()
 					// 	{
 					// 		KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) );
 					// 			disconnectClicked();
-					// 			setGuitqStatus(disconnected);
+					// 			setGuiStatus(disconnected);
 					// 	}
 					// 	else
 	// 			{
@@ -15655,7 +15655,7 @@ void KVpnc::readFromStdout_pptp()
 				//terminateConnection ( PptpProcess );
 				disconnectClicked();
 				GlobalConfig->status = GlobalConfig->disconnected;
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 	
 	
 	// 			// remove password entries
@@ -15933,7 +15933,7 @@ void KVpnc::readFromStderr_pptp()
 				//terminateConnection ( PptpProcess );
 				disconnectClicked();
 				GlobalConfig->status = GlobalConfig->disconnected;
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 				
 				if ( allowReconnect && GlobalConfig->currentProfile->getDoReconnectAfterConnectionLost() )
 				{
@@ -16414,7 +16414,7 @@ void KVpnc::readOutput_openvpn()
 				GlobalConfig->appendLogEntry ( i18n ( "%1 is shutting down." ).arg ( "openvpn" ), GlobalConfig->debug );
 
 			connectionEnded();
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 		}
 		else if ( ProcessMsg.find ( "Initialization Sequence Completed", 0, FALSE ) > -1 )
 		{
@@ -16453,7 +16453,7 @@ void KVpnc::readOutput_openvpn()
 			disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 			connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 			durationTimer.start ( 1000, FALSE );
-			setGuitqStatus ( connected );
+			setGuiStatus ( connected );
 			connectSuccess = false;
 
 			if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -16620,7 +16620,7 @@ void KVpnc::processStdout_l2tpd()
 						if ( GlobalConfig->KvpncDebugLevel > 0 )
 							GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "l2tpd" ), GlobalConfig->error );
 						KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "l2tpd" ) );
-						setGuitqStatus ( disconnected );
+						setGuiStatus ( disconnected );
 					}
 					else
 					{
@@ -16670,7 +16670,7 @@ void KVpnc::processStdout_l2tpd()
 			//terminateConnection ( L2tpdProcess );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 
 
 			// remove kvpnc entries from secrets file
@@ -16823,7 +16823,7 @@ void KVpnc::processStdout_l2tpd()
 				disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 				connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 				durationTimer.start ( 1000, FALSE );
-				setGuitqStatus ( connected );
+				setGuiStatus ( connected );
 
 
 				setFirewallAfterConnect();
@@ -17005,7 +17005,7 @@ void KVpnc::processStderr_l2tpd()
 							if ( GlobalConfig->KvpncDebugLevel > 0 )
 								GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "l2tpd" ), GlobalConfig->error );
 							KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( "l2tpd" ) );
-							setGuitqStatus ( disconnected );
+							setGuiStatus ( disconnected );
 						}
 						else
 						{
@@ -17087,7 +17087,7 @@ void KVpnc::processStderr_l2tpd()
 				disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 				connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 				durationTimer.start ( 1000, FALSE );
-				setGuitqStatus ( connected );
+				setGuiStatus ( connected );
 
 
 				setFirewallAfterConnect();
@@ -17123,7 +17123,7 @@ void KVpnc::processStderr_l2tpd()
 					GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "l2tpd" ) , GlobalConfig->debug );
 				disconnectClicked();
 				GlobalConfig->status = GlobalConfig->disconnected;
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 
 				if ( GlobalConfig->currentProfile->getAuthMethod() == "chap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap" || GlobalConfig->currentProfile->getAuthMethod() == "mschap-v2" )
 				{
@@ -17343,7 +17343,7 @@ void KVpnc::readFromStdout_openl2tp()
 			disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 			connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 			durationTimer.start ( 1000, FALSE );
-			setGuitqStatus ( connected );
+			setGuiStatus ( connected );
 
 
 			setFirewallAfterConnect();
@@ -17368,7 +17368,7 @@ void KVpnc::readFromStdout_openl2tp()
 				GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "openl2tpd" ) , GlobalConfig->debug );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 
 			return ;
 		}
@@ -17405,7 +17405,7 @@ void KVpnc::readFromStderr_openl2tp()
 				GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "l2tpd" ) , GlobalConfig->debug );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 
 			return ;
 		}
@@ -17437,7 +17437,7 @@ void KVpnc::readFromStdout_startstopOpenl2tp()
 				GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "openl2tpd" ) , GlobalConfig->debug );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 
 			return ;
 		}
@@ -17460,7 +17460,7 @@ void KVpnc::readFromStderr_startstopOpenl2tp()
 				GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "openl2tp" ) , GlobalConfig->debug );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 
 			return ;
 		}
@@ -17511,7 +17511,7 @@ void KVpnc::readFromStdout_vtun()
 			//terminateConnection ( L2tpdProcess );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 
 		}
 		// success
@@ -17525,7 +17525,7 @@ void KVpnc::readFromStdout_vtun()
 			disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 			connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 			durationTimer.start ( 1000, FALSE );
-			setGuitqStatus ( connected );
+			setGuiStatus ( connected );
 
 
 			setFirewallAfterConnect();
@@ -17672,7 +17672,7 @@ void KVpnc::readFromStderr_vtun()
 			disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 			connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 			durationTimer.start ( 1000, FALSE );
-			setGuitqStatus ( connected );
+			setGuiStatus ( connected );
 			connectSuccess = false;
 
 			setFirewallAfterConnect();
@@ -17712,7 +17712,7 @@ void KVpnc::readFromStderr_vtun()
 				GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "vtund" ) , GlobalConfig->debug );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 		GlobalConfig->appPointer->processEvents();
@@ -17726,8 +17726,8 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
 // 		ProcessMsg_connect = SshProcess->readLineStdout();
 	// 	TQString ProcessMsg_connect = TQString( SshProcess->readStdout() );
 
-// 		TQString ProcessMsg_connect = TQString::tqfromLatin1(buffer, buflen);
-	TQString ProcessMsg_connect_raw = TQString::tqfromLatin1 ( buffer, buflen );
+// 		TQString ProcessMsg_connect = TQString::fromLatin1(buffer, buflen);
+	TQString ProcessMsg_connect_raw = TQString::fromLatin1 ( buffer, buflen );
 	TQStringList ProcessMsg_connect_raw_list = TQStringList::split ( "debug1:",ProcessMsg_connect_raw );
 
 	for ( TQStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it )
@@ -17827,7 +17827,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
 				GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ssh" ) , GlobalConfig->debug );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 
@@ -17841,7 +17841,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
 			disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 			connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 			durationTimer.start ( 1000, FALSE );
-			setGuitqStatus ( connected );
+			setGuiStatus ( connected );
 			connectSuccess = false;
 
 			GlobalConfig->appendLogEntry ( i18n ( "Connection established." ), GlobalConfig->success );
@@ -18067,7 +18067,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
 					{
 						KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "ssh replace route process" ) ).arg ( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh" ) );
 						// 			disconnectClicked();
-						// 			setGuitqStatus(disconnected);
+						// 			setGuiStatus(disconnected);
 					}
 					else
 					{
@@ -18102,7 +18102,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
 			// 	{
 			// 		KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) );
 			// 			disconnectClicked();
-			// 			setGuitqStatus(disconnected);
+			// 			setGuiStatus(disconnected);
 			// 	}
 			// 	else
 			{
@@ -18139,9 +18139,9 @@ void KVpnc::readFromStderr_ssh ( KProcess *, char *buffer, int buflen )
 // 	{
 // 		ProcessMsg_connect = SshProcess->readLineStderr();
 	// 	TQString ProcessMsg_connect = TQString( SshProcess->readStderr() );
-// 		TQString ProcessMsg_connect = TQString::tqfromLatin1(buffer, buflen);
+// 		TQString ProcessMsg_connect = TQString::fromLatin1(buffer, buflen);
 
-	TQString ProcessMsg_connect_raw = TQString::tqfromLatin1 ( buffer, buflen );
+	TQString ProcessMsg_connect_raw = TQString::fromLatin1 ( buffer, buflen );
 	TQStringList ProcessMsg_connect_raw_list = TQStringList::split ( "debug1:",ProcessMsg_connect_raw );
 
 	for ( TQStringList::Iterator it = ProcessMsg_connect_raw_list.begin(); it != ProcessMsg_connect_raw_list.end(); ++it )
@@ -18223,7 +18223,7 @@ void KVpnc::readFromStderr_ssh ( KProcess *, char *buffer, int buflen )
 				GlobalConfig->appendLogEntry ( i18n ( "There is a reason for stop connecting, terminating \"%1\" process." ).arg ( "ssh" ) , GlobalConfig->debug );
 			disconnectClicked();
 			GlobalConfig->status = GlobalConfig->disconnected;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			return ;
 		}
 	}
@@ -18240,12 +18240,12 @@ void KVpnc::readFromStdout_ping()
 	if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 )
 	{
 		GlobalConfig->appendLogEntry ( "[ping] " + ProcessMsg_connect, GlobalConfig->success );
-		KNotifyClient::event ( tqtopLevelWidget() ->winId(), "ping success", i18n ( "Ping was successful." ) );
+		KNotifyClient::event ( topLevelWidget() ->winId(), "ping success", i18n ( "Ping was successful." ) );
 	}
 	else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, FALSE ) > -1 )
 	{
 		GlobalConfig->appendLogEntry ( "[ping err] " + ProcessMsg_connect, GlobalConfig->error );
-		KNotifyClient::event ( tqtopLevelWidget() ->winId(), "ping failed", i18n ( "Ping has failed." ) );
+		KNotifyClient::event ( topLevelWidget() ->winId(), "ping failed", i18n ( "Ping has failed." ) );
 	}
 	else
 	{
@@ -18386,12 +18386,12 @@ void KVpnc::readFromStdout_connectionStatusCheck()
 			if ( GlobalConfig->currentProfile->getDoPingIP() )
 			{
 				GlobalConfig->appendLogEntry ( i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getPingHostIP() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ), GlobalConfig->error );
-				KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection lost", i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getPingHostIP() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) );
+				KNotifyClient::event ( topLevelWidget() ->winId(), "connection lost", i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getPingHostIP() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) );
 			}
 			else
 			{
 				GlobalConfig->appendLogEntry ( i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ), GlobalConfig->error );
-				KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection lost", i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) );
+				KNotifyClient::event ( topLevelWidget() ->winId(), "connection lost", i18n ( "Ping to %1 within %2 checks every %3s has been failed!" ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount() ).arg ( GlobalConfig->currentProfile->getConnectionStatusInterval() ) );
 			}
 		}
 		disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_connectionStatusCheck() ) );
@@ -18434,7 +18434,7 @@ void KVpnc::readFromStderr_connectionStatusCheck()
 	// 		/* Connection dead?! */
 	// 		if (GlobalConfig->KvpncDebugLevel > 0)
 	// 			GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).tqarg( GlobalConfig->currentProfile->getConnectionStatusInterval() ), GlobalConfig->error );
-	// 		KNotifyClient::event( tqtopLevelWidget()->winId(), "connection lost",i18n("Ping to %1 within %2 checks every %3s was ok.").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).tqarg(GlobalConfig->currentProfile->getConnectionStatusInterval()) );
+	// 		KNotifyClient::event( topLevelWidget()->winId(), "connection lost",i18n("Ping to %1 within %2 checks every %3s was ok.").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).tqarg(GlobalConfig->currentProfile->getConnectionStatusInterval()) );
 	// 		// kill connection
 	// 		disconnectClicked();
 	// 	}
@@ -18576,7 +18576,7 @@ void KVpnc::terminateConnection ( TQProcess *proc )
 	durationTimer.stop();
 	GlobalConfig->status = GlobalConfig->disconnected;
 	connectCounter = 0;
-	setGuitqStatus ( disconnected );
+	setGuiStatus ( disconnected );
 
 }
 
@@ -18685,7 +18685,7 @@ void KVpnc::slotConnectTimedOut()
 			this->ConnectAction->setEnabled ( true );
 			this->DisconnectAction->setEnabled ( false );
 			//parent->statusBar() ->insertItem( i18n( "Connected" ), 2, 0, true );
-			KVpncDock->settqStatus ( disconnected );
+			KVpncDock->setStatus ( disconnected );
 			if ( GlobalConfig->KvpncDebugLevel > 0 )
 				GlobalConfig->appendLogEntry ( i18n ( "Connection failed (timeout)." ), GlobalConfig->debug );
 			disconnectClicked();
@@ -18694,7 +18694,7 @@ void KVpnc::slotConnectTimedOut()
 			TQToolTip::remove( KVpncDock );
 			TQToolTip::add( KVpncDock, i18n ( "Disconnected" ) );
 			connectCounter = 0;
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 			KMessageBox::error ( this, i18n ( "Timeout while connecting to %1 (%2) after %3s. Please check if the VPN server is reachable and the settings  (UDP/TCP, local port, UDP encapsulation port) are correct. Maybe the timeout must be increased too." ).arg ( GlobalConfig->currentProfile->getGateway() ).arg ( GlobalConfig->currentProfile->getName() ).arg ( GlobalConfig->tryConnectTimeout ) );
 		}
 		else if ( GlobalConfig->currentProfile->getDoReconnectAfterConnectionLost() )
@@ -19323,7 +19323,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 
 // 					ToolInfo *it;
 					// 					std::cout << "Tool (bin): " << bin << std::endl;
-					TQString TypeRequirementtqStatus="";
+					TQString TypeRequirementStatus="";
 					if ( !GlobalConfig->ToolList->isEmpty() )
 					{
 
@@ -19349,7 +19349,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 
 									if ( GlobalConfig->KvpncDebugLevel > 2 )
 										GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) is available, connect will be enabled." ).arg ( bin ), KVpncConfig::info );
-									TypeRequirementtqStatus = i18n ( "Daemon (%1) available").tqarg(bin);
+									TypeRequirementStatus = i18n ( "Daemon (%1) available").tqarg(bin);
 								}
 								else
 								{
@@ -19358,7 +19358,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 										this->ConnectAction->setEnabled ( FALSE );
 										mw->buttonConnect->setEnabled ( FALSE );
 										GlobalConfig->appendLogEntry ( i18n ( "The required helper program (%1) isn't available, connect will be disabled." ).arg ( "pkcs11-tool" ), KVpncConfig::error );
-										TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
+										TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
 									}
 									else
 									{
@@ -19366,7 +19366,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 										mw->buttonConnect->setEnabled ( TRUE );
 										if ( GlobalConfig->KvpncDebugLevel > 2 )
 											GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) and helper program (%2) is available, connect will be enabled." ).arg ( bin ).arg ( "pkcs11-tool" ), KVpncConfig::info );
-										TypeRequirementtqStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).tqarg("pkcs11-tool");
+										TypeRequirementStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).tqarg("pkcs11-tool");
 									}
 								}
 							}
@@ -19375,7 +19375,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 								this->ConnectAction->setEnabled ( FALSE );
 								mw->buttonConnect->setEnabled ( FALSE );
 								GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) isn't available, connect will be disabled." ).arg ( bin ), KVpncConfig::error );
-								TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").tqarg(bin);
+								TypeRequirementStatus = i18n ( "Daemon (%1) not available").tqarg(bin);
 							}
 						}
 						else
@@ -19401,7 +19401,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 										// programs are installed
 										if ( GlobalConfig->KvpncDebugLevel > 2 )
 											GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "racoon" ).arg ( "l2tpd" ), KVpncConfig::info );
-										TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "l2tpd" );
+										TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "l2tpd" );
 
 										this->ConnectAction->setEnabled ( TRUE );
 										mw->buttonConnect->setEnabled ( TRUE );
@@ -19412,7 +19412,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 										if ( GlobalConfig->KvpncDebugLevel > 2 )
 											GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "racoon" ).arg ( "xl2tpd" ), KVpncConfig::info );
 
-										TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "xl2tpd" );
+										TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "xl2tpd" );
 
 										this->ConnectAction->setEnabled ( TRUE );
 										mw->buttonConnect->setEnabled ( TRUE );
@@ -19420,7 +19420,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 									else if ( racoon_and_l2tpd_available==false &&  racoon_and_xl2tpd_available==false )
 									{
 										GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "racoon" ).arg ( "l2tpd/xl2tpd" ), KVpncConfig::error );
-										TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "racoon" ).arg ( "xl2tpd" );
+										TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "racoon" ).arg ( "xl2tpd" );
 									}
 								}
 								if ( GlobalConfig->currentProfile->getL2tpDaemon() == VpnAccountData::openl2tp )
@@ -19431,7 +19431,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 										if ( GlobalConfig->KvpncDebugLevel > 2 )
 											GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "racoon" ).arg ( "openl2tp" ), KVpncConfig::info );
 
-										TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "openl2tp" );
+										TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "openl2tp" );
 
 										this->ConnectAction->setEnabled ( TRUE );
 										mw->buttonConnect->setEnabled ( TRUE );
@@ -19473,7 +19473,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 												if ( GlobalConfig->KvpncDebugLevel > 2 )
 													GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "ipsec" ).arg ( "l2tpd" ), KVpncConfig::info );
 
-												TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "l2tpd" );
+												TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "l2tpd" );
 
 												this->ConnectAction->setEnabled ( TRUE );
 												mw->buttonConnect->setEnabled ( TRUE );
@@ -19484,7 +19484,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 												if ( GlobalConfig->KvpncDebugLevel > 2 )
 													GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "ipsec" ).arg ( "xl2tpd" ), KVpncConfig::info );
 
-												TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "xl2tpd" );
+												TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "xl2tpd" );
 
 												this->ConnectAction->setEnabled ( TRUE );
 												mw->buttonConnect->setEnabled ( TRUE );
@@ -19492,7 +19492,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 											else if ( ipsec_and_l2tpd_available==false &&  ipsec_and_xl2tpd_available==false )
 											{
 												GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" ), KVpncConfig::error );
-												TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" );
+												TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" );
 											}
 										}
 										if ( GlobalConfig->currentProfile->getL2tpDaemon() == VpnAccountData::openl2tp )
@@ -19503,7 +19503,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 												if ( GlobalConfig->KvpncDebugLevel > 2 )
 													GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "ipsec" ).arg ( "openl2tp" ), KVpncConfig::info );
 
-												TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
+												TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
 
 												this->ConnectAction->setEnabled ( TRUE );
 												mw->buttonConnect->setEnabled ( TRUE );
@@ -19511,7 +19511,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 											else if ( ipsec_and_openl2tp_available==false )
 											{
 												GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "ipsec" ).arg ( "openl2tp" ), KVpncConfig::error );
-												TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
+												TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" );
 											}
 										}
 									}
@@ -19524,7 +19524,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 												this->ConnectAction->setEnabled ( FALSE );
 												mw->buttonConnect->setEnabled ( FALSE );
 												GlobalConfig->appendLogEntry ( i18n ( "The required helper program (%1) isn't available, connect will be disabled." ).arg ( "pkcs11-tool" ), KVpncConfig::error );
-												TypeRequirementtqStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
+												TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" );
 											}
 											else
 											{
@@ -19532,7 +19532,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 												mw->buttonConnect->setEnabled ( TRUE );
 												if ( GlobalConfig->KvpncDebugLevel > 2 )
 													GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) and helper program (%3) is available, connect will be enabled." ).arg ( "ipsec" ).arg ( TQString(deamon) ).arg ( "pkcs11-tool" ), KVpncConfig::info );
-												TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).tqarg(deamon).arg ( "pkcs11-tool" );
+												TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).tqarg(deamon).arg ( "pkcs11-tool" );
 											}
 										}
 									}
@@ -19540,7 +19540,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 								else
 								{
 									GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "ipsec" ).arg ( "l2tpd/xl2tpd" ), KVpncConfig::error );
-									TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2pd" );
+									TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ipsec" ).arg ( "l2tpd/xl2pd" );
 								}
 							}
 							if ( type == "pptp" )
@@ -19556,7 +19556,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 									// programs are installed
 									if ( GlobalConfig->KvpncDebugLevel > 2 )
 										GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "pppd" ).arg ( "pptp" ), KVpncConfig::info );
-									TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "pppd" ).arg ( "pptp" );
+									TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "pppd" ).arg ( "pptp" );
 
 									this->ConnectAction->setEnabled ( TRUE );
 									mw->buttonConnect->setEnabled ( TRUE );
@@ -19565,7 +19565,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 								else
 								{
 									GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are not available, connect will be disabled." ).arg ( "pppd" ).arg ( "pptp" ), KVpncConfig::error );
-									TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "pppd" ).arg ( "pptp" );
+									TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "pppd" ).arg ( "pptp" );
 								}
 							}
 							if ( type == "ssh" )
@@ -19585,7 +19585,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 									if ( GlobalConfig->KvpncDebugLevel > 2 )
 										GlobalConfig->appendLogEntry ( i18n ( "The required programs (%1 and %2) are available, connect will be enabled." ).arg ( "ssh" ).arg ( "ksshaskpass" ), KVpncConfig::info );
 
-									TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "ksshaskpass" );
+									TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "ksshaskpass" );
 
 									this->ConnectAction->setEnabled ( TRUE );
 									mw->buttonConnect->setEnabled ( TRUE );
@@ -19597,7 +19597,7 @@ void KVpnc::sessionToggled ( const TQString& Name )
 									if ( GlobalConfig->KvpncDebugLevel > 2 )
 										GlobalConfig->appendLogEntry ( i18n ( "The required programs (%1 and %2) are available, connect will be enabled." ).arg ( "ssh" ).arg ( "gnome-ssh-askpass" ), KVpncConfig::info );
 
-									TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "gnome-ssh-askpass" );
+									TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "gnome-ssh-askpass" );
 
 									this->ConnectAction->setEnabled ( TRUE );
 									mw->buttonConnect->setEnabled ( TRUE );
@@ -19606,13 +19606,13 @@ void KVpnc::sessionToggled ( const TQString& Name )
 								else
 								{
 									GlobalConfig->appendLogEntry ( i18n ( "The required programs (%1 and %2) are not available, connect will be disabled." ).arg ( "ssh" ).arg ( i18n ( "%1 or %2" ).arg ( "ksshaskpass" ).arg ( "gnome-ssh-askpass" ) ), KVpncConfig::error );
-									TypeRequirementtqStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ssh" ).arg ( i18n ( "%1 or %2" ).arg ( "ksshaskpass" ).arg ( "gnome-ssh-askpass" ) );
+									TypeRequirementStatus = i18n ( "Daemons (%1 and %2) not available").arg ( "ssh" ).arg ( i18n ( "%1 or %2" ).arg ( "ksshaskpass" ).arg ( "gnome-ssh-askpass" ) );
 								}
 							}
 
 						}
 					}
-					ProfileInfo += "<tr><td>"+i18n("Required tools:")+"</td><td>"+TypeRequirementtqStatus+"</td></tr>";
+					ProfileInfo += "<tr><td>"+i18n("Required tools:")+"</td><td>"+TypeRequirementStatus+"</td></tr>";
 					ProfileInfo += "</table>";
 					TQToolTip::add( mw->SessionCombo, ProfileInfo );
 					break;
@@ -19761,18 +19761,18 @@ void KVpnc::showDockTooltip()
 	TQString ToolTipMsg = "<table>";
 
 	TQString Username = "";
-	TQString ConnectiontqStatus="";
+	TQString ConnectionStatus="";
 	
 	if (GlobalConfig->status == GlobalConfig->connected || GlobalConfig->status == GlobalConfig->connecting)
 	{
 		if (GlobalConfig->status == GlobalConfig->connected)
 		{
-			ConnectiontqStatus = i18n("connected");
+			ConnectionStatus = i18n("connected");
 			durationString = i18n("%1:%2:%3").tqarg( TQString().sprintf("%02u", hour)).tqarg(TQString().sprintf("%02u", min)).tqarg(TQString().sprintf("%02u", sec));
 		}
 		else
 		{
-			ConnectiontqStatus = i18n("connecting");
+			ConnectionStatus = i18n("connecting");
 		}
 		
 		if (!GlobalConfig->TmpUsername.isEmpty())
@@ -19780,7 +19780,7 @@ void KVpnc::showDockTooltip()
 		else
 			Username = GlobalConfig->currentProfile->getUserName();
 		
-		ToolTipMsg += "<tr><td>"+i18n("Status:")+"</td><td>"+ConnectiontqStatus+"</td></tr>";
+		ToolTipMsg += "<tr><td>"+i18n("Status:")+"</td><td>"+ConnectionStatus+"</td></tr>";
 		ToolTipMsg += "<tr><td>"+i18n("Server:")+"</td><td>"+TQString(GlobalConfig->currentProfile->getGateway())+"</td></tr>";
 		ToolTipMsg += "<tr><td>"+i18n("Type:")+"</td><td>"+TQString(PrettyTypeString)+"</td></tr>";
 
@@ -19828,22 +19828,22 @@ void KVpnc::showDockTooltip()
 	}
 	else if (GlobalConfig->status == GlobalConfig->disconnected)
 	{
-		ConnectiontqStatus = i18n("disconnected");
-		ToolTipMsg += "<tr><td>"+i18n("State:")+"</td><td>"+ ConnectiontqStatus+"</td></tr>";
+		ConnectionStatus = i18n("disconnected");
+		ToolTipMsg += "<tr><td>"+i18n("State:")+"</td><td>"+ ConnectionStatus+"</td></tr>";
 	}
 	ToolTipMsg += "</table>";
 	TQToolTip::remove ( KVpncDock);
 	TQToolTip::add ( KVpncDock, ToolTipMsg );
 }
 
-void KVpnc::setGuitqStatus ( int status )
+void KVpnc::setGuiStatus ( int status )
 {
 	TQString durationString = "";
 	TQString DaemonString = "";
 	TQString ToolTipMsg = "";
 	TQString ConnectMsg = "";
 	TQString LogMsg = "";
-	TQString ConnectiontqStatus = i18n("unknown");
+	TQString ConnectionStatus = i18n("unknown");
 	TQString Username = "";
 	if (status == GlobalConfig->connected)
 	{
@@ -19854,7 +19854,7 @@ void KVpnc::setGuitqStatus ( int status )
 		TQString LogMsg = "";
 		TQString ToolTipMsg = "";
 		TQString DeamonString = "";
-		ConnectiontqStatus = i18n("connected");
+		ConnectionStatus = i18n("connected");
 
 		if ( !GlobalConfig->TmpUsername.isEmpty() )
 			Username=GlobalConfig->TmpUsername;
@@ -19868,7 +19868,7 @@ void KVpnc::setGuitqStatus ( int status )
 		ImportSessionAction->setEnabled ( false );
 		NewProfileWizardAction->setEnabled ( false );
 
-		KVpncDock->settqStatus ( connected );
+		KVpncDock->setStatus ( connected );
 		GlobalConfig->status = GlobalConfig->connected;
 		statusColorLabel->setPixmap ( *connectedStatusPixmap );
 		mw->buttonConnect->setEnabled ( false );
@@ -19911,7 +19911,7 @@ void KVpnc::setGuitqStatus ( int status )
 		DeleteSessionAction->setEnabled ( false );
 		ImportSessionAction->setEnabled ( false );
 
-		KVpncDock->settqStatus ( connecting );
+		KVpncDock->setStatus ( connecting );
 		GlobalConfig->status = GlobalConfig->connecting;
 		mw->SessionCombo->setEnabled ( false );
 		PreferencesAction->setEnabled ( false );
@@ -19919,7 +19919,7 @@ void KVpnc::setGuitqStatus ( int status )
 		NewProfileWizardAction->setEnabled ( false );
 		PrefAction ->setEnabled ( false );
 
-		ConnectiontqStatus = i18n("connecting");
+		ConnectionStatus = i18n("connecting");
 
 		statusColorLabel->setPixmap ( *connectingStatusPixmap );
 
@@ -19941,7 +19941,7 @@ void KVpnc::setGuitqStatus ( int status )
 		RenameSessionAction->setEnabled ( true );
 		DeleteSessionAction->setEnabled ( true );
 		ImportSessionAction->setEnabled ( true );
-		KVpncDock->settqStatus ( disconnected );
+		KVpncDock->setStatus ( disconnected );
 		mw->SessionCombo->setEnabled ( true );
 		PreferencesAction->setEnabled ( true );
 		ProfileManagerAction->setEnabled ( true );
@@ -19957,9 +19957,9 @@ void KVpnc::setGuitqStatus ( int status )
 		slotStatusMsg ( i18n ( "Disconnected." ), ID_FLASH_MSG );
 
 		if ( prevConnectionState == GlobalConfig->connected )
-			KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection finished", i18n ( "Connection \"%1\" finished" ).arg ( GlobalConfig->currentProfile->getName() ) );
+			KNotifyClient::event ( topLevelWidget() ->winId(), "connection finished", i18n ( "Connection \"%1\" finished" ).arg ( GlobalConfig->currentProfile->getName() ) );
 		else if ( prevConnectionState == GlobalConfig->connecting )
-			KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connect try canceled", i18n ( "Connect try to \"%1\" canceled" ).arg ( GlobalConfig->currentProfile->getName() ) );
+			KNotifyClient::event ( topLevelWidget() ->winId(), "connect try canceled", i18n ( "Connect try to \"%1\" canceled" ).arg ( GlobalConfig->currentProfile->getName() ) );
 	}
 	if (status == GlobalConfig->connecting || status == GlobalConfig->connected)
 	{
@@ -19977,31 +19977,31 @@ void KVpnc::setGuitqStatus ( int status )
 			}
 			if (GlobalConfig->currentProfile->getAuthType() == VpnAccountData::psk)
 			{
-				ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getUserName()).tqarg(GlobalConfig->currentProfile->getID()).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+				ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getUserName()).tqarg(GlobalConfig->currentProfile->getID()).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus);
 				
-				ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus);
+				ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectionStatus);
 				
-				LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\", IPSec ID: \"%3\" at %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getUserName()).tqarg(GlobalConfig->currentProfile->getID()).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]");
+				LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\", IPSec ID: \"%3\" at %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getUserName()).tqarg(GlobalConfig->currentProfile->getID()).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]");
 			}
 			if (GlobalConfig->currentProfile->getAuthType() == VpnAccountData::cert)
 			{
-				ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+				ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus);
 				
-				ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus);
+				ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectionStatus);
 				
-				LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\" at %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]");
+				LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\" at %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]");
 			}
 		}
 		else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp)
 		{
 			PrettyTypeString =  i18n("PPTP");
 			DaemonString = "pppd, pptp";
-			ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString , GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+			ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString , GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus);
 			
 			ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString);
 			
 			TQString TypeString2 = " [" + i18n("%1" , PrettyTypeString) + TQString("]");
-			LogMsg = i18n("Successful connected to server \"%1\"\nuser: \"%2\" at %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(TQString(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)) + TypeString2);
+			LogMsg = i18n("Successful connected to server \"%1\"\nuser: \"%2\" at %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(TQString(TQDateTime::currentDateTime().toString(Qt::TextDate)) + TypeString2);
 		}
 		else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan)
 		{
@@ -20022,63 +20022,63 @@ void KVpnc::setGuitqStatus ( int status )
 				PrettyTypeString =  i18n("L2TP (racoon)");
 				DaemonString = "racoon, " + GlobalConfig->currentProfile->getL2tpDaemon();
 				
-				ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+				ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus);
 				
-				ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectiontqStatus);
+				ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectionStatus);
 			}
 			else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan)
 			{
 				PrettyTypeString = IpsecType;
 				if (!GlobalConfig->pathToXl2tpd.isEmpty() && TQFile(GlobalConfig->pathToXl2tpd).exists())
 					DaemonString = "ipsec, " + GlobalConfig->currentProfile->getL2tpDaemon();
-				ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+				ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus);
 				
-				ConnectMsg = i18n("%4: %2@%1, %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg( Username).tqarg(durationString).tqarg(ConnectiontqStatus);
+				ConnectMsg = i18n("%4: %2@%1, %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg( Username).tqarg(durationString).tqarg(ConnectionStatus);
 			}
 			else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword())
 			{
 				PrettyTypeString = IpsecType;
 				DaemonString = "ipsec";
-				ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString  , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectiontqStatus);
+				ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString  , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus);
 				
 				ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString);
 			}
 			
-			LogMsg = i18n("Policy successful activated and daemon (%1) running for server \"%2\" (%3) at date %4, profile \"%5\".").tqarg(DaemonString).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
+			LogMsg = i18n("Policy successful activated and daemon (%1) running for server \"%2\" (%3) at date %4, profile \"%5\".").tqarg(DaemonString).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
 			
 		}
 		else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn)
 		{
 			PrettyTypeString =  i18n("OpenVPN");
 			DaemonString = "openvpn";
-			ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(ConnectiontqStatus);
+			ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(ConnectionStatus);
 			
 			ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
 			
-			LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
+			LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
 		}
 		else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun)
 		{
 			PrettyTypeString =  i18n("Vtun");
 			DaemonString = "vtun";
-			ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectiontqStatus);
+			ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectionStatus);
 			
 			ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"));
 			
-			LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]");
+			LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate)).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]");
 		}
 		else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh)
 		{
 			PrettyTypeString =  i18n("SSH");
 			DaemonString = "ssh";
-			ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectiontqStatus);
+			ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectionStatus);
 			
 			ConnectMsg = i18n("%4: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString ).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"));
 			
-			LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
+			LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]");
 		}
 		if (status == GlobalConfig->connected)
-			KNotifyClient::event ( tqtopLevelWidget() ->winId(), "connection established", ConnectMsg );
+			KNotifyClient::event ( topLevelWidget() ->winId(), "connection established", ConnectMsg );
 	}
 	
 }
@@ -20813,7 +20813,7 @@ void KVpnc::doTailRacoonLog()
 	else
 	{
 		//         status=connected;
-		//         setGuitqStatus(connected);
+		//         setGuiStatus(connected);
 
 		if ( GlobalConfig->KvpncDebugLevel > 0 )
 			GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( GlobalConfig->pathToTail+" -f " + tmpPath + "racoon." + GlobalConfig->currentProfile->getName() + ".log" ), GlobalConfig->debug );
@@ -21337,7 +21337,7 @@ void KVpnc::racoonStarted()
 	//
 	// 		connect( &durationTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDurationEvent() ) );
 	// 		durationTimer.start( 1000, FALSE );
-	// 		setGuitqStatus( connected );
+	// 		setGuiStatus( connected );
 	//
 	//		setFirewallAfterConnect();
 	// 		if ( GlobalConfig->currentProfile->getExecuteCmdAfterConnect() )
@@ -21401,7 +21401,7 @@ void KVpnc::ipsecStarted()
 // 	}
 
 	IpsecStatusCheck=true;
-	checkIpsecWhacktqStatus();
+	checkIpsecWhackStatus();
 	IpsecStatusCheck=false;
 
 	if ( GlobalConfig->KvpncDebugLevel > 0 )
@@ -21442,7 +21442,7 @@ void KVpnc::ipsecStarted()
 	}
 }
 
-void KVpnc::checkIpsecWhacktqStatus()
+void KVpnc::checkIpsecWhackStatus()
 {
 
 	putenv ( ( char* ) ( "LC_ALL=C" ) );
@@ -21487,8 +21487,8 @@ void KVpnc::checkIpsecWhacktqStatus()
 			}
 			if ( !IpsecWhackStatusTimer.isActive() )
 			{
-				disconnect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhacktqStatus() ) );
-				connect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhacktqStatus() ) );
+				disconnect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhackStatus() ) );
+				connect ( &IpsecWhackStatusTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkIpsecWhackStatus() ) );
 				IpsecWhackStatusTimer.start ( 5 * 1000, FALSE );
 			}
 		}
@@ -21663,7 +21663,7 @@ void KVpnc::start_ipsec_initiate()
 			GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( GlobalConfig->pathToIpsec+" whack --name "+GlobalConfig->currentProfile->getName() +" --initiate" ), GlobalConfig->debug );
 
 		if (!IpsecGotError)
-			checkIpsecWhacktqStatus();
+			checkIpsecWhackStatus();
 	}
 
 
@@ -21709,7 +21709,7 @@ void KVpnc::ipsecPhase2Established()
 		disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 		connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 		durationTimer.start ( 1000, FALSE );
-		setGuitqStatus ( connected );
+		setGuiStatus ( connected );
 
 
 		setFirewallAfterConnect();
@@ -22512,7 +22512,7 @@ void KVpnc::doRoutePptp()
 
 void KVpnc::slotConnecting()
 {
-	setGuitqStatus ( connecting );
+	setGuiStatus ( connecting );
 }
 
 void KVpnc::profileAddedOrDeleted()
@@ -22608,7 +22608,7 @@ void KVpnc::toggleDebugConsole()
 		GlobalConfig->showDebugConsole = true;
 		DebugconsoleAction ->setChecked ( true );
 		mw->DebugOutput->show();
-		//resize( tqminimumSizeHint() );
+		//resize( minimumSizeHint() );
 	}
 	else
 	{
@@ -22616,7 +22616,7 @@ void KVpnc::toggleDebugConsole()
 		DebugconsoleAction ->setChecked ( false );
 		mw->DebugOutput->hide();
 		// 		setMinimumSize(0,0);
-		// 		this->resize( tqminimumSizeHint() );
+		// 		this->resize( minimumSizeHint() );
 	}
 }
 
@@ -23291,7 +23291,7 @@ void KVpnc::backupIpsecSystemConfig()
 	else
 	{
 		GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecPrefix + "/ipsec.conf.before.kvpnc" ),GlobalConfig->error );
-		setGuitqStatus ( disconnected );
+		setGuiStatus ( disconnected );
 		return;
 	}
 
@@ -23319,7 +23319,7 @@ void KVpnc::backupIpsecSystemConfig()
 	else
 	{
 		GlobalConfig->appendLogEntry ( i18n ( "%1 could not opened. Stop." ).arg ( IpsecPrefix + "/ipsec.secrets.before.kvpnc" ),GlobalConfig->error );
-		setGuitqStatus ( disconnected );
+		setGuiStatus ( disconnected );
 		return;
 	}
 	stream.unsetDevice();
@@ -24415,7 +24415,7 @@ void KVpnc::start_l2tpd()
 				if ( GlobalConfig->KvpncDebugLevel > 0 )
 					GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( daemon ), GlobalConfig->error );
 				KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( daemon ) );
-				setGuitqStatus ( disconnected );
+				setGuiStatus ( disconnected );
 			}
 			else
 			{
@@ -24512,7 +24512,7 @@ void KVpnc::start_l2tpd()
 			if ( GlobalConfig->KvpncDebugLevel > 0 )
 				GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( daemon ), GlobalConfig->error );
 			KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( daemon ) );
-			setGuitqStatus ( disconnected );
+			setGuiStatus ( disconnected );
 		}
 		else
 		{
@@ -24599,7 +24599,7 @@ void KVpnc::checkL2tpPppUp()
 					disconnect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 					connect ( &durationTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( slotDurationEvent() ) );
 					durationTimer.start ( 1000, FALSE );
-					setGuitqStatus ( connected );
+					setGuiStatus ( connected );
 
 
 					setFirewallAfterConnect();
@@ -24628,7 +24628,7 @@ void KVpnc::checkL2tpPppUp()
 
 }
 
-bool KVpnc::checkCiscoVpnctqStatus()
+bool KVpnc::checkCiscoVpncStatus()
 {
 	ciscoVpncRunning = false;
 	TestCiscoVpncProcess = new TQProcess ( this );
@@ -24847,7 +24847,7 @@ uint KVpnc::getConnectedTime()
 		return 0;
 }
 
-TQString KVpnc::gettqStatus()
+TQString KVpnc::getStatus()
 {
 	if ( GlobalConfig->status == GlobalConfig->connected )
 		return "connected";