Browse Source

Rename KWallet to TDEWallet

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
a637b08775
24 changed files with 66 additions and 66 deletions
  1. +1
    -1
      kmail/aboutdata.cpp
  2. +4
    -4
      kmail/accountdialog.cpp
  3. +1
    -1
      kmail/kmkernel.cpp
  4. +3
    -3
      kmail/kmkernel.h
  5. +6
    -6
      kmail/kmtransport.cpp
  6. +5
    -5
      kmail/networkaccount.cpp
  7. +2
    -2
      knode/knaccountmanager.cpp
  8. +3
    -3
      knode/knaccountmanager.h
  9. +1
    -1
      knode/knnetaccess.cpp
  10. +6
    -6
      knode/knserverinfo.cpp
  11. +3
    -3
      knode/knserverinfo.h
  12. +1
    -1
      korn/kmail_proto.h
  13. +1
    -1
      korn/korncfg.ui
  14. +1
    -1
      korn/korncfgimpl.cpp
  15. +2
    -2
      korn/password.cpp
  16. +11
    -11
      korn/password.h
  17. +1
    -1
      tderesources/caldav/preferences.cpp
  18. +3
    -3
      tderesources/caldav/preferences.h
  19. +1
    -1
      tderesources/carddav/preferences.cpp
  20. +3
    -3
      tderesources/carddav/preferences.h
  21. +3
    -3
      tderesources/scalix/scalixadmin/passwordpage.cpp
  22. +1
    -1
      wizards/kmailchanges.cpp
  23. +2
    -2
      wizards/kmailchanges.h
  24. +1
    -1
      wizards/scalixwizard.cpp

+ 1
- 1
kmail/aboutdata.cpp View File

