Rename KWallet to TDEWallet

1 files changed, 19 insertions, 19 deletions

diff --git a/src/kvpncconfig.cpp b/src/kvpncconfig.cpp
index 25e8b41..63c5290 100644
--- a/src/kvpncconfig.cpp
+++ b/src/kvpncconfig.cpp
@@ -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 KWallet",useKwallet);
+		config->writeEntry("Use TDEWallet",useKwallet);
 		config->writeEntry("FeedbackMailSent",feedbackMailSent);
 		config->writeEntry("Do kill l2tpd if still running",doKillL2tpdIfStillRunning);
 		config->writeEntry("Do kill racoon if still running",doKillRacoonIfStillRunning);
@@ -426,21 +426,21 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 		//appPointer->processEvents();
 	}
 
-	if (useKwallet && KWallet::Wallet::isEnabled())
+	if (useKwallet && TDEWallet::Wallet::isEnabled())
 		config->writeEntry( "First use of Kwallet", false );
 	/* = user data = */
 	VpnAccountData *it;
 	if ( !AccountList->isEmpty() )
 	{
 		/* passwords with tdewallet */
-		if ( useKwallet && KWallet::Wallet::isEnabled())
+		if ( useKwallet && TDEWallet::Wallet::isEnabled())
 		{
 			if (!skipKwalletStoring )
 			{
 				if (KvpncDebugLevel > 2)
 					appendLogEntry(i18n( "Wallet enabled and available, writing to wallet." ),debug);
 				// Open local wallet
-				wallet = KWallet::Wallet::openWallet(KWallet::Wallet::LocalWallet());
+				wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::LocalWallet());
 				//appPointer->processEvents();
 				if (wallet != 0)
 				{
@@ -488,7 +488,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 				config->writeEntry("Description",it->getDescription());
 
 				/* passwords with tdewallet */
-				if ( useKwallet && KWallet::Wallet::isEnabled())
+				if ( useKwallet && TDEWallet::Wallet::isEnabled())
 				{
 					if (!skipKwalletStoring )
 					{
@@ -543,7 +543,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 										// 									        i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>"
 										// 									              "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")),
 										// 									        i18n( "Unable to store secure %1" ).arg(i18n("user password")),
-										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToTDEConfig" ) ) ) == KMessageBox::Continue )
+										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "TDEWalletFallbackToTDEConfig" ) ) ) == KMessageBox::Continue )
 										// 									{
 										// 										config->writeEntry( "User password", it->getUserPassword() );
 										// 									}
@@ -560,7 +560,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 										// 									        i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>"
 										// 									              "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")),
 										// 									        i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")),
-										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToTDEConfig" ) ) ) == KMessageBox::Continue )
+										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "TDEWalletFallbackToTDEConfig" ) ) ) == KMessageBox::Continue )
 										// 									{
 										// 										config->writeEntry( "Pre shared key", it->getPreSharedKey() );
 										// 									}
@@ -576,7 +576,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 										// 									        i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>"
 										// 									              "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")),
 										// 									        i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")),
-										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToTDEConfig" ) ) ) == KMessageBox::Continue )
+										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "TDEWalletFallbackToTDEConfig" ) ) ) == KMessageBox::Continue )
 										// 									{
 										// 										config->writeEntry( "Pre shared key", it->getPreSharedKey() );
 										// 									}
@@ -591,7 +591,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 										// 									        i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>"
 										// 									              "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")),
 										// 									        i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")),
-										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToTDEConfig" ) ) ) == KMessageBox::Continue )
+										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "TDEWalletFallbackToTDEConfig" ) ) ) == KMessageBox::Continue )
 										// 									{
 										// 										config->writeEntry( "Pre shared key", it->getPreSharedKey() );
 										// 									}
@@ -892,7 +892,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 
 
 // 	if ( !skipKwalletStoring && wallet != 0)
-// 		if (useKwallet && KWallet::Wallet::isEnabled())
+// 		if (useKwallet && TDEWallet::Wallet::isEnabled())
 // 			if (wallet->isOpen())
 // 				wallet->sync();
 	config->sync();
@@ -1036,7 +1036,7 @@ void KVpncConfig::loadOptions()
 			}
 		}
 
-	useKwallet = config->readBoolEntry("Use KWallet", true);
+	useKwallet = config->readBoolEntry("Use TDEWallet", true);
 	firstUseOfKwallet = config->readBoolEntry( "First use of Kwallet", true );
 	feedbackMailSent = config->readBoolEntry("FeedbackMailSent",false);
 	doKillL2tpdIfStillRunning = config->readBoolEntry("Do kill l2tpd if still running",true);
@@ -1096,12 +1096,12 @@ void KVpncConfig::loadOptions()
 			TQString PreSharedKey ="";
 
 			/* passwords with tdewallet */
-			if (useKwallet && KWallet::Wallet::isEnabled())
+			if (useKwallet && TDEWallet::Wallet::isEnabled())
 			{
 				if (KvpncDebugLevel > 2)
 					appendLogEntry(i18n( "Wallet enabled and available, reading passwords from wallet." ),debug);
 				// Open local wallet
-				wallet = KWallet::Wallet::openWallet(KWallet::Wallet::LocalWallet());
+				wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::LocalWallet());
 				if (wallet != 0)
 				{
 					TQString walletname="kvpnc";
@@ -1156,7 +1156,7 @@ void KVpncConfig::loadOptions()
 			{
 				if (KvpncDebugLevel > 2)
 				{
-					if (useKwallet && KWallet::Wallet::isEnabled() && firstUseOfKwallet)
+					if (useKwallet && TDEWallet::Wallet::isEnabled() && firstUseOfKwallet)
 						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 KWallet\"" << " type=\"bool\"" << ">" << int(useKwallet)<< "</option>\n";
+				ExportStream << "\t\t<option name=\"Use TDEWallet\"" << " type=\"bool\"" << ">" << int(useKwallet)<< "</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";
@@ -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 KWallet" ) { useKwallet = n1.toElement().text().toInt(); }
+					else if ( n1.toElement().tagName() == "Use TDEWallet" ) { useKwallet = 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(); }
@@ -4344,7 +4344,7 @@ void KVpncConfig::removeEntry(TQString Name)
 
 	appPointer->processEvents();
 
-	if (useKwallet && KWallet::Wallet::isEnabled())
+	if (useKwallet && TDEWallet::Wallet::isEnabled())
 		config->deleteEntry( "First use of Kwallet", false );
 	/* = user data = */
 	VpnAccountData *it;
@@ -4363,12 +4363,12 @@ void KVpncConfig::removeEntry(TQString Name)
 					config->setGroup( ProfileName );
 
 					/* passwords with tdewallet */
-					if ( useKwallet && KWallet::Wallet::isEnabled())
+					if ( useKwallet && TDEWallet::Wallet::isEnabled())
 					{
 	// 					if (KvpncDebugLevel > 0)
 	// 						appendLogEntry(i18n( "Wallet enabled and available, writing to wallet." ),debug);
 	// 					// Open local wallet
-						wallet = KWallet::Wallet::openWallet(KWallet::Wallet::LocalWallet());
+						wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::LocalWallet());
 						if (wallet != 0)
 						{
 							TQString walletname="kvpnc";