From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- wizards/egroupwarewizard.cpp | 30 +++++++++++++++--------------- wizards/egroupwarewizard.h | 2 +- wizards/exchangewizard.cpp | 24 ++++++++++++------------ wizards/exchangewizard.h | 2 +- wizards/groupwisewizard.cpp | 24 ++++++++++++------------ wizards/groupwisewizard.h | 2 +- wizards/kmailchanges.cpp | 6 +++--- wizards/kmailchanges.h | 4 ++-- wizards/kolabkmailchanges.cpp | 24 ++++++++++++------------ wizards/kolabkmailchanges.h | 2 +- wizards/kolabwizard.cpp | 26 +++++++++++++------------- wizards/kolabwizard.h | 2 +- wizards/scalixkmailchanges.cpp | 24 ++++++++++++------------ wizards/scalixkmailchanges.h | 2 +- wizards/scalixwizard.cpp | 32 ++++++++++++++++---------------- wizards/scalixwizard.h | 2 +- wizards/servertype.h | 2 +- wizards/sloxwizard.cpp | 22 +++++++++++----------- wizards/sloxwizard.h | 2 +- 19 files changed, 117 insertions(+), 117 deletions(-) (limited to 'wizards') diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp index 8c0c37a1..d644d0e4 100644 --- a/wizards/egroupwarewizard.cpp +++ b/wizards/egroupwarewizard.cpp @@ -55,11 +55,11 @@ static TQString createURL( const TQString &server, bool useSSL, const TQString & return url.url(); } -class CreateEGroupwareKabcResource : public KConfigPropagator::Change +class CreateEGroupwareKabcResource : public TDEConfigPropagator::Change { public: CreateEGroupwareKabcResource() - : KConfigPropagator::Change( i18n("Create eGroupware Addressbook Resource") ) + : TDEConfigPropagator::Change( i18n("Create eGroupware Addressbook Resource") ) { } @@ -82,11 +82,11 @@ class CreateEGroupwareKabcResource : public KConfigPropagator::Change }; // TODO: fix the i18n strings after freeze... -class ChangeEGroupwareKabcResource : public KConfigPropagator::Change +class ChangeEGroupwareKabcResource : public TDEConfigPropagator::Change { public: ChangeEGroupwareKabcResource( const TQString &identifier ) - : KConfigPropagator::Change( i18n("Create eGroupware Addressbook Resource") ), + : TDEConfigPropagator::Change( i18n("Create eGroupware Addressbook Resource") ), mIdentifier( identifier ) { } @@ -120,11 +120,11 @@ class ChangeEGroupwareKabcResource : public KConfigPropagator::Change TQString mIdentifier; }; -class CreateEGroupwareKcalResource : public KConfigPropagator::Change +class CreateEGroupwareKcalResource : public TDEConfigPropagator::Change { public: CreateEGroupwareKcalResource() - : KConfigPropagator::Change( i18n( "Create eGroupware Calendar Resource" ) ) + : TDEConfigPropagator::Change( i18n( "Create eGroupware Calendar Resource" ) ) { } @@ -146,11 +146,11 @@ class CreateEGroupwareKcalResource : public KConfigPropagator::Change } }; -class ChangeEGroupwareKcalResource : public KConfigPropagator::Change +class ChangeEGroupwareKcalResource : public TDEConfigPropagator::Change { public: ChangeEGroupwareKcalResource( const TQString &identifier ) - : KConfigPropagator::Change( i18n( "Create eGroupware Calendar Resource" ) ), + : TDEConfigPropagator::Change( i18n( "Create eGroupware Calendar Resource" ) ), mIdentifier( identifier ) { } @@ -184,11 +184,11 @@ class ChangeEGroupwareKcalResource : public KConfigPropagator::Change TQString mIdentifier; }; -class CreateEGroupwareKnotesResource : public KConfigPropagator::Change +class CreateEGroupwareKnotesResource : public TDEConfigPropagator::Change { public: CreateEGroupwareKnotesResource() - : KConfigPropagator::Change( i18n("Create eGroupware Notes Resource") ) + : TDEConfigPropagator::Change( i18n("Create eGroupware Notes Resource") ) { } @@ -212,11 +212,11 @@ class CreateEGroupwareKnotesResource : public KConfigPropagator::Change } }; -class ChangeEGroupwareKnotesResource : public KConfigPropagator::Change +class ChangeEGroupwareKnotesResource : public TDEConfigPropagator::Change { public: ChangeEGroupwareKnotesResource( const TQString &identifier ) - : KConfigPropagator::Change( i18n("Create eGroupware Notes Resource") ), + : TDEConfigPropagator::Change( i18n("Create eGroupware Notes Resource") ), mIdentifier( identifier ) { } @@ -250,11 +250,11 @@ class ChangeEGroupwareKnotesResource : public KConfigPropagator::Change TQString mIdentifier; }; -class EGroupwarePropagator : public KConfigPropagator +class EGroupwarePropagator : public TDEConfigPropagator { public: EGroupwarePropagator() - : KConfigPropagator( EGroupwareConfig::self(), "egroupware.kcfg" ) + : TDEConfigPropagator( EGroupwareConfig::self(), "egroupware.kcfg" ) { } @@ -299,7 +299,7 @@ class EGroupwarePropagator : public KConfigPropagator } }; -EGroupwareWizard::EGroupwareWizard() : KConfigWizard( new EGroupwarePropagator ) +EGroupwareWizard::EGroupwareWizard() : TDEConfigWizard( new EGroupwarePropagator ) { TQFrame *page = createWizardPage( i18n( "eGroupware Server" ) ); diff --git a/wizards/egroupwarewizard.h b/wizards/egroupwarewizard.h index e01305df..2a920467 100644 --- a/wizards/egroupwarewizard.h +++ b/wizards/egroupwarewizard.h @@ -27,7 +27,7 @@ class KLineEdit; class TQCheckBox; -class KDE_EXPORT EGroupwareWizard : public KConfigWizard +class KDE_EXPORT EGroupwareWizard : public TDEConfigWizard { public: EGroupwareWizard(); diff --git a/wizards/exchangewizard.cpp b/wizards/exchangewizard.cpp index 84c2a13d..e243b2e2 100644 --- a/wizards/exchangewizard.cpp +++ b/wizards/exchangewizard.cpp @@ -43,11 +43,11 @@ i18n("Please select folders for events, to-dos and journal entries:") #endif -class CreateExchangeKcalResource : public KConfigPropagator::Change +class CreateExchangeKcalResource : public TDEConfigPropagator::Change { public: CreateExchangeKcalResource() - : KConfigPropagator::Change( i18n("Create Exchange Calendar Resource") ) + : TDEConfigPropagator::Change( i18n("Create Exchange Calendar Resource") ) { } @@ -59,7 +59,7 @@ class CreateExchangeKcalResource : public KConfigPropagator::Change KURL url( exchangeUrl() ); - KCal::ResourceExchange *r = new KCal::ResourceExchange( new KConfig );// url ); + KCal::ResourceExchange *r = new KCal::ResourceExchange( new TDEConfig );// url ); r->setResourceName( i18n("Exchange Server") ); r->prefs()->setUser( ExchangeConfig::self()->user() ); r->prefs()->setPassword( ExchangeConfig::self()->password() ); @@ -74,11 +74,11 @@ class CreateExchangeKcalResource : public KConfigPropagator::Change } }; -class UpdateExchangeKcalResource : public KConfigPropagator::Change +class UpdateExchangeKcalResource : public TDEConfigPropagator::Change { public: UpdateExchangeKcalResource() - : KConfigPropagator::Change( i18n("Update Exchange Calendar Resource") ) + : TDEConfigPropagator::Change( i18n("Update Exchange Calendar Resource") ) { } @@ -107,11 +107,11 @@ class UpdateExchangeKcalResource : public KConfigPropagator::Change } }; -class CreateExchangeKabcResource : public KConfigPropagator::Change +class CreateExchangeKabcResource : public TDEConfigPropagator::Change { public: CreateExchangeKabcResource() - : KConfigPropagator::Change( i18n("Create Exchange Addressbook Resource") ) + : TDEConfigPropagator::Change( i18n("Create Exchange Addressbook Resource") ) { } @@ -135,11 +135,11 @@ class CreateExchangeKabcResource : public KConfigPropagator::Change } }; -class UpdateExchangeKabcResource : public KConfigPropagator::Change +class UpdateExchangeKabcResource : public TDEConfigPropagator::Change { public: UpdateExchangeKabcResource() - : KConfigPropagator::Change( i18n("Update Exchange Addressbook Resource") ) + : TDEConfigPropagator::Change( i18n("Update Exchange Addressbook Resource") ) { } @@ -166,11 +166,11 @@ class UpdateExchangeKabcResource : public KConfigPropagator::Change }; -class ExchangePropagator : public KConfigPropagator +class ExchangePropagator : public TDEConfigPropagator { public: ExchangePropagator() - : KConfigPropagator( /*ExchangeConfig::self()*/ 0, "exchange.kcfg" ) + : TDEConfigPropagator( /*ExchangeConfig::self()*/ 0, "exchange.kcfg" ) { } @@ -223,7 +223,7 @@ class ExchangePropagator : public KConfigPropagator } }; -ExchangeWizard::ExchangeWizard() : KConfigWizard( new ExchangePropagator ) +ExchangeWizard::ExchangeWizard() : TDEConfigWizard( new ExchangePropagator ) { TQFrame *page = createWizardPage( i18n("Microsoft Exchange Server") ); TQGridLayout *topLayout = new TQGridLayout( page ); diff --git a/wizards/exchangewizard.h b/wizards/exchangewizard.h index d608f23b..f453356d 100644 --- a/wizards/exchangewizard.h +++ b/wizards/exchangewizard.h @@ -27,7 +27,7 @@ class KLineEdit; class TQCheckBox; class TQSpinBox; -class KDE_EXPORT ExchangeWizard : public KConfigWizard +class KDE_EXPORT ExchangeWizard : public TDEConfigWizard { public: ExchangeWizard(); diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index b28095bc..ecd472c8 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -50,11 +50,11 @@ TQString serverUrl() return url; } -class CreateGroupwiseKcalResource : public KConfigPropagator::Change +class CreateGroupwiseKcalResource : public TDEConfigPropagator::Change { public: CreateGroupwiseKcalResource() - : KConfigPropagator::Change( i18n("Create GroupWise Calendar Resource") ) + : TDEConfigPropagator::Change( i18n("Create GroupWise Calendar Resource") ) { } @@ -80,11 +80,11 @@ class CreateGroupwiseKcalResource : public KConfigPropagator::Change } }; -class UpdateGroupwiseKcalResource : public KConfigPropagator::Change +class UpdateGroupwiseKcalResource : public TDEConfigPropagator::Change { public: UpdateGroupwiseKcalResource() - : KConfigPropagator::Change( i18n("Update GroupWise Calendar Resource") ) + : TDEConfigPropagator::Change( i18n("Update GroupWise Calendar Resource") ) { } @@ -109,11 +109,11 @@ class UpdateGroupwiseKcalResource : public KConfigPropagator::Change } }; -class CreateGroupwiseKabcResource : public KConfigPropagator::Change +class CreateGroupwiseKabcResource : public TDEConfigPropagator::Change { public: CreateGroupwiseKabcResource() - : KConfigPropagator::Change( i18n("Create GroupWise Addressbook Resource") ) + : TDEConfigPropagator::Change( i18n("Create GroupWise Addressbook Resource") ) { } @@ -138,11 +138,11 @@ class CreateGroupwiseKabcResource : public KConfigPropagator::Change } }; -class UpdateGroupwiseKabcResource : public KConfigPropagator::Change +class UpdateGroupwiseKabcResource : public TDEConfigPropagator::Change { public: UpdateGroupwiseKabcResource() - : KConfigPropagator::Change( i18n("Update GroupWise Addressbook Resource") ) + : TDEConfigPropagator::Change( i18n("Update GroupWise Addressbook Resource") ) { } @@ -165,11 +165,11 @@ class UpdateGroupwiseKabcResource : public KConfigPropagator::Change }; -class GroupwisePropagator : public KConfigPropagator +class GroupwisePropagator : public TDEConfigPropagator { public: GroupwisePropagator() - : KConfigPropagator( GroupwiseConfig::self(), "groupwise.kcfg" ) + : TDEConfigPropagator( GroupwiseConfig::self(), "groupwise.kcfg" ) { } @@ -182,7 +182,7 @@ class GroupwisePropagator : public KConfigPropagator class Writer : public CreateDisconnectedImapAccount::CustomWriter { public: - void writeFolder( KConfig &, int ) {} + void writeFolder( TDEConfig &, int ) {} void writeIds( int accountId, int transportId ) { GroupwiseConfig::setKMailAccountId( accountId ); @@ -266,7 +266,7 @@ class GroupwisePropagator : public KConfigPropagator } }; -GroupwiseWizard::GroupwiseWizard() : KConfigWizard( new GroupwisePropagator ) +GroupwiseWizard::GroupwiseWizard() : TDEConfigWizard( new GroupwisePropagator ) { TQFrame *page = createWizardPage( i18n("Novell GroupWise") ); diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h index f3a7b4ff..073de386 100644 --- a/wizards/groupwisewizard.h +++ b/wizards/groupwisewizard.h @@ -28,7 +28,7 @@ class TQCheckBox; class TQSpinBox; class TQGroupBox; -class KDE_EXPORT GroupwiseWizard : public KConfigWizard +class KDE_EXPORT GroupwiseWizard : public TDEConfigWizard { Q_OBJECT diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp index 191ea843..abcd57d4 100644 --- a/wizards/kmailchanges.cpp +++ b/wizards/kmailchanges.cpp @@ -43,7 +43,7 @@ static const char* s_folderContentsType[] = { Wallet* CreateImapAccount::mWallet = 0; CreateImapAccount::CreateImapAccount( const TQString &accountName, const TQString &title ) - : KConfigPropagator::Change( title ), + : TDEConfigPropagator::Change( title ), mAccountName( accountName ), mPort( 993 ), mEnableSieve( false ), mEnableSavePassword( true ), mEncryption( None ), mAuthentication( NONE ), mAuthenticationSend( PLAIN ), mSmtpPort( 25 ), mExistingAccountId( -1 ), mExistingTransportId( -1 ), @@ -156,7 +156,7 @@ void CreateDisconnectedImapAccount::apply() { if ( mEmail.isEmpty() ) mEmail = mUser + "@" + mServer; - KConfig c( "kmailrc" ); + TDEConfig c( "kmailrc" ); c.setGroup( "General" ); c.writeEntry( "Default domain", mDefaultDomain ); int accountId; @@ -313,7 +313,7 @@ CreateOnlineImapAccount::CreateOnlineImapAccount(const TQString & accountName) : void CreateOnlineImapAccount::apply() { - KConfig c( "kmailrc" ); + TDEConfig c( "kmailrc" ); c.setGroup( "General" ); uint accCnt = c.readNumEntry( "accounts", 0 ); c.writeEntry( "accounts", accCnt+1 ); diff --git a/wizards/kmailchanges.h b/wizards/kmailchanges.h index 7622608d..f238b362 100644 --- a/wizards/kmailchanges.h +++ b/wizards/kmailchanges.h @@ -29,13 +29,13 @@ namespace KWallet { class Wallet; } -class CreateImapAccount : public KConfigPropagator::Change +class CreateImapAccount : public TDEConfigPropagator::Change { public: class CustomWriter { public: - virtual void writeFolder( KConfig &, int folderId ) = 0; + virtual void writeFolder( TDEConfig &, int folderId ) = 0; virtual void writeIds( int accountId, int transportId ) = 0; }; diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp index a77de303..0adfc46b 100644 --- a/wizards/kolabkmailchanges.cpp +++ b/wizards/kolabkmailchanges.cpp @@ -30,7 +30,7 @@ class KolabCustomWriter : public CreateDisconnectedImapAccount::CustomWriter { - void writeFolder( KConfig &c, int id ) + void writeFolder( TDEConfig &c, int id ) { c.setGroup( "IMAP Resource" ); c.writeEntry( "TheIMAPResourceAccount", id ); @@ -39,65 +39,65 @@ class KolabCustomWriter : public CreateDisconnectedImapAccount::CustomWriter void writeIds( int, int ) {} }; -void createKMailChanges( KConfigPropagator::Change::List& changes ) +void createKMailChanges( TDEConfigPropagator::Change::List& changes ) { - KConfigPropagator::ChangeConfig *c = new KConfigPropagator::ChangeConfig; + TDEConfigPropagator::ChangeConfig *c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "Groupware"; c->name = "Enabled"; c->value = "true"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "Groupware"; c->name = "AutoAccept"; c->value = "false"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "Groupware"; c->name = "AutoDeclConflict"; c->value = "false"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "Groupware"; c->name = "LegacyMangleFromToHeaders"; c->value = "true"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "Groupware"; c->name = "LegacyBodyInvites"; c->value = "true"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "IMAP Resource"; c->name = "Enabled"; c->value = "true"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "IMAP Resource"; c->name = "TheIMAPResourceEnabled"; c->value = "true"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "IMAP Resource"; c->name = "TheIMAPResourceStorageFormat"; c->value = KolabConfig::self()->kolab1Legacy() ? "IcalVcard" : "XML"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "IMAP Resource"; c->name = "Folder Language"; @@ -123,7 +123,7 @@ void createKMailChanges( KConfigPropagator::Change::List& changes ) user = email = user+"@"+KolabConfig::self()->server(); if ( KolabConfig::self()->useOnlineForNonGroupware() ) { - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "IMAP Resource"; c->name = "ShowOnlyGroupwareFoldersForGroupwareAccount"; diff --git a/wizards/kolabkmailchanges.h b/wizards/kolabkmailchanges.h index 4ccf69c4..74d07691 100644 --- a/wizards/kolabkmailchanges.h +++ b/wizards/kolabkmailchanges.h @@ -23,6 +23,6 @@ #include -void createKMailChanges( KConfigPropagator::Change::List& ); +void createKMailChanges( TDEConfigPropagator::Change::List& ); #endif diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp index 857ed3e9..a3549384 100644 --- a/wizards/kolabwizard.cpp +++ b/wizards/kolabwizard.cpp @@ -42,11 +42,11 @@ #include #include -class SetupLDAPSearchAccount : public KConfigPropagator::Change +class SetupLDAPSearchAccount : public TDEConfigPropagator::Change { public: SetupLDAPSearchAccount() - : KConfigPropagator::Change( i18n("Setup LDAP Search Account") ) + : TDEConfigPropagator::Change( i18n("Setup LDAP Search Account") ) { } @@ -67,7 +67,7 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change basedn = h; } { // while we're here, write default domain - KConfig c( "kmailrc" ); + TDEConfig c( "kmailrc" ); c.setGroup( "General" ); c.writeEntry( "Default domain", basedn ); } @@ -76,7 +76,7 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change basedn.prepend("dc="); // Set the changes - KConfig c( "kabldaprc" ); + TDEConfig c( "kabldaprc" ); c.setGroup( "LDAP" ); bool hasMyServer = false; uint selHosts = c.readNumEntry("NumSelectedHosts", 0); @@ -93,11 +93,11 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change }; -class CreateCalendarImapResource : public KConfigPropagator::Change +class CreateCalendarImapResource : public TDEConfigPropagator::Change { public: CreateCalendarImapResource() - : KConfigPropagator::Change( i18n("Create Calendar IMAP Resource") ) + : TDEConfigPropagator::Change( i18n("Create Calendar IMAP Resource") ) { } @@ -113,11 +113,11 @@ class CreateCalendarImapResource : public KConfigPropagator::Change } }; -class CreateContactImapResource : public KConfigPropagator::Change +class CreateContactImapResource : public TDEConfigPropagator::Change { public: CreateContactImapResource() - : KConfigPropagator::Change( i18n("Create Contact IMAP Resource") ) + : TDEConfigPropagator::Change( i18n("Create Contact IMAP Resource") ) { } @@ -134,11 +134,11 @@ class CreateContactImapResource : public KConfigPropagator::Change }; -class CreateNotesImapResource : public KConfigPropagator::Change +class CreateNotesImapResource : public TDEConfigPropagator::Change { public: CreateNotesImapResource() - : KConfigPropagator::Change( i18n("Create Notes IMAP Resource") ) + : TDEConfigPropagator::Change( i18n("Create Notes IMAP Resource") ) { } @@ -156,11 +156,11 @@ class CreateNotesImapResource : public KConfigPropagator::Change }; -class KolabPropagator : public KConfigPropagator +class KolabPropagator : public TDEConfigPropagator { public: KolabPropagator() - : KConfigPropagator( KolabConfig::self(), "kolab.kcfg" ) + : TDEConfigPropagator( KolabConfig::self(), "kolab.kcfg" ) { } @@ -252,7 +252,7 @@ class KolabPropagator : public KConfigPropagator } }; -KolabWizard::KolabWizard() : KConfigWizard( new KolabPropagator ) +KolabWizard::KolabWizard() : TDEConfigWizard( new KolabPropagator ) { TQFrame *page = createWizardPage( i18n("Kolab Server") ); diff --git a/wizards/kolabwizard.h b/wizards/kolabwizard.h index 6a5539ab..eec25233 100644 --- a/wizards/kolabwizard.h +++ b/wizards/kolabwizard.h @@ -29,7 +29,7 @@ class KLineEdit; class TQCheckBox; class TQRadioButton; -class KDE_EXPORT KolabWizard : public KConfigWizard +class KDE_EXPORT KolabWizard : public TDEConfigWizard { public: KolabWizard(); diff --git a/wizards/scalixkmailchanges.cpp b/wizards/scalixkmailchanges.cpp index 56c18afe..4926678e 100644 --- a/wizards/scalixkmailchanges.cpp +++ b/wizards/scalixkmailchanges.cpp @@ -30,7 +30,7 @@ class ScalixCustomWriter : public CreateDisconnectedImapAccount::CustomWriter { - void writeFolder( KConfig &c, int id ) + void writeFolder( TDEConfig &c, int id ) { c.setGroup( "IMAP Resource" ); c.writeEntry( "TheIMAPResourceAccount", id ); @@ -40,65 +40,65 @@ class ScalixCustomWriter : public CreateDisconnectedImapAccount::CustomWriter void writeIds( int, int ) {} }; -void createKMailChanges( KConfigPropagator::Change::List& changes ) +void createKMailChanges( TDEConfigPropagator::Change::List& changes ) { - KConfigPropagator::ChangeConfig *c = new KConfigPropagator::ChangeConfig; + TDEConfigPropagator::ChangeConfig *c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "Groupware"; c->name = "Enabled"; c->value = "true"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "Groupware"; c->name = "AutoAccept"; c->value = "false"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "Groupware"; c->name = "AutoDeclConflict"; c->value = "false"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "Groupware"; c->name = "LegacyMangleFromToHeaders"; c->value = "true"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "Groupware"; c->name = "LegacyBodyInvites"; c->value = "true"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "IMAP Resource"; c->name = "Enabled"; c->value = "true"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "IMAP Resource"; c->name = "TheIMAPResourceEnabled"; c->value = "true"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "IMAP Resource"; c->name = "TheIMAPResourceStorageFormat"; c->value = "IcalVcard"; changes.append( c ); - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "IMAP Resource"; c->name = "Folder Language"; @@ -106,7 +106,7 @@ void createKMailChanges( KConfigPropagator::Change::List& changes ) changes.append( c ); // Don't show the account wizard as we created an account already - c = new KConfigPropagator::ChangeConfig; + c = new TDEConfigPropagator::ChangeConfig; c->file = "kmailrc"; c->group = "AccountWizard"; c->name = "ShowOnStartup"; diff --git a/wizards/scalixkmailchanges.h b/wizards/scalixkmailchanges.h index 85279e08..91ae7b30 100644 --- a/wizards/scalixkmailchanges.h +++ b/wizards/scalixkmailchanges.h @@ -23,6 +23,6 @@ #include -void createKMailChanges( KConfigPropagator::Change::List& ); +void createKMailChanges( TDEConfigPropagator::Change::List& ); #endif diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp index f7be16a6..f6acd0e5 100644 --- a/wizards/scalixwizard.cpp +++ b/wizards/scalixwizard.cpp @@ -48,11 +48,11 @@ #include -class SetupLDAPSearchAccount : public KConfigPropagator::Change +class SetupLDAPSearchAccount : public TDEConfigPropagator::Change { public: SetupLDAPSearchAccount() - : KConfigPropagator::Change( i18n("Setup LDAP Search Account") ) + : TDEConfigPropagator::Change( i18n("Setup LDAP Search Account") ) { } @@ -63,13 +63,13 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change TQString basedn( "o=Scalix" ); { // while we're here, write default domain - KConfig c( "kmailrc" ); + TDEConfig c( "kmailrc" ); c.setGroup( "General" ); c.writeEntry( "Default domain", basedn ); } // Set the changes - KConfig c( "kabldaprc" ); + TDEConfig c( "kabldaprc" ); c.setGroup( "LDAP" ); bool hasMyServer = false; uint selHosts = c.readNumEntry("NumSelectedHosts", 0); @@ -86,17 +86,17 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change }; -class SetupScalixAdmin : public KConfigPropagator::Change +class SetupScalixAdmin : public TDEConfigPropagator::Change { public: SetupScalixAdmin() - : KConfigPropagator::Change( i18n( "Setup ScalixAdmin Account" ) ) + : TDEConfigPropagator::Change( i18n( "Setup ScalixAdmin Account" ) ) { } void apply() { - KConfig c( "scalixadminrc" ); + TDEConfig c( "scalixadminrc" ); c.setGroup( "Account" ); c.writeEntry( "user", ScalixConfig::self()->user() ); @@ -149,11 +149,11 @@ class SetupScalixAdmin : public KConfigPropagator::Change } }; -class CreateCalendarImapResource : public KConfigPropagator::Change +class CreateCalendarImapResource : public TDEConfigPropagator::Change { public: CreateCalendarImapResource() - : KConfigPropagator::Change( i18n("Create Calendar IMAP Resource") ) + : TDEConfigPropagator::Change( i18n("Create Calendar IMAP Resource") ) { } @@ -169,11 +169,11 @@ class CreateCalendarImapResource : public KConfigPropagator::Change } }; -class CreateContactImapResource : public KConfigPropagator::Change +class CreateContactImapResource : public TDEConfigPropagator::Change { public: CreateContactImapResource() - : KConfigPropagator::Change( i18n("Create Contact IMAP Resource") ) + : TDEConfigPropagator::Change( i18n("Create Contact IMAP Resource") ) { } @@ -190,11 +190,11 @@ class CreateContactImapResource : public KConfigPropagator::Change }; -class SynchronizeScalixAccount : public KConfigPropagator::Change +class SynchronizeScalixAccount : public TDEConfigPropagator::Change { public: SynchronizeScalixAccount() - : KConfigPropagator::Change( i18n("Synchronize Scalix Account") ) + : TDEConfigPropagator::Change( i18n("Synchronize Scalix Account") ) { } @@ -238,11 +238,11 @@ class SynchronizeScalixAccount : public KConfigPropagator::Change }; -class ScalixPropagator : public KConfigPropagator +class ScalixPropagator : public TDEConfigPropagator { public: ScalixPropagator() - : KConfigPropagator( ScalixConfig::self(), "scalix.kcfg" ) + : TDEConfigPropagator( ScalixConfig::self(), "scalix.kcfg" ) { } @@ -360,7 +360,7 @@ class ScalixPropagator : public KConfigPropagator } }; -ScalixWizard::ScalixWizard() : KConfigWizard( new ScalixPropagator ) +ScalixWizard::ScalixWizard() : TDEConfigWizard( new ScalixPropagator ) { TQFrame *page = createWizardPage( i18n("Scalix Server") ); diff --git a/wizards/scalixwizard.h b/wizards/scalixwizard.h index ae881629..6ff44b05 100644 --- a/wizards/scalixwizard.h +++ b/wizards/scalixwizard.h @@ -29,7 +29,7 @@ class KComboBox; class KLineEdit; class TQCheckBox; -class KDE_EXPORT ScalixWizard : public KConfigWizard +class KDE_EXPORT ScalixWizard : public TDEConfigWizard { public: ScalixWizard(); diff --git a/wizards/servertype.h b/wizards/servertype.h index 632bdd42..c7d8e7ea 100644 --- a/wizards/servertype.h +++ b/wizards/servertype.h @@ -94,7 +94,7 @@ class ServerType : public TQObject */ virtual void activateConnection( const TQString& uid, bool active ) = 0; - virtual KConfigPropagator::Change::List changes() = 0; + virtual TDEConfigPropagator::Change::List changes() = 0; }; diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp index 5d5481b9..9cdd5538 100644 --- a/wizards/sloxwizard.cpp +++ b/wizards/sloxwizard.cpp @@ -48,11 +48,11 @@ TQString sloxUrl() return url; } -class CreateSloxKcalResource : public KConfigPropagator::Change +class CreateSloxKcalResource : public TDEConfigPropagator::Change { public: CreateSloxKcalResource() - : KConfigPropagator::Change( i18n("Create SLOX Calendar Resource") ) + : TDEConfigPropagator::Change( i18n("Create SLOX Calendar Resource") ) { } @@ -77,11 +77,11 @@ class CreateSloxKcalResource : public KConfigPropagator::Change } }; -class UpdateSloxKcalResource : public KConfigPropagator::Change +class UpdateSloxKcalResource : public TDEConfigPropagator::Change { public: UpdateSloxKcalResource() - : KConfigPropagator::Change( i18n("Update SLOX Calendar Resource") ) + : TDEConfigPropagator::Change( i18n("Update SLOX Calendar Resource") ) { } @@ -108,11 +108,11 @@ class UpdateSloxKcalResource : public KConfigPropagator::Change } }; -class CreateSloxKabcResource : public KConfigPropagator::Change +class CreateSloxKabcResource : public TDEConfigPropagator::Change { public: CreateSloxKabcResource() - : KConfigPropagator::Change( i18n("Create SLOX Addressbook Resource") ) + : TDEConfigPropagator::Change( i18n("Create SLOX Addressbook Resource") ) { } @@ -134,11 +134,11 @@ class CreateSloxKabcResource : public KConfigPropagator::Change } }; -class UpdateSloxKabcResource : public KConfigPropagator::Change +class UpdateSloxKabcResource : public TDEConfigPropagator::Change { public: UpdateSloxKabcResource() - : KConfigPropagator::Change( i18n("Update SLOX Addressbook Resource") ) + : TDEConfigPropagator::Change( i18n("Update SLOX Addressbook Resource") ) { } @@ -163,11 +163,11 @@ class UpdateSloxKabcResource : public KConfigPropagator::Change }; -class SloxPropagator : public KConfigPropagator +class SloxPropagator : public TDEConfigPropagator { public: SloxPropagator() - : KConfigPropagator( SloxConfig::self(), "slox.kcfg" ) + : TDEConfigPropagator( SloxConfig::self(), "slox.kcfg" ) { } @@ -219,7 +219,7 @@ class SloxPropagator : public KConfigPropagator } }; -SloxWizard::SloxWizard() : KConfigWizard( new SloxPropagator ) +SloxWizard::SloxWizard() : TDEConfigWizard( new SloxPropagator ) { TQFrame *page = createWizardPage( i18n("SUSE LINUX OpenExchange Server") ); diff --git a/wizards/sloxwizard.h b/wizards/sloxwizard.h index e5f7f5d3..f43525d1 100644 --- a/wizards/sloxwizard.h +++ b/wizards/sloxwizard.h @@ -26,7 +26,7 @@ class KLineEdit; class TQCheckBox; -class KDE_EXPORT SloxWizard : public KConfigWizard +class KDE_EXPORT SloxWizard : public TDEConfigWizard { public: SloxWizard(); -- cgit v1.2.3