diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
commit | 86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch) | |
tree | 97d3ac2c2f60780d9a1de4f82caac7cb27534501 /korn/kmail_proto.cpp | |
parent | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff) | |
download | tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'korn/kmail_proto.cpp')
-rw-r--r-- | korn/kmail_proto.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp index fb6166c31..8f740c80a 100644 --- a/korn/kmail_proto.cpp +++ b/korn/kmail_proto.cpp @@ -51,9 +51,9 @@ KMail_Protocol::~KMail_Protocol() { } -const Protocol* KMail_Protocol::getProtocol( KConfigGroup* config ) const +const Protocol* KMail_Protocol::getProtocol( TDEConfigGroup* config ) const { - KConfig kmailconfig( "kmailrc", true, false ); + TDEConfig kmailconfig( "kmailrc", true, false ); int id; TQString type = getTypeAndConfig( config->readEntry( "kmailname" ), kmailconfig, id ); @@ -73,10 +73,10 @@ const Protocol* KMail_Protocol::getProtocol( KConfigGroup* config ) const return 0; } -KMailDrop* KMail_Protocol::createMaildrop( KConfigGroup *config ) const +KMailDrop* KMail_Protocol::createMaildrop( TDEConfigGroup *config ) const { int id; - KConfig kmailconfig( "kmailrc", true, false ); + TDEConfig kmailconfig( "kmailrc", true, false ); TQString type = getTypeAndConfig( config->readEntry( "kmailname" ), kmailconfig, id ); if( type == "imap" || type == "cachedimap" || type == "pop" || type == "local" || type == "maildir" ) @@ -86,11 +86,11 @@ KMailDrop* KMail_Protocol::createMaildrop( KConfigGroup *config ) const return 0; } -TQMap< TQString, TQString > * KMail_Protocol::createConfig( KConfigGroup* config, const TQString& ) const +TQMap< TQString, TQString > * KMail_Protocol::createConfig( TDEConfigGroup* config, const TQString& ) const { TQMap< TQString, TQString > *result = new TQMap<TQString, TQString>; int id; - KConfig kmailconfig( "kmailrc", true, false ); + TDEConfig kmailconfig( "kmailrc", true, false ); //First: find the account in the configuration and get the type and id out of it. TQString type = getTypeAndConfig( config->readEntry( "kmailname" ), kmailconfig, id ); TQString metadata; @@ -184,7 +184,7 @@ void KMail_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObje TQString name; int nummer = kmailFirstGroup - 1; - KConfig kmailconfig( "kmailrc", true, false ); + TDEConfig kmailconfig( "kmailrc", true, false ); while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) ) { kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) ); @@ -209,7 +209,7 @@ void KMail_Protocol::writeEntries( TQMap< TQString, TQString >* ) const //The configuartion is read out on the right way } -TQString KMail_Protocol::readPassword( bool store, const KConfigBase& config, int id ) const +TQString KMail_Protocol::readPassword( bool store, const TDEConfigBase& config, int id ) const { if( !store ) return ""; @@ -217,7 +217,7 @@ TQString KMail_Protocol::readPassword( bool store, const KConfigBase& config, in return KOrnPassword::readKMailPassword( id, config ); } -TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, KConfig &kmailconfig, int &id ) const +TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, TDEConfig &kmailconfig, int &id ) const { int nummer = kmailFirstGroup - 1; bool found = false; |