From e9cffd9b85189371a92e50a50c53d0c95d75d1dc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 27 Aug 2013 23:14:43 -0500 Subject: Rename KWallet to TDEWallet --- src/configgeneraloptions.ui | 2 +- src/enterpassworddialogbase.ui | 6 +++--- src/kvpnc.cpp | 4 ++-- src/kvpncconfig.cpp | 38 ++++++++++++++++++------------------ src/kvpncconfig.h | 2 +- src/newprofiledialogbase.ui | 4 ++-- src/newprofilewizardciscomanually.ui | 2 +- src/newprofilewizardpsk.ui | 2 +- src/newprofilewizarduser.ui | 4 ++-- src/preferencesdialog.cpp | 2 +- src/profilepskoptionsbase.ui | 2 +- src/profileuseroptionsbase.ui | 4 ++-- 12 files changed, 36 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/configgeneraloptions.ui b/src/configgeneraloptions.ui index 1286932..8a18188 100644 --- a/src/configgeneraloptions.ui +++ b/src/configgeneraloptions.ui @@ -64,7 +64,7 @@ Alt+W - Use KWallet for secure store passwords + Use TDEWallet for secure store passwords diff --git a/src/enterpassworddialogbase.ui b/src/enterpassworddialogbase.ui index 21e0268..296d593 100644 --- a/src/enterpassworddialogbase.ui +++ b/src/enterpassworddialogbase.ui @@ -251,7 +251,7 @@ Alt+U - Save username, shared secret and password <br>in config file or in KWallet + Save username, shared secret and password <br>in config file or in TDEWallet @@ -265,7 +265,7 @@ - Save username, shared secret and password <br>in config file or in KWallet + Save username, shared secret and password <br>in config file or in TDEWallet @@ -279,7 +279,7 @@ - Save username, shared secret and password <br>in config file or in KWallet + Save username, shared secret and password <br>in config file or in TDEWallet diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp index 2883723..48f9a15 100644 --- a/src/kvpnc.cpp +++ b/src/kvpnc.cpp @@ -11225,10 +11225,10 @@ void KVpnc::helpClicked() // KMessageBox::information(0,extip,"ext ip" ); // /* passwords with tdewallet */ - // if (GlobalConfig->useKwallet && KWallet::Wallet::isEnabled()) + // if (GlobalConfig->useKwallet && TDEWallet::Wallet::isEnabled()) // { // // Open local wallet - // GlobalConfig->wallet = KWallet::Wallet::openWallet(KWallet::Wallet::LocalWallet()); + // GlobalConfig->wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::LocalWallet()); // if (GlobalConfig->wallet != 0) // { // 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.
" // "Do you want to save the password in the unsafe 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.
" // "Do you want to save the password in the unsafe 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.
" // "Do you want to save the password in the unsafe 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.
" // "Do you want to save the password in the unsafe 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\n"; ExportStream << "\t\t\n"; // ExportStream << "\t\t\n"; - ExportStream << "\t\t\n"; + ExportStream << "\t\t\n"; ExportStream << "\t\t\n"; ExportStream << "\t\t\n"; ExportStream << "\t\t\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"; diff --git a/src/kvpncconfig.h b/src/kvpncconfig.h index a2c2c00..37dd9f4 100644 --- a/src/kvpncconfig.h +++ b/src/kvpncconfig.h @@ -197,7 +197,7 @@ public: TQFile logfile; TQTextStream logFileStream; TQTextEdit *LogOutput; - KWallet::Wallet *wallet; + TDEWallet::Wallet *wallet; TDEConfig* config; //< configuration data TQPoint WindowPos; diff --git a/src/newprofiledialogbase.ui b/src/newprofiledialogbase.ui index 82e4429..6355a65 100644 --- a/src/newprofiledialogbase.ui +++ b/src/newprofiledialogbase.ui @@ -217,7 +217,7 @@ Alt+S - Save the user password in config file (or in KWallet if available) + Save the user password in config file (or in TDEWallet if available) @@ -362,7 +362,7 @@ Alt+G - Save the group password in config file (or in KWallet if available) + Save the group password in config file (or in TDEWallet if available) diff --git a/src/newprofilewizardciscomanually.ui b/src/newprofilewizardciscomanually.ui index 4d24416..1afb9a3 100644 --- a/src/newprofilewizardciscomanually.ui +++ b/src/newprofilewizardciscomanually.ui @@ -72,7 +72,7 @@ Alt+P - Save the group password in config file (or in KWallet if available) + Save the group password in config file (or in TDEWallet if available) diff --git a/src/newprofilewizardpsk.ui b/src/newprofilewizardpsk.ui index 1d918fd..7454b18 100644 --- a/src/newprofilewizardpsk.ui +++ b/src/newprofilewizardpsk.ui @@ -57,7 +57,7 @@ Alt+V - Save Pre-shared key in config file (or in KWallet if available) + Save Pre-shared key in config file (or in TDEWallet if available) diff --git a/src/newprofilewizarduser.ui b/src/newprofilewizarduser.ui index b435e3d..cd466b9 100644 --- a/src/newprofilewizarduser.ui +++ b/src/newprofilewizarduser.ui @@ -173,7 +173,7 @@ Alt+U - Save user password in config file (or in KWallet if available) + Save user password in config file (or in TDEWallet if available) @@ -187,7 +187,7 @@ Alt+V - Do not save the username in config nor KWallet + Do not save the username in config nor TDEWallet diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp index 1b6e191..3e88a4b 100644 --- a/src/preferencesdialog.cpp +++ b/src/preferencesdialog.cpp @@ -7021,7 +7021,7 @@ void PreferencesDialog::useKwalletToggled(bool) if (!GeneralOptionsWidget->useKwalletCheckBox->isChecked()) { - int result = KMessageBox::questionYesNo ( this, i18n ( "Do you really want disable the use of KWallet? KVpnc will save passwords and psk in config file if requested." ), i18n ( "Disable KWallet?" ) ); + int result = KMessageBox::questionYesNo ( this, i18n ( "Do you really want disable the use of TDEWallet? KVpnc will save passwords and psk in config file if requested." ), i18n ( "Disable TDEWallet?" ) ); //LogOutput->append( "Result: "+ TQString().setNum(result) ) ; if ( result == 2 || result == 4 ) // No or Cancel { diff --git a/src/profilepskoptionsbase.ui b/src/profilepskoptionsbase.ui index 4323820..b4d5a24 100644 --- a/src/profilepskoptionsbase.ui +++ b/src/profilepskoptionsbase.ui @@ -227,7 +227,7 @@ Alt+V - Save Pre-shared key in config file (or in KWallet if available) + Save Pre-shared key in config file (or in TDEWallet if available) diff --git a/src/profileuseroptionsbase.ui b/src/profileuseroptionsbase.ui index 58e9a0b..5136d96 100644 --- a/src/profileuseroptionsbase.ui +++ b/src/profileuseroptionsbase.ui @@ -137,7 +137,7 @@ - Do not save the username in config nor KWallet + Do not save the username in config nor TDEWallet @@ -238,7 +238,7 @@ Alt+U - Save user password in config file (or in KWallet if available) + Save user password in config file (or in TDEWallet if available) -- cgit v1.2.3