Rename KWallet to TDEWallet.

1 files changed, 28 insertions, 28 deletions

diff --git a/src/kvpncconfig.cpp b/src/kvpncconfig.cpp
index 63c5290..34fef45 100644
--- a/src/kvpncconfig.cpp
+++ b/src/kvpncconfig.cpp
@@ -129,12 +129,12 @@ KVpncConfig::KVpncConfig(TQWidget *parent,KStatusBar *statusbar)
 	dontQuitOnCloseEvent=true;
 	PppdDebugLevel = false;
 	doAutoConnectAtStartup=false;
-	useKwallet=true;
+	useTDEwallet=true;
 	showStatusBar=true;
 	showToolBar=true;
-	firstUseOfKwallet=true;
+	firstUseOfTDEwallet=true;
 	shutdownIsCalled=false;
-	skipKwalletStoring = false;
+	skipTDEwalletStoring = false;
 	hideOnCloseInfo = false;
 	enableFreeswanVerbose=false;
 	doKillL2tpdIfStillRunning=true;
@@ -410,7 +410,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 		config->writeEntry( "Mainwindow position y", parent->y() );
 		config->writeEntry("Openvpn management port", OpenvpnManagementPort );
 		//config->writeEntry( "ToolBar Settings" ,parent->toolBar( "mainToolBar" ));
-		config->writeEntry("Use TDEWallet",useKwallet);
+		config->writeEntry("Use TDEWallet",useTDEwallet);
 		config->writeEntry("FeedbackMailSent",feedbackMailSent);
 		config->writeEntry("Do kill l2tpd if still running",doKillL2tpdIfStillRunning);
 		config->writeEntry("Do kill racoon if still running",doKillRacoonIfStillRunning);
@@ -426,16 +426,16 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 		//appPointer->processEvents();
 	}
 
