From f4cef261c339c76ea446f029ceca4268840f6385 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sat, 31 Aug 2013 12:43:36 -0500 Subject: [PATCH] Rename KWallet to TDEWallet. --- src/configgeneraloptions.ui | 4 +-- src/kvpnc.cpp | 16 +++++------ src/kvpncconfig.cpp | 56 ++++++++++++++++++------------------- src/kvpncconfig.h | 6 ++-- src/preferencesdialog.cpp | 18 ++++++------ src/preferencesdialog.h | 2 +- 6 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/configgeneraloptions.ui b/src/configgeneraloptions.ui index 8a18188..0306e92 100644 --- a/src/configgeneraloptions.ui +++ b/src/configgeneraloptions.ui @@ -55,7 +55,7 @@ - useKwalletCheckBox + useTDEwalletCheckBox Use K&Wallet @@ -193,7 +193,7 @@ - useKwalletToggled(bool) + useTDEwalletToggled(bool) diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp index 48f9a15..b9d120e 100644 --- a/src/kvpnc.cpp +++ b/src/kvpnc.cpp @@ -678,7 +678,7 @@ void KVpnc:: quitCalled() { disconnectClicked(); reallyQuit = true; - GlobalConfig->skipKwalletStoring = true; + GlobalConfig->skipTDEwalletStoring = true; if ( !GlobalConfig->AccountList->isEmpty() && GlobalConfig->currentProfile != 0 ) GlobalConfig->lastProfile = GlobalConfig->currentProfile->getName(); if ( GlobalConfig->writeLogFile ) @@ -705,7 +705,7 @@ void KVpnc:: quitCalled() { disconnectClicked(); reallyQuit = true; - GlobalConfig->skipKwalletStoring = true; + GlobalConfig->skipTDEwalletStoring = true; if ( !GlobalConfig->AccountList->isEmpty() && GlobalConfig->currentProfile != 0 ) GlobalConfig->lastProfile = GlobalConfig->currentProfile->getName(); if ( GlobalConfig->writeLogFile ) @@ -732,7 +732,7 @@ void KVpnc:: quitCalled() { disconnectClicked(); reallyQuit = true; - GlobalConfig->skipKwalletStoring = true; + GlobalConfig->skipTDEwalletStoring = true; if ( !GlobalConfig->AccountList->isEmpty() && GlobalConfig->currentProfile != 0 ) GlobalConfig->lastProfile = GlobalConfig->currentProfile->getName(); if ( GlobalConfig->writeLogFile ) @@ -843,7 +843,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e ) if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Shutdown was called...exiting.\n" ), GlobalConfig->debug ); reallyQuit = true; - GlobalConfig->skipKwalletStoring = true; + GlobalConfig->skipTDEwalletStoring = true; disconnectClicked(); } else @@ -855,7 +855,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e ) if ( res != 4 ) { reallyQuit = true; - GlobalConfig->skipKwalletStoring = true; + GlobalConfig->skipTDEwalletStoring = true; disconnectClicked(); if ( reallyQuit ) @@ -892,7 +892,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e ) else { //disconnect and quit silently - GlobalConfig->skipKwalletStoring = true; + GlobalConfig->skipTDEwalletStoring = true; disconnectClicked(); reallyQuit = true; } @@ -901,7 +901,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e ) else { reallyQuit = true; - GlobalConfig->skipKwalletStoring = true; + GlobalConfig->skipTDEwalletStoring = true; } if ( reallyQuit ) @@ -11225,7 +11225,7 @@ void KVpnc::helpClicked() // KMessageBox::information(0,extip,"ext ip" ); // /* passwords with tdewallet */ - // if (GlobalConfig->useKwallet && TDEWallet::Wallet::isEnabled()) + // if (GlobalConfig->useTDEwallet && TDEWallet::Wallet::isEnabled()) // { // // Open local wallet // GlobalConfig->wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::LocalWallet()); 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\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"; @@ -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); diff --git a/src/kvpncconfig.h b/src/kvpncconfig.h index 37dd9f4..4c955dd 100644 --- a/src/kvpncconfig.h +++ b/src/kvpncconfig.h @@ -138,15 +138,15 @@ public: bool showInterfaceIPinTooltip; bool dontQuitOnCloseEvent; bool doAutoConnectAtStartup; - bool useKwallet; + bool useTDEwallet; bool showStatusBar; bool showToolBar; bool hideMainWindow; bool PppdDebugLevel; - bool firstUseOfKwallet; //< for importing passwords if there are stored before + bool firstUseOfTDEwallet; //< for importing passwords if there are stored before bool shutdownIsCalled; bool haveUserData; //< flag if user data already collected, set after data is entered and unset if authretry - bool skipKwalletStoring; //< true if save should skip saving into tdewallet + bool skipTDEwalletStoring; //< true if save should skip saving into tdewallet bool hideOnCloseInfo; bool feedbackMailSent; bool doKillL2tpdIfStillRunning; //< kill l2tpd if its still running and not started from kvpnc diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp index 3e88a4b..69fcce2 100644 --- a/src/preferencesdialog.cpp +++ b/src/preferencesdialog.cpp @@ -466,7 +466,7 @@ PreferencesDialog::PreferencesDialog( TQWidget *parent, TQApplication *app, TQTe ConnectOptionsWidget->SilentQuitcheckBox->setChecked( GlobalConfig->useSilentQuit ); GeneralOptionsWidget->DontQuitOnCloseEventCheckBox->setChecked( GlobalConfig->dontQuitOnCloseEvent ); GeneralOptionsWidget->HideOnStartupCheckBox->setChecked (GlobalConfig->hideMainWindow); - GeneralOptionsWidget->useKwalletCheckBox->setChecked( GlobalConfig->useKwallet ); + GeneralOptionsWidget->useTDEwalletCheckBox->setChecked( GlobalConfig->useTDEwallet ); ConfigDaemonOptionsWidget->ProgramsInPathcheckBox->setChecked( GlobalConfig->programsInPath ); DebugOptionsWidget->KeepConnectionFilesCheckBox->setChecked( GlobalConfig->holdGeneratedScripts ); LogOptionsWidget->InfoLogLabel->setPaletteBackgroundColor ( GlobalConfig->InfoLogColor ); @@ -961,7 +961,7 @@ void PreferencesDialog::setupGui() lo = new TQVBoxLayout( GeneralFrame, 0, KDialog::spacingHint() ); GeneralOptionsWidget = new ConfigGeneralOptions( GeneralFrame ); lo->addWidget( GeneralOptionsWidget ); - connect(GeneralOptionsWidget->useKwalletCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useKwalletToggled(bool))); + connect(GeneralOptionsWidget->useTDEwalletCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useTDEwalletToggled(bool))); // const TQObjectList *GeneralOptionsWidgetList = GeneralOptionsWidget->queryList( TQCHECKBOX_OBJECT_NAME_STRING ); // TQObjectListIt it( *GeneralOptionsWidgetList ); @@ -1652,7 +1652,7 @@ void PreferencesDialog::accept() GlobalConfig->showDebugConsole = DebugOptionsWidget->showDebugCheck->isChecked(); GlobalConfig->useSilentQuit = ConnectOptionsWidget->SilentQuitcheckBox->isChecked(); GlobalConfig->dontQuitOnCloseEvent = GeneralOptionsWidget->DontQuitOnCloseEventCheckBox->isChecked(); - GlobalConfig->useKwallet = GeneralOptionsWidget->useKwalletCheckBox->isChecked(); + GlobalConfig->useTDEwallet = GeneralOptionsWidget->useTDEwalletCheckBox->isChecked(); GlobalConfig->writeLogFile = DebugOptionsWidget->WriteLogCheck->isChecked(); GlobalConfig->KvpncDebugLevel = DebugOptionsWidget->spinKvpncDebugLevel->value(); GlobalConfig->RacoonDebugLevel = ConfigDaemonOptionsWidget->RacoonDebugLevelComboBox->currentText(); @@ -4473,7 +4473,7 @@ void PreferencesDialog::saveSessionClicked() GlobalConfig->useSilentQuit = ConnectOptionsWidget->SilentQuitcheckBox->isChecked(); GlobalConfig->dontQuitOnCloseEvent = GeneralOptionsWidget->DontQuitOnCloseEventCheckBox->isChecked(); GlobalConfig->hideMainWindow = GeneralOptionsWidget->HideOnStartupCheckBox->isChecked (); - GlobalConfig->useKwallet = GeneralOptionsWidget->useKwalletCheckBox->isChecked(); + GlobalConfig->useTDEwallet = GeneralOptionsWidget->useTDEwalletCheckBox->isChecked(); GlobalConfig->programsInPath =ConfigDaemonOptionsWidget->ProgramsInPathcheckBox->isChecked(); GlobalConfig->holdGeneratedScripts = DebugOptionsWidget->KeepConnectionFilesCheckBox->isChecked(); GlobalConfig->InfoLogColor = LogOptionsWidget->InfoLogLabel->paletteBackgroundColor (); @@ -7016,20 +7016,20 @@ void PreferencesDialog::natModeToggled( const TQString &) } } -void PreferencesDialog::useKwalletToggled(bool) +void PreferencesDialog::useTDEwalletToggled(bool) { - if (!GeneralOptionsWidget->useKwalletCheckBox->isChecked()) + if (!GeneralOptionsWidget->useTDEwalletCheckBox->isChecked()) { 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 { - GeneralOptionsWidget->useKwalletCheckBox->setChecked(true); - GlobalConfig->useKwallet=true; + GeneralOptionsWidget->useTDEwalletCheckBox->setChecked(true); + GlobalConfig->useTDEwallet=true; } if (result == 3) //Yes - GlobalConfig->useKwallet=false; + GlobalConfig->useTDEwallet=false; } } diff --git a/src/preferencesdialog.h b/src/preferencesdialog.h index 70fff75..4fd8cb9 100644 --- a/src/preferencesdialog.h +++ b/src/preferencesdialog.h @@ -101,7 +101,7 @@ public slots: void IkeGroupToggled(bool); void perfectForwardSecurityToggled(bool); void singleDesToggled(bool); - void useKwalletToggled(bool); + void useTDEwalletToggled(bool); void dpdToggled(bool); void useCiscoCertStoreToggled(bool); void natModeToggled( const TQString &);