@@ -179,7 +179,7 @@ namespace KMail {
{ "Christoph Kl\303\274nter", 0, 0, 0 }, // fix for bug:88216 (drag&drop from KAddressBook to the To: field)
{ "Martin Koller", 0, 0, 0 }, // optional columns in the message list
{ "Tobias K\303\266nig", 0, 0, 0 }, // edit recent addresses, store email<->OpenPGP key association in address book
{ "Volker Krause", 0, 0, 0 }, // implemented KWallet support, fixed multiple bugs
{ "Volker Krause", 0, 0, 0 }, // implemented TDEWallet support, fixed multiple bugs
{ "Francois Kritzinger", 0, 0, 0 }, // fix bug in configuration dialog
{ "Danny Kukawka", 0, 0, 0 }, // DCOP enhancements for better message importing
{ "Roger Larsson", 0, 0, 0 }, // add name of checked account to status bar message

+ 4
- 4
kmail/accountdialog.cpp View File

@@ -626,9 +626,9 @@ void AccountDialog::makePopAccountPage()
new TQCheckBox( i18n("Sto&re POP password"), page1 );
TQWhatsThis::add( mPop.storePasswordCheck,
i18n("Check this option to have KMail store "
"the password.\nIf KWallet is available "
"the password.\nIf TDEWallet is available "
"the password will be stored there which is considered "
"safe.\nHowever, if KWallet is not available, "
"safe.\nHowever, if TDEWallet is not available, "
"the password will be stored in KMail's configuration "
"file. The password is stored in an "
"obfuscated format, but should not be "
@@ -960,9 +960,9 @@ void AccountDialog::makeImapAccountPage( bool connected )
new TQCheckBox( i18n("Sto&re IMAP password"), page1 );
TQWhatsThis::add( mImap.storePasswordCheck,
i18n("Check this option to have KMail store "
"the password.\nIf KWallet is available "
"the password.\nIf TDEWallet is available "
"the password will be stored there which is considered "
"safe.\nHowever, if KWallet is not available, "
"safe.\nHowever, if TDEWallet is not available, "
"the password will be stored in KMail's configuration "
"file. The password is stored in an "
"obfuscated format, but should not be "

+ 1
- 1
kmail/kmkernel.cpp View File

@@ -70,7 +70,7 @@ using KMail::FolderIface;
#include <kdebug.h>
#include <tdeio/netaccess.h>
#include <tdewallet.h>
using KWallet::Wallet;
using TDEWallet::Wallet;
#include "actionscheduler.h"

#include <qutf7codec.h>

+ 3
- 3
kmail/kmkernel.h View File

@@ -24,7 +24,7 @@
namespace TDEIO {
class Job;
}
namespace KWallet {
namespace TDEWallet {
class Wallet;
}

@@ -396,7 +396,7 @@ public:
void messageCountChanged();

/** Open KDE wallet and set it to kmail folder */
KWallet::Wallet *wallet();
TDEWallet::Wallet *wallet();

/** Get first mainwidget */
KMMainWidget *getKMMainWidget();
@@ -516,7 +516,7 @@ private:
KPIM::ThreadWeaver::Weaver *the_weaver;
KPIM::ThreadWeaver::WeaverThreadLogger *the_weaverLogger;

KWallet::Wallet *mWallet;
TDEWallet::Wallet *mWallet;

// variables used by dcopAddMessage()
TQStringList mAddMessageMsgIds;

+ 6
- 6
kmail/kmtransport.cpp View File

@@ -39,7 +39,7 @@
#include <kseparator.h>
#include <kdebug.h>
#include <tdewallet.h>
using KWallet::Wallet;
using TDEWallet::Wallet;
#include <kprotocolinfo.h>

#include "kmkernel.h"
@@ -138,15 +138,15 @@ void KMTransportInfo::writeConfig(int id)
}
// wallet not available, ask the user if we should use the config file instead
if ( !passwdStored && ( mStorePasswdInConfig || KMessageBox::warningYesNo( 0,
i18n("KWallet is not available. It is strongly recommended to use "
"KWallet for managing your passwords.\n"
i18n("TDEWallet is not available. It is strongly recommended to use "
"TDEWallet for managing your passwords.\n"
"However, KMail can store the password in its configuration "
"file instead. The password is stored in an obfuscated format, "
"but should not be considered secure from decryption efforts "
"if access to the configuration file is obtained.\n"
"Do you want to store the password for account '%1' in the "
"configuration file?").arg( name ),
i18n("KWallet Not Available"),
i18n("TDEWallet Not Available"),
KGuiItem( i18n("Store Password") ),
KGuiItem( i18n("Do Not Store Password") ) )
== KMessageBox::Yes ) ) {
@@ -457,9 +457,9 @@ void KMTransportDialog::makeSmtpPage()
new TQCheckBox( i18n("&Store SMTP password"), page1 );
TQWhatsThis::add(mSmtp.storePasswordCheck,
i18n("Check this option to have KMail store "
"the password.\nIf KWallet is available "
"the password.\nIf TDEWallet is available "
"the password will be stored there which is considered "
"safe.\nHowever, if KWallet is not available, "
"safe.\nHowever, if TDEWallet is not available, "
"the password will be stored in KMail's configuration "
"file. The password is stored in an "
"obfuscated format, but should not be "

+ 5
- 5
kmail/networkaccount.cpp View File

@@ -39,7 +39,7 @@
#include <kdebug.h>
#include <tdewallet.h>
using TDEIO::MetaData;
using KWallet::Wallet;
using TDEWallet::Wallet;

#include <climits>

@@ -162,7 +162,7 @@ namespace KMail {

if ( !encpasswd.isEmpty() ) {
setPasswd( decryptStr( encpasswd ), true );
// migrate to KWallet if available
// migrate to TDEWallet if available
if ( Wallet::isEnabled() ) {
config.deleteEntry( "pass" );
config.deleteEntry( "passwd" );
@@ -217,15 +217,15 @@ namespace KMail {
// if wallet is not available, write to config file, since the account
// manager deletes this group, we need to write it always
if ( !passwdStored && ( mStorePasswdInConfig || KMessageBox::warningYesNo( 0,
i18n("KWallet is not available. It is strongly recommended to use "
"KWallet for managing your passwords.\n"
i18n("TDEWallet is not available. It is strongly recommended to use "
"TDEWallet for managing your passwords.\n"
"However, KMail can store the password in its configuration "
"file instead. The password is stored in an obfuscated format, "
"but should not be considered secure from decryption efforts "
"if access to the configuration file is obtained.\n"
"Do you want to store the password for account '%1' in the "
"configuration file?").arg( name() ),
i18n("KWallet Not Available"),
i18n("TDEWallet Not Available"),
KGuiItem( i18n("Store Password") ),
KGuiItem( i18n("Do Not Store Password") ) )
== KMessageBox::Yes ) ) {

+ 2
- 2
knode/knaccountmanager.cpp View File

@@ -31,7 +31,7 @@
#include "knaccountmanager.h"
#include "knfoldermanager.h"

KWallet::Wallet* KNAccountManager::mWallet = 0;
TDEWallet::Wallet* KNAccountManager::mWallet = 0;
bool KNAccountManager::mWalletOpenFailed = false;

KNAccountManager::KNAccountManager(KNGroupManager *gm, TQObject * parent, const char * name)
@@ -252,7 +252,7 @@ void KNAccountManager::loadPasswords()
}


KWallet::Wallet* KNAccountManager::wallet()
TDEWallet::Wallet* KNAccountManager::wallet()
{
if ( mWallet && mWallet->isOpen() )
return mWallet;

+ 3
- 3
knode/knaccountmanager.h View File

@@ -18,7 +18,7 @@
#include <tqglobal.h>
#include <tqvaluelist.h>

namespace KWallet {
namespace TDEWallet {
class Wallet;
}

@@ -61,7 +61,7 @@ class KNAccountManager : public TQObject
void loadPasswordsAsync();

/** Returns a pointer to an open wallet if available, 0 otherwise */
static KWallet::Wallet* wallet();
static TDEWallet::Wallet* wallet();

protected:
void loadAccounts();
@@ -85,7 +85,7 @@ class KNAccountManager : public TQObject

private:
TQValueList<KNNntpAccount*> mAccounts;
static KWallet::Wallet *mWallet;
static TDEWallet::Wallet *mWallet;
static bool mWalletOpenFailed;
bool mAsyncOpening;


+ 1
- 1
knode/knnetaccess.cpp View File

@@ -102,7 +102,7 @@ void KNNetAccess::addJob(KNJobData *job)
if ( !job->account()->readyForLogin() ) {
mWalletQueue.append( job );
knGlobals.accountManager()->loadPasswordsAsync();
job->setStatus( i18n( "Waiting for KWallet..." ) );
job->setStatus( i18n( "Waiting for TDEWallet..." ) );
return;
}


+ 6
- 6
knode/knserverinfo.cpp View File

@@ -18,7 +18,7 @@
#include <tdelocale.h>
#include <kdebug.h>
#include <tdewallet.h>
using namespace KWallet;
using namespace TDEWallet;

#include "knglobals.h"
#include "knserverinfo.h"
@@ -67,7 +67,7 @@ void KNServerInfo::readConf(TDEConfig *conf)
u_ser=conf->readEntry("user");
p_ass = KNHelper::decryptStr(conf->readEntry("pass"));

// migration to KWallet
// migration to TDEWallet
if (Wallet::isEnabled() && !p_ass.isEmpty()) {
conf->deleteEntry( "pass" );
p_assDirty = true;
@@ -104,15 +104,15 @@ void KNServerInfo::saveConf(TDEConfig *conf)
Wallet *wallet = KNAccountManager::wallet();
if (!wallet || wallet->writePassword(TQString::number(i_d), p_ass)) {
if ( KMessageBox::warningYesNo( 0,
i18n("KWallet is not available. It is strongly recommended to use "
"KWallet for managing your passwords.\n"
i18n("TDEWallet is not available. It is strongly recommended to use "
"TDEWallet for managing your passwords.\n"
"However, KNode can store the password in its configuration "
"file instead. The password is stored in an obfuscated format, "
"but should not be considered secure from decryption efforts "
"if access to the configuration file is obtained.\n"
"Do you want to store the password for server '%1' in the "
"configuration file?").arg( server() ),
i18n("KWallet Not Available"),
i18n("TDEWallet Not Available"),
KGuiItem( i18n("Store Password") ),
KGuiItem( i18n("Do Not Store Password") ) )
== KMessageBox::Yes ) {
@@ -182,7 +182,7 @@ void KNServerInfo::readPassword()
return;

// finally try to open the wallet and read the password
KWallet::Wallet *wallet = KNAccountManager::wallet();
TDEWallet::Wallet *wallet = KNAccountManager::wallet();
if ( wallet )
wallet->readPassword( TQString::number(i_d), p_ass );
}

+ 3
- 3
knode/knserverinfo.h View File

@@ -18,10 +18,10 @@
#include <tqstring.h>

class TDEConfig;
namespace KWallet {
namespace TDEWallet {
class Wallet;
}
using KWallet::Wallet;
using TDEWallet::Wallet;

class KNServerInfo {

@@ -63,7 +63,7 @@ class KNServerInfo {

bool operator==(const KNServerInfo &s);

/** Loads the password from KWallet, used for on-demand password loading */
/** Loads the password from TDEWallet, used for on-demand password loading */
void readPassword();

protected:

+ 1
- 1
korn/kmail_proto.h View File

@@ -64,7 +64,7 @@ public:
* it calculates how the configuration whould have looked in KOrn.
*
* @param config The configuration group to read the kmailname from.
* @param password The password fetched out of the configuration or KWallet.
* @param password The password fetched out of the configuration or TDEWallet.
* @return A mapping containing the configuration if success, and empty mapping otherwise.
*/
virtual TQMap< TQString, TQString > * createConfig( TDEConfigGroup* config, const TQString& password ) const;

+ 1
- 1
korn/korncfg.ui View File

@@ -52,7 +52,7 @@
<cstring>chUseWallet</cstring>
</property>
<property name="text">
<string>Use &amp;KWallet if possible</string>
<string>Use &amp;TDEWallet if possible</string>
</property>
<property name="checked">
<bool>true</bool>

+ 1
- 1
korn/korncfgimpl.cpp View File

@@ -220,7 +220,7 @@ void KornCfgImpl::writeConfig()
if( rbDocked->isChecked() )
_config->writeEntry( "layout", "Docked" );

//Default is 'false' here, because if no option is set, KWallet isn't used.
//Default is 'false' here, because if no option is set, TDEWallet isn't used.
if( _config->readBoolEntry( "usewallet", false ) != chUseWallet->isChecked() )
//Configuration box changed => setting over configuration
rewritePasswords();

+ 2
- 2
korn/password.cpp View File

@@ -26,7 +26,7 @@
#include <tqstring.h>
#include <tqstringlist.h>

KWallet::Wallet* KOrnPassword::m_wallet = 0;
TDEWallet::Wallet* KOrnPassword::m_wallet = 0;
bool KOrnPassword::m_openFailed = false;
bool KOrnPassword::m_useWallet = false; //Not default true until moving works

@@ -178,7 +178,7 @@ void KOrnPassword::open()
return; //Not open, and can't be opened

delete m_wallet; m_wallet = 0;
m_wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0 );
m_wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0 );
if( !m_wallet )
m_openFailed = true;

+ 11
- 11
korn/password.h View File

@@ -21,13 +21,13 @@
#define KORNPASSWORD_H

class TDEConfigBase;
namespace KWallet { class Wallet; }
namespace TDEWallet { class Wallet; }

class TQString;

/**
* This class can be used to store and retrieve passwords.
* It uses KWallet if possible, and the configuartion files otherwise.
* It uses TDEWallet if possible, and the configuartion files otherwise.
*/
class KOrnPassword
{
@@ -46,15 +46,15 @@ public:
*
* @param box The boxnumber of the account
* @param account The accountnumber of the account
* @param fallbackConfig The configuration file if KWallet cannot be used.
* @param fallbackConfig The configuration file if TDEWallet cannot be used.
* @return The password, or TQString() if it failes.
*/
static TQString readKOrnPassword( int box, int account, const TDEConfigBase& fallbackConfig );
/**
* This function gets a password with is puts in KWallet by KMail
* This function gets a password with is puts in TDEWallet by KMail
*
* @param accountnr The id of the KMail account
* @param fallbackConfig The configuration used if KWallet isn't available.
* @param fallbackConfig The configuration used if TDEWallet isn't available.
* @return The password, TQStirng::null if it failes.
*/
static TQString readKMailPassword( int accountnr, const TDEConfigBase& fallbackConfig );
@@ -64,22 +64,22 @@ public:
*
* @param box The boxnumber of the account.
* @param account The accountnumber of the account.
* @param fallbackConfig The configuration file if KWallet isn't available.
* @param fallbackConfig The configuration file if TDEWallet isn't available.
* @param password The password to be stored.
*/
static void writeKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig, const TQString& password );

/**
* This function deletes a password from both KWallet and the configuration file
* This function deletes a password from both TDEWallet and the configuration file
*
* @param box The boxnumber of the account.
* @param account The accountnumber of the account.
* @param fallbackConfig The configuration file if KWallet isn't available.
* @param fallbackConfig The configuration file if TDEWallet isn't available.
*/
static void deleteKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig );

/**
* This function deletes a password from KWallet
* This function deletes a password from TDEWallet
*
* @param box The boxnumber of the account.
* @param account The accountnumber of the account.
@@ -143,7 +143,7 @@ public:
static void rewritePassword( int box, int account, TDEConfigBase &config, bool newUseWalletValue );
/**
* If set to true, this class will try to use KWallet,
* If set to true, this class will try to use TDEWallet,
* if false, it will not.
*
* The default value is true.
@@ -159,7 +159,7 @@ private:
static TQString KMailDecrypt( const TQString& enc );
static KWallet::Wallet *m_wallet;
static TDEWallet::Wallet *m_wallet;
static bool m_openFailed;
static bool m_useWallet;
};

+ 1
- 1
tderesources/caldav/preferences.cpp View File

@@ -26,7 +26,7 @@
========================================================================*/

using namespace KCal;
using namespace KWallet;
using namespace TDEWallet;

/*=========================================================================
| CONSTANTS

+ 3
- 3
tderesources/caldav/preferences.h View File

@@ -33,7 +33,7 @@ namespace KCal {
/**
* This class provides access to ResourceCalDav preferences.
* It inherits auto-generated CalDavPrefsSkel class to add password-handling code.
* KWallet is used for storing passwords.
* TDEWallet is used for storing passwords.
* It also adds code to allow multiple CalDAV resources to store settings in the same
* config file.
*/
@@ -109,7 +109,7 @@ protected:
/**
* Returns the wallet or NULL, if the wallet can't be obtained.
*/
KWallet::Wallet* getWallet();
TDEWallet::Wallet* getWallet();

/**
* Tries to set a working folder for the wallet. If the wallet is not configured yet, does nothing.
@@ -150,7 +150,7 @@ private:
static const TQString WALLET_FOLDER;
static const TQString WALLET_PWD_SUFFIX;

KWallet::Wallet* mWallet;
TDEWallet::Wallet* mWallet;
bool mNoWallet;

TQString mPrefix;

+ 1
- 1
tderesources/carddav/preferences.cpp View File

@@ -25,7 +25,7 @@
========================================================================*/

using namespace TDEABC;
using namespace KWallet;
using namespace TDEWallet;

/*=========================================================================
| CONSTANTS

+ 3
- 3
tderesources/carddav/preferences.h View File

@@ -32,7 +32,7 @@ namespace TDEABC {
/**
* This class provides access to ResourceCardDav preferences.
* It inherits auto-generated CardDavPrefsSkel class to add password-handling code.
* KWallet is used for storing passwords.
* TDEWallet is used for storing passwords.
* It also adds code to allow multiple CardDAV resources to store settings in the same
* config file.
*/
@@ -100,7 +100,7 @@ protected:
/**
* Returns the wallet or NULL, if the wallet can't be obtained.
*/
KWallet::Wallet* getWallet();
TDEWallet::Wallet* getWallet();

/**
* Tries to set a working folder for the wallet. If the wallet is not configured yet, does nothing.
@@ -141,7 +141,7 @@ private:
static const TQString WALLET_FOLDER;
static const TQString WALLET_PWD_SUFFIX;

KWallet::Wallet* mWallet;
TDEWallet::Wallet* mWallet;
bool mNoWallet;

TQString mPrefix;

+ 3
- 3
tderesources/scalix/scalixadmin/passwordpage.cpp View File

@@ -162,13 +162,13 @@ void PasswordPage::finished( TDEIO::Job* job )
// Save only if the user choose it before
bool storePassword = group.readBoolEntry( "store-passwd", false );
if ( storePassword ) {
// First try to store in KWallet
if ( KWallet::Wallet::isEnabled() ) {
// First try to store in TDEWallet
if ( TDEWallet::Wallet::isEnabled() ) {
WId window = 0;
if ( tqApp->activeWindow() )
window = tqApp->activeWindow()->winId();

KWallet::Wallet *wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), window );
TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), window );
if ( wallet ) {
if ( !wallet->hasFolder( "kmail" ) )
wallet->createFolder( "kmail" );

+ 1
- 1
wizards/kmailchanges.cpp View File

@@ -31,7 +31,7 @@
#include <kdebug.h>
#include <kstringhandler.h>
#include <tdewallet.h>
using namespace KWallet;
using namespace TDEWallet;

static const char* s_folderContentsType[] = {
I18N_NOOP( "Calendar" ),

+ 2
- 2
wizards/kmailchanges.h View File

@@ -25,7 +25,7 @@
#include <tdeconfigpropagator.h>
#include <tdeconfig.h>

namespace KWallet {
namespace TDEWallet {
class Wallet;
}

@@ -107,7 +107,7 @@ class CreateImapAccount : public TDEConfigPropagator::Change
CustomWriter *mCustomWriter;

private:
static KWallet::Wallet *mWallet;
static TDEWallet::Wallet *mWallet;
};

class CreateDisconnectedImapAccount : public CreateImapAccount

+ 1
- 1
wizards/scalixwizard.cpp View File

@@ -409,7 +409,7 @@ ScalixWizard::ScalixWizard() : TDEConfigWizard( new ScalixPropagator )

mSavePasswordCheck = new TQCheckBox( i18n("Save password"), page );
topLayout->addMultiCellWidget( mSavePasswordCheck, 5, 5, 0, 1 );
TQWhatsThis::add( mSavePasswordCheck, i18n( "Shall the password be saved in KWallet?." ) );
TQWhatsThis::add( mSavePasswordCheck, i18n( "Shall the password be saved in TDEWallet?." ) );

label = new TQLabel( i18n( "Use Secure Connection:" ), page );
topLayout->addWidget( label, 6, 0 );

Loading…
Cancel
Save