-	if (useKwallet && TDEWallet::Wallet::isEnabled())
-		config->writeEntry( "First use of Kwallet", false );
+	if (useTDEwallet && TDEWallet::Wallet::isEnabled())
+		config->writeEntry( "First use of TDEwallet", false );
 	/* = user data = */
 	VpnAccountData *it;
 	if ( !AccountList->isEmpty() )
 	{
 		/* passwords with tdewallet */
-		if ( useKwallet && TDEWallet::Wallet::isEnabled())
+		if ( useTDEwallet && TDEWallet::Wallet::isEnabled())
 		{
-			if (!skipKwalletStoring )
+			if (!skipTDEwalletStoring )
 			{
 				if (KvpncDebugLevel > 2)
 					appendLogEntry(i18n( "Wallet enabled and available, writing to wallet." ),debug);
@@ -488,9 +488,9 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 				config->writeEntry("Description",it->getDescription());
 
 				/* passwords with tdewallet */
-				if ( useKwallet && TDEWallet::Wallet::isEnabled())
+				if ( useTDEwallet && TDEWallet::Wallet::isEnabled())
 				{
-					if (!skipKwalletStoring )
+					if (!skipTDEwalletStoring )
 					{
 						if (KvpncDebugLevel > 2)
 							appendLogEntry(i18n( "Wallet enabled and available, writing to wallet." ),debug);
@@ -618,7 +618,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 				else
 				{
 					//Wallet not available
-					//if (!useKwallet)
+					//if (!useTDEwallet)
 					{
 						if (KvpncDebugLevel > 2)
 							appendLogEntry(i18n( "Wallet disabled or not available, writing to config file." ),debug);
@@ -891,8 +891,8 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 	}
 
 
-// 	if ( !skipKwalletStoring && wallet != 0)
-// 		if (useKwallet && TDEWallet::Wallet::isEnabled())
+// 	if ( !skipTDEwalletStoring && wallet != 0)
+// 		if (useTDEwallet && TDEWallet::Wallet::isEnabled())
 // 			if (wallet->isOpen())
 // 				wallet->sync();
 	config->sync();
@@ -1036,8 +1036,8 @@ void KVpncConfig::loadOptions()
 			}
 		}
 
-	useKwallet = config->readBoolEntry("Use TDEWallet", true);
-	firstUseOfKwallet = config->readBoolEntry( "First use of Kwallet", true );
+	useTDEwallet = config->readBoolEntry("Use TDEWallet", true);
+	firstUseOfTDEwallet = config->readBoolEntry( "First use of TDEwallet", true );
 	feedbackMailSent = config->readBoolEntry("FeedbackMailSent",false);
 	doKillL2tpdIfStillRunning = config->readBoolEntry("Do kill l2tpd if still running",true);
 	doKillXl2tpdIfStillRunning = config->readBoolEntry("Do kill xl2tpd if still running",true);
@@ -1096,7 +1096,7 @@ void KVpncConfig::loadOptions()
 			TQString PreSharedKey ="";
 
 			/* passwords with tdewallet */
-			if (useKwallet && TDEWallet::Wallet::isEnabled())
+			if (useTDEwallet && TDEWallet::Wallet::isEnabled())
 			{
 				if (KvpncDebugLevel > 2)
 					appendLogEntry(i18n( "Wallet enabled and available, reading passwords from wallet." ),debug);
@@ -1156,7 +1156,7 @@ void KVpncConfig::loadOptions()
 			{
 				if (KvpncDebugLevel > 2)
 				{
-					if (useKwallet && TDEWallet::Wallet::isEnabled() && firstUseOfKwallet)
+					if (useTDEwallet && TDEWallet::Wallet::isEnabled() && firstUseOfTDEwallet)
 						appendLogEntry(i18n( "Wallet enabled, available but first time, reading passwords from config file." ),debug);
 					else
 						appendLogEntry(i18n( "Wallet disabled or not available, reading passwords from config file." ),debug);
@@ -1743,7 +1743,7 @@ bool KVpncConfig::exportKvpncConfig(TQString filename)
 				ExportStream << "\t\t<option name=\"Openvpn management port\"" << " type=\"int\"" << ">" << int(OpenvpnManagementPort)<< "</option>\n";
 				ExportStream << "\t\t<option name=\"hideOnCloseInfo\"" << " type=\"bool\"" << ">" << int(hideOnCloseInfo)<< "</option>\n";
 			//   ExportStream << "\t\t<option name=\"ToolBar Settings\"" << " type=\"bool\"" << ">" << parent->toolBar( "mainToolBar" )<< "</option>\n";
-				ExportStream << "\t\t<option name=\"Use TDEWallet\"" << " type=\"bool\"" << ">" << int(useKwallet)<< "</option>\n";
+				ExportStream << "\t\t<option name=\"Use TDEWallet\"" << " type=\"bool\"" << ">" << int(useTDEwallet)<< "</option>\n";
 				ExportStream << "\t\t<option name=\"FeedbackMailSent\"" << " type=\"bool\"" << ">" << int(feedbackMailSent)<< "</option>\n";
 				ExportStream << "\t\t<option name=\"Do kill l2tpd if still running\"" << " type=\"bool\"" << ">" << int(doKillL2tpdIfStillRunning)<< "</option>\n";
 				ExportStream << "\t\t<option name=\"Do kill xl2tpd if still running\"" << " type=\"bool\"" << ">" << int(doKillXl2tpdIfStillRunning)<< "</option>\n";
@@ -2077,14 +2077,14 @@ bool KVpncConfig::importKvpncConfig(TQString filename, TQString& RetName, bool&
 	bool showInterfaceIPinTooltip=true;
 	bool dontQuitOnCloseEvent=true;
 	bool doAutoConnectAtStartup=false;
-	bool useKwallet=true;
+	bool useTDEwallet=true;
 	bool showStatusBar=true;
 	bool showToolBar=true;
 	bool hideMainWindow=false;
 	bool PppdDebugLevel=false;
-	bool firstUseOfKwallet=false;
+	bool firstUseOfTDEwallet=false;
 	bool shutdownIsCalled=false;
-	bool skipKwalletStoring=false;
+	bool skipTDEwalletStoring=false;
 	bool hideOnCloseInfo=false;
 	bool feedbackMailSent=false;
 	bool doKillL2tpdIfStillRunning=false;
@@ -2258,7 +2258,7 @@ bool KVpncConfig::importKvpncConfig(TQString filename, TQString& RetName, bool&
 					else if ( n1.toElement().tagName() == "Openvpn management port" ) { OpenvpnManagementPort = n1.toElement().text().toInt(); }
 					else if ( n1.toElement().tagName() == "hideOnCloseInfo" ) { hideOnCloseInfo = n1.toElement().text().toInt(); }
 					//   else if (n1.toElement().tagName() == "ToolBar Settings") { parent->toolBar( "mainToolBar" ) = n1.toElement().text(); }
-					else if ( n1.toElement().tagName() == "Use TDEWallet" ) { useKwallet = n1.toElement().text().toInt(); }
+					else if ( n1.toElement().tagName() == "Use TDEWallet" ) { useTDEwallet = n1.toElement().text().toInt(); }
 					else if ( n1.toElement().tagName() == "FeedbackMailSent" ) { feedbackMailSent = n1.toElement().text().toInt(); }
 					else if ( n1.toElement().tagName() == "Do kill l2tpd if still running" ) { doKillL2tpdIfStillRunning = n1.toElement().text().toInt(); }
 					else if ( n1.toElement().tagName() == "Do kill xl2tpd if still running" ) { doKillXl2tpdIfStillRunning = n1.toElement().text().toInt(); }
@@ -2717,14 +2717,14 @@ bool KVpncConfig::importKvpncConfig(TQString filename, TQString& RetName, bool&
 			this-> showInterfaceIPinTooltip= showInterfaceIPinTooltip;
 			this-> dontQuitOnCloseEvent= dontQuitOnCloseEvent;
 			this-> doAutoConnectAtStartup= doAutoConnectAtStartup;
-			this-> useKwallet= useKwallet;
+			this-> useTDEwallet= useTDEwallet;
 			this-> showStatusBar= showStatusBar;
 			this-> showToolBar= showToolBar;
 			this-> hideMainWindow= hideMainWindow;
 			this-> PppdDebugLevel= PppdDebugLevel;
-			this-> firstUseOfKwallet= firstUseOfKwallet;
+			this-> firstUseOfTDEwallet= firstUseOfTDEwallet;
 			this-> shutdownIsCalled= shutdownIsCalled;
-			this-> skipKwalletStoring= skipKwalletStoring;
+			this-> skipTDEwalletStoring= skipTDEwalletStoring;
 			this-> hideOnCloseInfo= hideOnCloseInfo;
 			this-> feedbackMailSent= feedbackMailSent;
 			this-> doKillL2tpdIfStillRunning= doKillL2tpdIfStillRunning;
@@ -4344,8 +4344,8 @@ void KVpncConfig::removeEntry(TQString Name)
 
 	appPointer->processEvents();
 
-	if (useKwallet && TDEWallet::Wallet::isEnabled())
-		config->deleteEntry( "First use of Kwallet", false );
+	if (useTDEwallet && TDEWallet::Wallet::isEnabled())
+		config->deleteEntry( "First use of TDEwallet", false );
 	/* = user data = */
 	VpnAccountData *it;
 	if ( !AccountList->isEmpty() )
@@ -4363,7 +4363,7 @@ void KVpncConfig::removeEntry(TQString Name)
 					config->setGroup( ProfileName );
 
 					/* passwords with tdewallet */
-					if ( useKwallet && TDEWallet::Wallet::isEnabled())
+					if ( useTDEwallet && TDEWallet::Wallet::isEnabled())
 					{
 	// 					if (KvpncDebugLevel > 0)
 	// 						appendLogEntry(i18n( "Wallet enabled and available, writing to wallet." ),debug);