summaryrefslogtreecommitdiffstats
path: root/libtdepim
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /libtdepim
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libtdepim')
-rw-r--r--libtdepim/TODO4
-rw-r--r--libtdepim/addresseeemailselection.cpp2
-rw-r--r--libtdepim/addresseelineedit.cpp4
-rw-r--r--libtdepim/addresseelineedit.h2
-rw-r--r--libtdepim/addresseeview.cpp26
-rw-r--r--libtdepim/addresseeview.h12
-rw-r--r--libtdepim/cfgc/README2
-rw-r--r--libtdepim/completionordereditor.cpp6
-rw-r--r--libtdepim/completionordereditor.h4
-rw-r--r--libtdepim/groupwarejob.cpp10
-rw-r--r--libtdepim/groupwarejob.h6
-rw-r--r--libtdepim/kabcresourcecached.cpp8
-rw-r--r--libtdepim/kabcresourcecached.h6
-rw-r--r--libtdepim/kabcresourcenull.h2
-rw-r--r--libtdepim/kaccount.cpp4
-rw-r--r--libtdepim/kaccount.h10
-rw-r--r--libtdepim/kaddrbook.cpp2
-rw-r--r--libtdepim/kcmdesignerfields.cpp8
-rw-r--r--libtdepim/kcmdesignerfields.h2
-rw-r--r--libtdepim/kconfigpropagator.cpp52
-rw-r--r--libtdepim/kconfigpropagator.h26
-rw-r--r--libtdepim/kconfigwizard.cpp48
-rw-r--r--libtdepim/kconfigwizard.h22
-rw-r--r--libtdepim/kfoldertree.cpp6
-rw-r--r--libtdepim/kimportdialog.cpp2
-rw-r--r--libtdepim/komposer/core/prefsmodule.cpp2
-rw-r--r--libtdepim/kpimprefs.cpp4
-rw-r--r--libtdepim/kpimprefs.h2
-rw-r--r--libtdepim/kprefsdialog.cpp88
-rw-r--r--libtdepim/kprefsdialog.h126
-rw-r--r--libtdepim/kresourceprefs.cpp6
-rw-r--r--libtdepim/kresourceprefs.h2
-rw-r--r--libtdepim/ldapclient.cpp36
-rw-r--r--libtdepim/ldapclient.h16
-rw-r--r--libtdepim/ldapsearchdialog.cpp8
-rw-r--r--libtdepim/recentaddresses.cpp12
-rw-r--r--libtdepim/recentaddresses.h10
-rw-r--r--libtdepim/resourceabc.cpp2
-rw-r--r--libtdepim/resourceabc.h2
-rw-r--r--libtdepim/tests/testdistrlist.cpp4
-rw-r--r--libtdepim/tests/testwizard.cpp6
41 files changed, 301 insertions, 301 deletions
diff --git a/libtdepim/TODO b/libtdepim/TODO
index f6c5214c3..3bca9b1a0 100644
--- a/libtdepim/TODO
+++ b/libtdepim/TODO
@@ -1,10 +1,10 @@
-KConfigPropagator:
+TDEConfigPropagator:
- Title for all changes.
- Write DTD for extended kcfg file.
- Check validity of rules against the installed kcfg files.
- Turn public members of Change, Rule, Condition into proper accessors/mutators
-KConfigWizard:
+TDEConfigWizard:
- More pretty changes view.
diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp
index fe66adbd8..c2c6ff4f4 100644
--- a/libtdepim/addresseeemailselection.cpp
+++ b/libtdepim/addresseeemailselection.cpp
@@ -201,7 +201,7 @@ TQString AddresseeEmailSelection::addressBookTitle( uint index ) const
KABC::Addressee::List AddresseeEmailSelection::addressBookContent( uint index ) const
{
if ( index == 0 ) {
- KConfig config( "kmailrc" );
+ TDEConfig config( "kmailrc" );
return RecentAddresses::self( &config )->kabcAddresses();
} else {
return KABC::Addressee::List();
diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp
index 3b55024b6..dbe032b2c 100644
--- a/libtdepim/addresseelineedit.cpp
+++ b/libtdepim/addresseelineedit.cpp
@@ -552,7 +552,7 @@ void AddresseeLineEdit::loadContacts()
TQApplication::setOverrideCursor( KCursor::waitCursor() ); // loading might take a while
- KConfig config( "kpimcompletionorder" ); // The weights for non-imap kabc resources is there.
+ TDEConfig config( "kpimcompletionorder" ); // The weights for non-imap kabc resources is there.
config.setGroup( "CompletionWeights" );
KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
@@ -1008,7 +1008,7 @@ void KPIM::AddresseeLineEdit::slotCompletion()
// not cached, to make sure we get an up-to-date value when it changes
KCompletion::CompOrder KPIM::AddresseeLineEdit::completionOrder()
{
- KConfig config( "kpimcompletionorder" );
+ TDEConfig config( "kpimcompletionorder" );
config.setGroup( "General" );
const TQString order = config.readEntry( "CompletionOrder", "Weighted" );
diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h
index 3c98fe132..7cf3a340c 100644
--- a/libtdepim/addresseelineedit.h
+++ b/libtdepim/addresseelineedit.h
@@ -39,7 +39,7 @@
#include <dcopobject.h>
#include <tdepimmacros.h>
-class KConfig;
+class TDEConfig;
namespace KPIM {
class LdapSearch;
diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index 5be001a67..559f01713 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -51,7 +51,7 @@
using namespace KPIM;
AddresseeView::AddresseeView( TQWidget *parent, const char *name,
- KConfig *config )
+ TDEConfig *config )
: KTextBrowser( parent, name ), mDefaultConfig( false ), mImageJob( 0 ),
mLinkMask( AddressLinks | EmailLinks | PhoneLinks | URLLinks | IMLinks | CustomFields )
{
@@ -97,7 +97,7 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name,
connect( mActionShowCustomFields, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) );
if ( !config ) {
- mConfig = new KConfig( "kaddressbookrc" );
+ mConfig = new TDEConfig( "kaddressbookrc" );
mDefaultConfig = true;
} else
mConfig = config;
@@ -546,11 +546,11 @@ void AddresseeView::updateView()
if ( mImageData.count() > 0 )
TQMimeSourceFactory::defaultFactory()->setImage( imageURL, TQImage(mImageData) );
else {
- mImageJob = KIO::get( KURL( picture.url() ), false, false );
- connect( mImageJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
- connect( mImageJob, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( result( KIO::Job* ) ) );
+ mImageJob = TDEIO::get( KURL( picture.url() ), false, false );
+ connect( mImageJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( mImageJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( result( TDEIO::Job* ) ) );
}
} else {
TQMimeSourceFactory::defaultFactory()->setPixmap( imageURL,
@@ -582,7 +582,7 @@ void AddresseeView::emailClicked( const TQString &email )
void AddresseeView::phoneNumberClicked( const TQString &number )
{
- KConfig config( "kaddressbookrc" );
+ TDEConfig config( "kaddressbookrc" );
config.setGroup( "General" );
TQString commandLine = config.readEntry( "PhoneHookApplication" );
@@ -597,7 +597,7 @@ void AddresseeView::phoneNumberClicked( const TQString &number )
void AddresseeView::smsTextClicked( const TQString &number )
{
- KConfig config( "kaddressbookrc" );
+ TDEConfig config( "kaddressbookrc" );
config.setGroup( "General" );
TQString commandLine = config.readEntry( "SMSHookApplication" );
@@ -614,7 +614,7 @@ void AddresseeView::smsTextClicked( const TQString &number )
void AddresseeView::sendSMS( const TQString &number, const TQString &text )
{
- KConfig config( "kaddressbookrc" );
+ TDEConfig config( "kaddressbookrc" );
config.setGroup( "General" );
TQString commandLine = config.readEntry( "SMSHookApplication" );
@@ -631,7 +631,7 @@ void AddresseeView::sendSMS( const TQString &number, const TQString &text )
void AddresseeView::faxNumberClicked( const TQString &number )
{
- KConfig config( "kaddressbookrc" );
+ TDEConfig config( "kaddressbookrc" );
config.setGroup( "General" );
TQString commandLine = config.readEntry( "FaxHookApplication", "tdeprintfax --phone %N" );
@@ -734,14 +734,14 @@ void AddresseeView::configChanged()
updateView();
}
-void AddresseeView::data( KIO::Job*, const TQByteArray &d )
+void AddresseeView::data( TDEIO::Job*, const TQByteArray &d )
{
unsigned int oldSize = mImageData.size();
mImageData.resize( oldSize + d.size() );
memcpy( mImageData.data() + oldSize, d.data(), d.size() );
}
-void AddresseeView::result( KIO::Job *job )
+void AddresseeView::result( TDEIO::Job *job )
{
mImageJob = 0;
diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h
index 98a779832..782f4416e 100644
--- a/libtdepim/addresseeview.h
+++ b/libtdepim/addresseeview.h
@@ -29,7 +29,7 @@
#include <kimproxy.h>
#include <tdepimmacros.h>
-namespace KIO {
+namespace TDEIO {
class Job;
}
class KToggleAction;
@@ -52,7 +52,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
which fields will be shown.
*/
AddresseeView( TQWidget *parent = 0, const char *name = 0,
- KConfig *config = 0 );
+ TDEConfig *config = 0 );
~AddresseeView();
@@ -167,8 +167,8 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
void slotPresenceInfoExpired();
void configChanged();
- void data( KIO::Job*, const TQByteArray& );
- void result( KIO::Job* );
+ void data( TDEIO::Job*, const TQByteArray& );
+ void result( TDEIO::Job* );
private:
void load();
@@ -178,11 +178,11 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
TQString strippedNumber( const TQString &number );
- KConfig *mConfig;
+ TDEConfig *mConfig;
bool mDefaultConfig;
TQByteArray mImageData;
- KIO::Job *mImageJob;
+ TDEIO::Job *mImageJob;
KToggleAction *mActionShowBirthday;
KToggleAction *mActionShowAddresses;
diff --git a/libtdepim/cfgc/README b/libtdepim/cfgc/README
index 6a7783817..720ea2126 100644
--- a/libtdepim/cfgc/README
+++ b/libtdepim/cfgc/README
@@ -1,5 +1,5 @@
This directory contains text and example code for automatic creation of
-configuration dialogs based on KConfigSkeleton, kconfig_compiler and
+configuration dialogs based on TDEConfigSkeleton, kconfig_compiler and
KPrefsDialog.
If you have questions or comments please contact Cornelius Schumacher
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 68339f9e1..2e455fe10 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -100,7 +100,7 @@ private:
void LDAPCompletionItem::save( CompletionOrderEditor* )
{
- KConfig * config = LdapSearch::config();
+ TDEConfig * config = LdapSearch::config();
config->setGroup( "LDAP" );
config->writeEntry( TQString( "SelectedCompletionWeight%1" ).arg( mLdapClient->clientNumber() ),
mWeight );
@@ -113,7 +113,7 @@ class SimpleCompletionItem : public CompletionItem
public:
SimpleCompletionItem( CompletionOrderEditor* editor, const TQString& label, const TQString& identifier, int weight )
: mLabel( label ), mIdentifier( identifier ) {
- KConfigGroup group( editor->configFile(), "CompletionWeights" );
+ TDEConfigGroup group( editor->configFile(), "CompletionWeights" );
mWeight = group.readNumEntry( mIdentifier, weight );
}
virtual TQString label() const { return mLabel; }
@@ -130,7 +130,7 @@ void SimpleCompletionItem::save( CompletionOrderEditor* editor )
{
// Maybe KABC::Resource could have a completionWeight setting (for readConfig/writeConfig)
// But for tdelibs-3.2 compat purposes I can't do that.
- KConfigGroup group( editor->configFile(), "CompletionWeights" );
+ TDEConfigGroup group( editor->configFile(), "CompletionWeights" );
group.writeEntry( mIdentifier, mWeight );
}
diff --git a/libtdepim/completionordereditor.h b/libtdepim/completionordereditor.h
index 6a87b3076..a755d1734 100644
--- a/libtdepim/completionordereditor.h
+++ b/libtdepim/completionordereditor.h
@@ -69,7 +69,7 @@ public:
CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* parent, const char* name = 0 );
~CompletionOrderEditor();
- KConfig* configFile() { return &mConfig; }
+ TDEConfig* configFile() { return &mConfig; }
private slots:
void slotSelectionChanged( TQListViewItem* );
@@ -78,7 +78,7 @@ private slots:
virtual void slotOk();
private:
- KConfig mConfig;
+ TDEConfig mConfig;
CompletionItemList mItems;
KListView* mListView;
KPushButton* mUpButton;
diff --git a/libtdepim/groupwarejob.cpp b/libtdepim/groupwarejob.cpp
index bd413e12b..22c9b7aa4 100644
--- a/libtdepim/groupwarejob.cpp
+++ b/libtdepim/groupwarejob.cpp
@@ -24,24 +24,24 @@
#include <kio/job.h>
#include <kdebug.h>
-using namespace KIO;
+using namespace TDEIO;
-KIO::TransferJob *GroupwareJob::getCalendar( const KURL &u )
+TDEIO::TransferJob *GroupwareJob::getCalendar( const KURL &u )
{
KURL url = u;
url.setPath( "/calendar/" );
kdDebug() << "GroupwareJob::getCalendar(): URL: " << url << endl;
- return KIO::get( url, false, false );
+ return TDEIO::get( url, false, false );
}
-KIO::TransferJob *GroupwareJob::getAddressBook( const KURL &u )
+TDEIO::TransferJob *GroupwareJob::getAddressBook( const KURL &u )
{
KURL url = u;
url.setPath( "/addressbook/" );
kdDebug() << "GroupwareJob::getAddressBook(): URL: " << url << endl;
- return KIO::get( url, false, false );
+ return TDEIO::get( url, false, false );
}
diff --git a/libtdepim/groupwarejob.h b/libtdepim/groupwarejob.h
index bf5a33f6e..2fc2069b0 100644
--- a/libtdepim/groupwarejob.h
+++ b/libtdepim/groupwarejob.h
@@ -23,13 +23,13 @@
#include <kio/jobclasses.h>
-namespace KIO {
+namespace TDEIO {
class GroupwareJob
{
public:
- static KIO::TransferJob *getCalendar( const KURL & );
- static KIO::TransferJob *getAddressBook( const KURL & );
+ static TDEIO::TransferJob *getCalendar( const KURL & );
+ static TDEIO::TransferJob *getAddressBook( const KURL & );
};
}
diff --git a/libtdepim/kabcresourcecached.cpp b/libtdepim/kabcresourcecached.cpp
index eece76351..510ef2f83 100644
--- a/libtdepim/kabcresourcecached.cpp
+++ b/libtdepim/kabcresourcecached.cpp
@@ -29,7 +29,7 @@
using namespace KABC;
-ResourceCached::ResourceCached( const KConfig *config )
+ResourceCached::ResourceCached( const TDEConfig *config )
: KABC::Resource( config ), mIdMapper( "kabc/uidmaps/" ),
mReloadPolicy( ReloadInterval ), mReloadInterval( 10 ),
mKABCReloadTimer( 0, "mKABCReloadTimer" ), mReloaded( false ),
@@ -40,7 +40,7 @@ ResourceCached::ResourceCached( const KConfig *config )
connect( &mKABCSaveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotKABCSave() ) );
if (config)
- this->readConfig(const_cast<KConfig *>(config));
+ this->readConfig(const_cast<TDEConfig *>(config));
}
ResourceCached::~ResourceCached()
@@ -91,7 +91,7 @@ int ResourceCached::saveInterval() const
return mSaveInterval;
}
-void ResourceCached::writeConfig( KConfig *config )
+void ResourceCached::writeConfig( TDEConfig *config )
{
config->writeEntry( "ReloadPolicy", mReloadPolicy );
config->writeEntry( "ReloadInterval", mReloadInterval );
@@ -105,7 +105,7 @@ void ResourceCached::writeConfig( KConfig *config )
KABC::Resource::writeConfig( config );
}
-void ResourceCached::readConfig( KConfig *config )
+void ResourceCached::readConfig( TDEConfig *config )
{
mReloadPolicy = config->readNumEntry( "ReloadPolicy", ReloadNever );
mReloadInterval = config->readNumEntry( "ReloadInterval", 10 );
diff --git a/libtdepim/kabcresourcecached.h b/libtdepim/kabcresourcecached.h
index 0b2d4287a..db46ee27f 100644
--- a/libtdepim/kabcresourcecached.h
+++ b/libtdepim/kabcresourcecached.h
@@ -50,7 +50,7 @@ class KDE_EXPORT ResourceCached : public Resource
*/
enum { SaveNever, SaveOnExit, SaveInterval, SaveDelayed, SaveAlways };
- ResourceCached( const KConfig* );
+ ResourceCached( const TDEConfig* );
~ResourceCached();
/**
@@ -113,12 +113,12 @@ class KDE_EXPORT ResourceCached : public Resource
/**
Reads the resource specific config from disk.
*/
- virtual void readConfig( KConfig *config );
+ virtual void readConfig( TDEConfig *config );
/**
Writes the resource specific config to disk.
*/
- virtual void writeConfig( KConfig *config );
+ virtual void writeConfig( TDEConfig *config );
/**
Insert an addressee into the resource.
diff --git a/libtdepim/kabcresourcenull.h b/libtdepim/kabcresourcenull.h
index 7d77b89b7..a926e2059 100644
--- a/libtdepim/kabcresourcenull.h
+++ b/libtdepim/kabcresourcenull.h
@@ -31,7 +31,7 @@ namespace KABC {
class ResourceNull : public Resource
{
public:
- ResourceNull( const KConfig *cfg ) : Resource( cfg ) {}
+ ResourceNull( const TDEConfig *cfg ) : Resource( cfg ) {}
ResourceNull() : Resource( 0 ) {}
virtual ~ResourceNull() {}
diff --git a/libtdepim/kaccount.cpp b/libtdepim/kaccount.cpp
index 392fea265..f8fd61cf4 100644
--- a/libtdepim/kaccount.cpp
+++ b/libtdepim/kaccount.cpp
@@ -39,7 +39,7 @@ KAccount::KAccount( const uint id, const TQString &name, const Type type )
{
}
-void KAccount::writeConfig( KConfig &config, const TQString &group )
+void KAccount::writeConfig( TDEConfig &config, const TQString &group )
{
TQString oldGroup = config.group();
if (!group.isEmpty())
@@ -50,7 +50,7 @@ void KAccount::writeConfig( KConfig &config, const TQString &group )
config.setGroup(oldGroup);
}
-void KAccount::readConfig( KConfig &config, const TQString &group )
+void KAccount::readConfig( TDEConfig &config, const TQString &group )
{
TQString oldGroup = config.group();
if (!group.isEmpty())
diff --git a/libtdepim/kaccount.h b/libtdepim/kaccount.h
index d0a1b7f21..559a3c03c 100644
--- a/libtdepim/kaccount.h
+++ b/libtdepim/kaccount.h
@@ -35,7 +35,7 @@
#include <tqstring.h>
#include <tdepimmacros.h>
-class KConfig;
+class TDEConfig;
class KDE_EXPORT KAccount
{
@@ -73,15 +73,15 @@ class KDE_EXPORT KAccount
/**
* Save the settings
- * If the group is empty it must be preset in the KConfig
+ * If the group is empty it must be preset in the TDEConfig
*/
- void writeConfig( KConfig &config, const TQString &group = TQString() );
+ void writeConfig( TDEConfig &config, const TQString &group = TQString() );
/**
* Read the settings
- * If the group is empty it must be preset in the KConfig
+ * If the group is empty it must be preset in the TDEConfig
*/
- void readConfig( KConfig &config, const TQString &group = TQString() );
+ void readConfig( TDEConfig &config, const TQString &group = TQString() );
protected:
uint mId;
diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp
index 230f4ef4b..44e1488bd 100644
--- a/libtdepim/kaddrbook.cpp
+++ b/libtdepim/kaddrbook.cpp
@@ -117,7 +117,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
a.insertEmail( email, true );
{
- KConfig config( "kaddressbookrc" );
+ TDEConfig config( "kaddressbookrc" );
config.setGroup( "General" );
int type = config.readNumEntry( "FormattedNameType", 1 );
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index a96a88e78..bb870b11f 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -127,7 +127,7 @@ class PageItem : public TQCheckListItem
};
KCMDesignerFields::KCMDesignerFields( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
TQTimer::singleShot( 0, this, TQT_SLOT( delayedInit() ) );
@@ -178,7 +178,7 @@ void KCMDesignerFields::deleteFile()
if (KMessageBox::warningContinueCancel(this,
i18n( "<qt>Do you really want to delete '<b>%1</b>'?</qt>").arg( pageItem->text(0) ), "", KStdGuiItem::del() )
== KMessageBox::Continue)
- KIO::NetAccess::del( pageItem->path(), 0 );
+ TDEIO::NetAccess::del( pageItem->path(), 0 );
}
// The actual view refresh will be done automagically by the slots connected to kdirwatch
}
@@ -189,7 +189,7 @@ void KCMDesignerFields::importFile()
this, i18n("Import Page") );
KURL dest = localUiDir();
dest.setFileName(src.fileName());
- KIO::NetAccess::file_copy( src, dest, -1, true, false, this );
+ TDEIO::NetAccess::file_copy( src, dest, -1, true, false, this );
// The actual view refresh will be done automagically by the slots connected to kdirwatch
}
@@ -412,7 +412,7 @@ void KCMDesignerFields::startDesigner()
// check if path exists and create one if not.
TQString cepPath = localUiDir();
if( !TDEGlobal::dirs()->exists(cepPath) ) {
- KIO::NetAccess::mkdir( cepPath, this );
+ TDEIO::NetAccess::mkdir( cepPath, this );
}
// finally jump there
diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h
index 9e9c890fa..aeb196a3e 100644
--- a/libtdepim/kcmdesignerfields.h
+++ b/libtdepim/kcmdesignerfields.h
@@ -33,7 +33,7 @@ class TQPushButton;
namespace KPIM {
-class KDE_EXPORT KCMDesignerFields : public KCModule
+class KDE_EXPORT KCMDesignerFields : public TDECModule
{
Q_OBJECT
diff --git a/libtdepim/kconfigpropagator.cpp b/libtdepim/kconfigpropagator.cpp
index d22805db9..a231f9638 100644
--- a/libtdepim/kconfigpropagator.cpp
+++ b/libtdepim/kconfigpropagator.cpp
@@ -31,43 +31,43 @@
#include <tqfile.h>
#include <tqstringlist.h>
-KConfigPropagator::Change::~Change()
+TDEConfigPropagator::Change::~Change()
{
}
-KConfigPropagator::ChangeConfig::ChangeConfig()
- : KConfigPropagator::Change( i18n("Change Config Value") ),
+TDEConfigPropagator::ChangeConfig::ChangeConfig()
+ : TDEConfigPropagator::Change( i18n("Change Config Value") ),
hideValue( false )
{
}
-TQString KConfigPropagator::ChangeConfig::arg1() const
+TQString TDEConfigPropagator::ChangeConfig::arg1() const
{
return file + "/" + group + "/" + name;
}
-TQString KConfigPropagator::ChangeConfig::arg2() const
+TQString TDEConfigPropagator::ChangeConfig::arg2() const
{
if ( hideValue ) return "*";
else return value;
}
-void KConfigPropagator::ChangeConfig::apply()
+void TDEConfigPropagator::ChangeConfig::apply()
{
- KConfig cfg( file );
+ TDEConfig cfg( file );
cfg.setGroup( group );
cfg.writeEntry( name, value );
cfg.sync();
}
-KConfigPropagator::KConfigPropagator()
+TDEConfigPropagator::TDEConfigPropagator()
: mSkeleton( 0 )
{
init();
}
-KConfigPropagator::KConfigPropagator( KConfigSkeleton *skeleton,
+TDEConfigPropagator::TDEConfigPropagator( TDEConfigSkeleton *skeleton,
const TQString &kcfgFile )
: mSkeleton( skeleton ), mKcfgFile( kcfgFile )
{
@@ -76,12 +76,12 @@ KConfigPropagator::KConfigPropagator( KConfigSkeleton *skeleton,
readKcfgFile();
}
-void KConfigPropagator::init()
+void TDEConfigPropagator::init()
{
mChanges.setAutoDelete( true );
}
-void KConfigPropagator::readKcfgFile()
+void TDEConfigPropagator::readKcfgFile()
{
TQString filename = locate( "kcfg", mKcfgFile );
if ( filename.isEmpty() ) {
@@ -134,7 +134,7 @@ void KConfigPropagator::readKcfgFile()
}
}
-KConfigPropagator::Rule KConfigPropagator::parsePropagation( const TQDomElement &e )
+TDEConfigPropagator::Rule TDEConfigPropagator::parsePropagation( const TQDomElement &e )
{
Rule r;
@@ -150,7 +150,7 @@ KConfigPropagator::Rule KConfigPropagator::parsePropagation( const TQDomElement
return r;
}
-void KConfigPropagator::parseConfigEntryPath( const TQString &path,
+void TDEConfigPropagator::parseConfigEntryPath( const TQString &path,
TQString &file,
TQString &group,
TQString &entry )
@@ -172,7 +172,7 @@ void KConfigPropagator::parseConfigEntryPath( const TQString &path,
return;
}
-KConfigPropagator::Condition KConfigPropagator::parseCondition( const TQDomElement &e )
+TDEConfigPropagator::Condition TDEConfigPropagator::parseCondition( const TQDomElement &e )
{
Condition c;
@@ -187,7 +187,7 @@ KConfigPropagator::Condition KConfigPropagator::parseCondition( const TQDomEleme
return c;
}
-void KConfigPropagator::commit()
+void TDEConfigPropagator::commit()
{
updateChanges();
@@ -197,15 +197,15 @@ void KConfigPropagator::commit()
}
}
-KConfigSkeletonItem *KConfigPropagator::findItem( const TQString &group,
+TDEConfigSkeletonItem *TDEConfigPropagator::findItem( const TQString &group,
const TQString &name )
{
-// kdDebug() << "KConfigPropagator::findItem()" << endl;
+// kdDebug() << "TDEConfigPropagator::findItem()" << endl;
if ( !mSkeleton ) return 0;
- KConfigSkeletonItem::List items = mSkeleton->items();
- KConfigSkeletonItem::List::ConstIterator it;
+ TDEConfigSkeletonItem::List items = mSkeleton->items();
+ TDEConfigSkeletonItem::List::ConstIterator it;
for( it = items.begin(); it != items.end(); ++it ) {
// kdDebug() << " Item: " << (*it)->name() << " Type: "
// << (*it)->property().typeName() << endl;
@@ -217,7 +217,7 @@ KConfigSkeletonItem *KConfigPropagator::findItem( const TQString &group,
else return *it;
}
-TQString KConfigPropagator::itemValueAsString( KConfigSkeletonItem *item )
+TQString TDEConfigPropagator::itemValueAsString( TDEConfigSkeletonItem *item )
{
TQVariant p = item->property();
@@ -229,7 +229,7 @@ TQString KConfigPropagator::itemValueAsString( KConfigSkeletonItem *item )
return p.toString();
}
-void KConfigPropagator::updateChanges()
+void TDEConfigPropagator::updateChanges()
{
mChanges.clear();
@@ -238,7 +238,7 @@ void KConfigPropagator::updateChanges()
Rule r = *it;
Condition c = r.condition;
if ( c.isValid ) {
- KConfigSkeletonItem *item = findItem( c.group, c.key );
+ TDEConfigSkeletonItem *item = findItem( c.group, c.key );
kdDebug() << "Item " << c.group << "/" << c.key << ":" << endl;
if ( !item ) {
kdError() << " Item not found." << endl;
@@ -251,7 +251,7 @@ void KConfigPropagator::updateChanges()
}
}
- KConfigSkeletonItem *item = findItem( r.sourceGroup, r.sourceEntry );
+ TDEConfigSkeletonItem *item = findItem( r.sourceGroup, r.sourceEntry );
if ( !item ) {
kdError() << "Item " << r.sourceGroup << "/" << r.sourceEntry
<< " not found." << endl;
@@ -259,7 +259,7 @@ void KConfigPropagator::updateChanges()
}
TQString value = itemValueAsString( item );
- KConfig target( r.targetFile );
+ TDEConfig target( r.targetFile );
target.setGroup( r.targetGroup );
TQString targetValue = target.readEntry( r.targetEntry );
if ( r.hideValue ) targetValue = KStringHandler::obscure( targetValue );
@@ -278,12 +278,12 @@ void KConfigPropagator::updateChanges()
addCustomChanges( mChanges );
}
-KConfigPropagator::Change::List KConfigPropagator::changes()
+TDEConfigPropagator::Change::List TDEConfigPropagator::changes()
{
return mChanges;
}
-KConfigPropagator::Rule::List KConfigPropagator::rules()
+TDEConfigPropagator::Rule::List TDEConfigPropagator::rules()
{
return mRules;
}
diff --git a/libtdepim/kconfigpropagator.h b/libtdepim/kconfigpropagator.h
index 3e52eb7c4..92f9565f2 100644
--- a/libtdepim/kconfigpropagator.h
+++ b/libtdepim/kconfigpropagator.h
@@ -28,27 +28,27 @@
#include <tdepimmacros.h>
-class KConfigSkeleton;
-class KConfigSkeletonItem;
+class TDEConfigSkeleton;
+class TDEConfigSkeletonItem;
-class KDE_EXPORT KConfigPropagator
+class KDE_EXPORT TDEConfigPropagator
{
public:
/**
- Create KConfigPropagator object without associated source configuration.
+ Create TDEConfigPropagator object without associated source configuration.
*/
- KConfigPropagator();
+ TDEConfigPropagator();
/**
- Create KConfigPropagator object.
+ Create TDEConfigPropagator object.
- @param skeleton KConfigSkeleton object used as source for the propagation
+ @param skeleton TDEConfigSkeleton object used as source for the propagation
@param kcfgFile file name of kcfg file containing the propagation rules
*/
- KConfigPropagator( KConfigSkeleton *skeleton, const TQString &kcfgFile );
- virtual ~KConfigPropagator() {}
+ TDEConfigPropagator( TDEConfigSkeleton *skeleton, const TQString &kcfgFile );
+ virtual ~TDEConfigPropagator() {}
- KConfigSkeleton *skeleton() { return mSkeleton; }
+ TDEConfigSkeleton *skeleton() { return mSkeleton; }
/*
Commit changes according to propagation rules.
@@ -142,9 +142,9 @@ class KDE_EXPORT KConfigPropagator
*/
virtual void addCustomChanges( Change::List & ) {}
- KConfigSkeletonItem *findItem( const TQString &group, const TQString &name );
+ TDEConfigSkeletonItem *findItem( const TQString &group, const TQString &name );
- TQString itemValueAsString( KConfigSkeletonItem * );
+ TQString itemValueAsString( TDEConfigSkeletonItem * );
void readKcfgFile();
@@ -155,7 +155,7 @@ class KDE_EXPORT KConfigPropagator
TQString &group, TQString &entry );
private:
- KConfigSkeleton *mSkeleton;
+ TDEConfigSkeleton *mSkeleton;
TQString mKcfgFile;
Rule::List mRules;
diff --git a/libtdepim/kconfigwizard.cpp b/libtdepim/kconfigwizard.cpp
index bceacd656..c2baafcc7 100644
--- a/libtdepim/kconfigwizard.cpp
+++ b/libtdepim/kconfigwizard.cpp
@@ -31,7 +31,7 @@
#include <tqlayout.h>
#include <tqtimer.h>
-KConfigWizard::KConfigWizard( TQWidget *parent,
+TDEConfigWizard::TDEConfigWizard( TQWidget *parent,
char *name, bool modal )
: KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent,
name, modal ),
@@ -40,7 +40,7 @@ KConfigWizard::KConfigWizard( TQWidget *parent,
init();
}
-KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *parent,
+TDEConfigWizard::TDEConfigWizard( TDEConfigPropagator *propagator, TQWidget *parent,
char *name, bool modal )
: KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent,
name, modal ),
@@ -49,12 +49,12 @@ KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *parent,
init();
}
-KConfigWizard::~KConfigWizard()
+TDEConfigWizard::~TDEConfigWizard()
{
delete mPropagator;
}
-void KConfigWizard::init()
+void TDEConfigWizard::init()
{
connect( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ),
TQT_SLOT( slotAboutToShowPage( TQWidget * ) ) );
@@ -62,24 +62,24 @@ void KConfigWizard::init()
TQTimer::singleShot( 0, this, TQT_SLOT( readConfig() ) );
}
-void KConfigWizard::setPropagator( KConfigPropagator *p )
+void TDEConfigWizard::setPropagator( TDEConfigPropagator *p )
{
mPropagator = p;
}
-void KConfigWizard::slotAboutToShowPage( TQWidget *page )
+void TDEConfigWizard::slotAboutToShowPage( TQWidget *page )
{
if ( page == mChangesPage ) {
updateChanges();
}
}
-TQFrame *KConfigWizard::createWizardPage( const TQString &title )
+TQFrame *TDEConfigWizard::createWizardPage( const TQString &title )
{
return addPage( title );
}
-void KConfigWizard::setupRulesPage()
+void TDEConfigWizard::setupRulesPage()
{
TQFrame *topFrame = addPage( i18n("Rules") );
TQVBoxLayout *topLayout = new TQVBoxLayout( topFrame );
@@ -94,25 +94,25 @@ void KConfigWizard::setupRulesPage()
updateRules();
}
-void KConfigWizard::updateRules()
+void TDEConfigWizard::updateRules()
{
if ( !mPropagator ) {
- kdError() << "KConfigWizard: No KConfigPropagator set." << endl;
+ kdError() << "TDEConfigWizard: No TDEConfigPropagator set." << endl;
return;
}
mRuleView->clear();
- KConfigPropagator::Rule::List rules = mPropagator->rules();
- KConfigPropagator::Rule::List::ConstIterator it;
+ TDEConfigPropagator::Rule::List rules = mPropagator->rules();
+ TDEConfigPropagator::Rule::List::ConstIterator it;
for( it = rules.begin(); it != rules.end(); ++it ) {
- KConfigPropagator::Rule r = *it;
+ TDEConfigPropagator::Rule r = *it;
TQString source = r.sourceFile + "/" + r.sourceGroup + "/" +
r.sourceEntry;
TQString target = r.targetFile + "/" + r.targetGroup + "/" +
r.targetEntry;
TQString condition;
- KConfigPropagator::Condition c = r.condition;
+ TDEConfigPropagator::Condition c = r.condition;
if ( c.isValid ) {
condition = c.file + "/" + c.group + "/" + c.key + " = " + c.value;
}
@@ -120,7 +120,7 @@ void KConfigWizard::updateRules()
}
}
-void KConfigWizard::setupChangesPage()
+void TDEConfigWizard::setupChangesPage()
{
TQFrame *topFrame = addPage( i18n("Changes") );
TQVBoxLayout *topLayout = new TQVBoxLayout( topFrame );
@@ -136,12 +136,12 @@ void KConfigWizard::setupChangesPage()
mChangesPage = topFrame;
}
-void KConfigWizard::updateChanges()
+void TDEConfigWizard::updateChanges()
{
- kdDebug() << "KConfigWizard::updateChanges()" << endl;
+ kdDebug() << "TDEConfigWizard::updateChanges()" << endl;
if ( !mPropagator ) {
- kdError() << "KConfigWizard: No KConfigPropagator set." << endl;
+ kdError() << "TDEConfigWizard: No TDEConfigPropagator set." << endl;
return;
}
@@ -151,16 +151,16 @@ void KConfigWizard::updateChanges()
mChangeView->clear();
- KConfigPropagator::Change::List changes = mPropagator->changes();
- KConfigPropagator::Change *c;
+ TDEConfigPropagator::Change::List changes = mPropagator->changes();
+ TDEConfigPropagator::Change *c;
for( c = changes.first(); c; c = changes.next() ) {
new TQListViewItem( mChangeView, mChangeView->lastItem(), c->title(), c->arg1(), c->arg2() );
}
}
-void KConfigWizard::readConfig()
+void TDEConfigWizard::readConfig()
{
- kdDebug() << "KConfigWizard::readConfig()" << endl;
+ kdDebug() << "TDEConfigWizard::readConfig()" << endl;
int result = KMessageBox::warningContinueCancel( this,
i18n("Please make sure that the programs which are "
@@ -172,14 +172,14 @@ void KConfigWizard::readConfig()
usrReadConfig();
}
-void KConfigWizard::slotOk()
+void TDEConfigWizard::slotOk()
{
TQString error = validate();
if ( error.isNull() ) {
usrWriteConfig();
if ( !mPropagator ) {
- kdError() << "KConfigWizard: No KConfigPropagator set." << endl;
+ kdError() << "TDEConfigWizard: No TDEConfigPropagator set." << endl;
return;
} else {
if ( mPropagator->skeleton() ) {
diff --git a/libtdepim/kconfigwizard.h b/libtdepim/kconfigwizard.h
index b933e2a2b..a06849ecc 100644
--- a/libtdepim/kconfigwizard.h
+++ b/libtdepim/kconfigwizard.h
@@ -30,7 +30,7 @@ class TQListView;
/**
@short Configuration wizard base class
*/
-class KDE_EXPORT KConfigWizard : public KDialogBase
+class KDE_EXPORT TDEConfigWizard : public KDialogBase
{
Q_OBJECT
@@ -38,26 +38,26 @@ class KDE_EXPORT KConfigWizard : public KDialogBase
/**
Create wizard. You have to set a propgator with setPropagator() later.
*/
- KConfigWizard( TQWidget *parent = 0, char *name = 0, bool modal = false );
+ TDEConfigWizard( TQWidget *parent = 0, char *name = 0, bool modal = false );
/**
- Create wizard for given KConfigPropagator. The wizard takes ownership of
+ Create wizard for given TDEConfigPropagator. The wizard takes ownership of
the propagator.
*/
- KConfigWizard( KConfigPropagator *propagator, TQWidget *parent = 0,
+ TDEConfigWizard( TDEConfigPropagator *propagator, TQWidget *parent = 0,
char *name = 0, bool modal = false );
/**
Destructor.
*/
- virtual ~KConfigWizard();
+ virtual ~TDEConfigWizard();
/**
Set propagator the wizard operates on.
*/
- void setPropagator( KConfigPropagator * );
+ void setPropagator( TDEConfigPropagator * );
/**
Return propagator the wizard operates on.
*/
- KConfigPropagator *propagator() { return mPropagator; }
+ TDEConfigPropagator *propagator() { return mPropagator; }
/**
Create wizard page with given title.
@@ -65,15 +65,15 @@ class KDE_EXPORT KConfigWizard : public KDialogBase
TQFrame *createWizardPage( const TQString &title );
/**
- Use this function to read the configuration from the KConfigSkeleton
+ Use this function to read the configuration from the TDEConfigSkeleton
object to the GUI.
*/
virtual void usrReadConfig() = 0;
/**
This function is called when the wizard is finished. You have to save all
- settings from the GUI to the KConfigSkeleton object here, so that the
- KConfigPropagator can take them up from there.
+ settings from the GUI to the TDEConfigSkeleton object here, so that the
+ TDEConfigPropagator can take them up from there.
*/
virtual void usrWriteConfig() = 0;
@@ -99,7 +99,7 @@ class KDE_EXPORT KConfigWizard : public KDialogBase
void updateChanges();
private:
- KConfigPropagator *mPropagator;
+ TDEConfigPropagator *mPropagator;
TQListView *mRuleView;
TQListView *mChangeView;
diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp
index e1e887be2..5cad23656 100644
--- a/libtdepim/kfoldertree.cpp
+++ b/libtdepim/kfoldertree.cpp
@@ -192,15 +192,15 @@ void KFolderTreeItem::setFolderSize( TQ_INT64 aSize )
if (mSize == 0 && (childCount() == 0 || isOpen() ) )
size = "- ";
else
- size = KIO::convertSize(mSize);
+ size = TDEIO::convertSize(mSize);
}
if ( childCount() > 0 && !isOpen() ) {
TQ_INT64 recursiveSize = recursiveFolderSize();
if ( recursiveSize != mSize ) {
if ( mType != Root )
- size += TQString::fromLatin1(" + %1").arg( KIO::convertSize( recursiveSize - mSize ) );
+ size += TQString::fromLatin1(" + %1").arg( TDEIO::convertSize( recursiveSize - mSize ) );
else
- size = KIO::convertSize( recursiveSize );
+ size = TDEIO::convertSize( recursiveSize );
}
}
size += " ";
diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp
index d3603e19b..e07ef00ac 100644
--- a/libtdepim/kimportdialog.cpp
+++ b/libtdepim/kimportdialog.cpp
@@ -742,7 +742,7 @@ void KImportDialog::saveTemplate()
if ( name.isEmpty() )
return;
- KConfig config( fileName );
+ TDEConfig config( fileName );
config.setGroup( "General" );
config.writeEntry( "Columns", mColumns.count() );
config.writeEntry( "Format", mFormatCombo->currentItem() + 1 );
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 807869487..7abdb0e18 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -35,7 +35,7 @@
extern "C"
{
- KDE_EXPORT KCModule *create_komposerconfig( TQWidget *parent, const char * ) {
+ KDE_EXPORT TDECModule *create_komposerconfig( TQWidget *parent, const char * ) {
return new Komposer::PrefsModule( parent, "komposerprefs" );
}
}
diff --git a/libtdepim/kpimprefs.cpp b/libtdepim/kpimprefs.cpp
index 478ed7047..9ae04cfaf 100644
--- a/libtdepim/kpimprefs.cpp
+++ b/libtdepim/kpimprefs.cpp
@@ -36,7 +36,7 @@
#include "kpimprefs.h"
KPimPrefs::KPimPrefs( const TQString &name )
- : KConfigSkeleton( name )
+ : TDEConfigSkeleton( name )
{
}
@@ -64,7 +64,7 @@ const TQString KPimPrefs::timezone()
TQString zone = "";
// Read TimeZoneId from korganizerrc.
- KConfig korgcfg( locate( "config", "korganizerrc" ) );
+ TDEConfig korgcfg( locate( "config", "korganizerrc" ) );
korgcfg.setGroup( "Time & Date" );
TQString tz( korgcfg.readEntry( "TimeZoneId" ) );
if ( !tz.isEmpty() ) {
diff --git a/libtdepim/kpimprefs.h b/libtdepim/kpimprefs.h
index 1d88a8d8f..051b0f2fb 100644
--- a/libtdepim/kpimprefs.h
+++ b/libtdepim/kpimprefs.h
@@ -28,7 +28,7 @@
class TQString;
-class KDE_EXPORT KPimPrefs : public KConfigSkeleton
+class KDE_EXPORT KPimPrefs : public TDEConfigSkeleton
{
public:
KPimPrefs( const TQString &name = TQString() );
diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp
index 047f16d22..577692506 100644
--- a/libtdepim/kprefsdialog.cpp
+++ b/libtdepim/kprefsdialog.cpp
@@ -50,30 +50,30 @@
namespace KPrefsWidFactory {
-KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *parent )
+KPrefsWid *create( TDEConfigSkeletonItem *item, TQWidget *parent )
{
- KConfigSkeleton::ItemBool *boolItem =
- dynamic_cast<KConfigSkeleton::ItemBool *>( item );
+ TDEConfigSkeleton::ItemBool *boolItem =
+ dynamic_cast<TDEConfigSkeleton::ItemBool *>( item );
if ( boolItem ) {
return new KPrefsWidBool( boolItem, parent );
}
- KConfigSkeleton::ItemString *stringItem =
- dynamic_cast<KConfigSkeleton::ItemString *>( item );
+ TDEConfigSkeleton::ItemString *stringItem =
+ dynamic_cast<TDEConfigSkeleton::ItemString *>( item );
if ( stringItem ) {
return new KPrefsWidString( stringItem, parent );
}
- KConfigSkeleton::ItemEnum *enumItem =
- dynamic_cast<KConfigSkeleton::ItemEnum *>( item );
+ TDEConfigSkeleton::ItemEnum *enumItem =
+ dynamic_cast<TDEConfigSkeleton::ItemEnum *>( item );
if ( enumItem ) {
- TQValueList<KConfigSkeleton::ItemEnum::Choice> choices = enumItem->choices();
+ TQValueList<TDEConfigSkeleton::ItemEnum::Choice> choices = enumItem->choices();
if ( choices.isEmpty() ) {
kdError() << "KPrefsWidFactory::create(): Enum has no choices." << endl;
return 0;
} else {
KPrefsWidRadios *radios = new KPrefsWidRadios( enumItem, parent );
- TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
+ TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
for( it = choices.begin(); it != choices.end(); ++it ) {
radios->addRadio( (*it).label );
}
@@ -81,8 +81,8 @@ KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *parent )
}
}
- KConfigSkeleton::ItemInt *intItem =
- dynamic_cast<KConfigSkeleton::ItemInt *>( item );
+ TDEConfigSkeleton::ItemInt *intItem =
+ dynamic_cast<TDEConfigSkeleton::ItemInt *>( item );
if ( intItem ) {
return new KPrefsWidInt( intItem, parent );
}
@@ -99,7 +99,7 @@ TQValueList<TQWidget *> KPrefsWid::widgets() const
}
-KPrefsWidBool::KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *parent )
+KPrefsWidBool::KPrefsWidBool( TDEConfigSkeleton::ItemBool *item, TQWidget *parent )
: mItem( item )
{
mCheck = new TQCheckBox( item->label(), parent);
@@ -132,7 +132,7 @@ TQValueList<TQWidget *> KPrefsWidBool::widgets() const
}
-KPrefsWidInt::KPrefsWidInt( KConfigSkeleton::ItemInt *item,
+KPrefsWidInt::KPrefsWidInt( TDEConfigSkeleton::ItemInt *item,
TQWidget *parent )
: mItem( item )
{
@@ -182,7 +182,7 @@ TQValueList<TQWidget *> KPrefsWidInt::widgets() const
}
-KPrefsWidColor::KPrefsWidColor( KConfigSkeleton::ItemColor *item,
+KPrefsWidColor::KPrefsWidColor( TDEConfigSkeleton::ItemColor *item,
TQWidget *parent )
: mItem( item )
{
@@ -222,7 +222,7 @@ KColorButton *KPrefsWidColor::button()
}
-KPrefsWidFont::KPrefsWidFont( KConfigSkeleton::ItemFont *item,
+KPrefsWidFont::KPrefsWidFont( TDEConfigSkeleton::ItemFont *item,
TQWidget *parent, const TQString &sampleText )
: mItem( item )
{
@@ -280,7 +280,7 @@ void KPrefsWidFont::selectFont()
}
-KPrefsWidTime::KPrefsWidTime( KConfigSkeleton::ItemDateTime *item,
+KPrefsWidTime::KPrefsWidTime( TDEConfigSkeleton::ItemDateTime *item,
TQWidget *parent )
: mItem( item )
{
@@ -319,7 +319,7 @@ KTimeEdit *KPrefsWidTime::timeEdit()
}
-KPrefsWidDuration::KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item,
+KPrefsWidDuration::KPrefsWidDuration( TDEConfigSkeleton::ItemDateTime *item,
TQWidget *parent )
: mItem( item )
{
@@ -360,7 +360,7 @@ TQTimeEdit *KPrefsWidDuration::timeEdit()
}
-KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item,
+KPrefsWidDate::KPrefsWidDate( TDEConfigSkeleton::ItemDateTime *item,
TQWidget *parent )
: mItem( item )
{
@@ -397,7 +397,7 @@ KDateEdit *KPrefsWidDate::dateEdit()
}
-KPrefsWidRadios::KPrefsWidRadios( KConfigSkeleton::ItemEnum *item,
+KPrefsWidRadios::KPrefsWidRadios( TDEConfigSkeleton::ItemEnum *item,
TQWidget *parent )
: mItem( item )
{
@@ -439,7 +439,7 @@ TQValueList<TQWidget *> KPrefsWidRadios::widgets() const
return w;
}
-KPrefsWidCombo::KPrefsWidCombo( KConfigSkeleton::ItemEnum *item,
+KPrefsWidCombo::KPrefsWidCombo( TDEConfigSkeleton::ItemEnum *item,
TQWidget *parent )
: mItem( item )
{
@@ -475,7 +475,7 @@ TQComboBox* KPrefsWidCombo::comboBox()
return mCombo;
}
-KPrefsWidString::KPrefsWidString( KConfigSkeleton::ItemString *item,
+KPrefsWidString::KPrefsWidString( TDEConfigSkeleton::ItemString *item,
TQWidget *parent,
TQLineEdit::EchoMode echomode )
: mItem( item )
@@ -525,7 +525,7 @@ TQValueList<TQWidget *> KPrefsWidString::widgets() const
}
-KPrefsWidPath::KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *parent,
+KPrefsWidPath::KPrefsWidPath( TDEConfigSkeleton::ItemPath *item, TQWidget *parent,
const TQString &filter, uint mode )
: mItem( item )
{
@@ -575,7 +575,7 @@ TQValueList<TQWidget *> KPrefsWidPath::widgets() const
}
-KPrefsWidManager::KPrefsWidManager( KConfigSkeleton *prefs )
+KPrefsWidManager::KPrefsWidManager( TDEConfigSkeleton *prefs )
: mPrefs( prefs )
{
}
@@ -589,7 +589,7 @@ void KPrefsWidManager::addWid( KPrefsWid *wid )
mPrefsWids.append( wid );
}
-KPrefsWidBool *KPrefsWidManager::addWidBool( KConfigSkeleton::ItemBool *item,
+KPrefsWidBool *KPrefsWidManager::addWidBool( TDEConfigSkeleton::ItemBool *item,
TQWidget *parent )
{
KPrefsWidBool *w = new KPrefsWidBool( item, parent );
@@ -597,7 +597,7 @@ KPrefsWidBool *KPrefsWidManager::addWidBool( KConfigSkeleton::ItemBool *item,
return w;
}
-KPrefsWidTime *KPrefsWidManager::addWidTime( KConfigSkeleton::ItemDateTime *item,
+KPrefsWidTime *KPrefsWidManager::addWidTime( TDEConfigSkeleton::ItemDateTime *item,
TQWidget *parent )
{
KPrefsWidTime *w = new KPrefsWidTime( item, parent );
@@ -605,7 +605,7 @@ KPrefsWidTime *KPrefsWidManager::addWidTime( KConfigSkeleton::ItemDateTime *item
return w;
}
-KPrefsWidDuration *KPrefsWidManager::addWidDuration( KConfigSkeleton::ItemDateTime *item,
+KPrefsWidDuration *KPrefsWidManager::addWidDuration( TDEConfigSkeleton::ItemDateTime *item,
TQWidget *parent )
{
KPrefsWidDuration *w = new KPrefsWidDuration( item, parent );
@@ -613,7 +613,7 @@ KPrefsWidDuration *KPrefsWidManager::addWidDuration( KConfigSkeleton::ItemDateTi
return w;
}
-KPrefsWidDate *KPrefsWidManager::addWidDate( KConfigSkeleton::ItemDateTime *item,
+KPrefsWidDate *KPrefsWidManager::addWidDate( TDEConfigSkeleton::ItemDateTime *item,
TQWidget *parent )
{
KPrefsWidDate *w = new KPrefsWidDate( item, parent );
@@ -621,7 +621,7 @@ KPrefsWidDate *KPrefsWidManager::addWidDate( KConfigSkeleton::ItemDateTime *item
return w;
}
-KPrefsWidColor *KPrefsWidManager::addWidColor( KConfigSkeleton::ItemColor *item,
+KPrefsWidColor *KPrefsWidManager::addWidColor( TDEConfigSkeleton::ItemColor *item,
TQWidget *parent )
{
KPrefsWidColor *w = new KPrefsWidColor( item, parent );
@@ -629,13 +629,13 @@ KPrefsWidColor *KPrefsWidManager::addWidColor( KConfigSkeleton::ItemColor *item,
return w;
}
-KPrefsWidRadios *KPrefsWidManager::addWidRadios( KConfigSkeleton::ItemEnum *item,
+KPrefsWidRadios *KPrefsWidManager::addWidRadios( TDEConfigSkeleton::ItemEnum *item,
TQWidget *parent )
{
KPrefsWidRadios *w = new KPrefsWidRadios( item, parent );
- TQValueList<KConfigSkeleton::ItemEnum::Choice> choices;
+ TQValueList<TDEConfigSkeleton::ItemEnum::Choice> choices;
choices = item->choices();
- TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
+ TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
for( it = choices.begin(); it != choices.end(); ++it ) {
w->addRadio( (*it).label, (*it).whatsThis );
}
@@ -643,13 +643,13 @@ KPrefsWidRadios *KPrefsWidManager::addWidRadios( KConfigSkeleton::ItemEnum *item
return w;
}
-KPrefsWidCombo *KPrefsWidManager::addWidCombo( KConfigSkeleton::ItemEnum *item,
+KPrefsWidCombo *KPrefsWidManager::addWidCombo( TDEConfigSkeleton::ItemEnum *item,
TQWidget* parent )
{
KPrefsWidCombo *w = new KPrefsWidCombo( item, parent );
- TQValueList<KConfigSkeleton::ItemEnum::Choice> choices;
+ TQValueList<TDEConfigSkeleton::ItemEnum::Choice> choices;
choices = item->choices();
- TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
+ TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
for( it = choices.begin(); it != choices.end(); ++it ) {
w->comboBox()->insertItem( (*it).label, -1 );
}
@@ -657,7 +657,7 @@ KPrefsWidCombo *KPrefsWidManager::addWidCombo( KConfigSkeleton::ItemEnum *item,
return w;
}
-KPrefsWidString *KPrefsWidManager::addWidString( KConfigSkeleton::ItemString *item,
+KPrefsWidString *KPrefsWidManager::addWidString( TDEConfigSkeleton::ItemString *item,
TQWidget *parent )
{
KPrefsWidString *w = new KPrefsWidString( item, parent,
@@ -666,7 +666,7 @@ KPrefsWidString *KPrefsWidManager::addWidString( KConfigSkeleton::ItemString *it
return w;
}
-KPrefsWidPath *KPrefsWidManager::addWidPath( KConfigSkeleton::ItemPath *item,
+KPrefsWidPath *KPrefsWidManager::addWidPath( TDEConfigSkeleton::ItemPath *item,
TQWidget *parent, const TQString &filter, uint mode )
{
KPrefsWidPath *w = new KPrefsWidPath( item, parent, filter, mode );
@@ -674,7 +674,7 @@ KPrefsWidPath *KPrefsWidManager::addWidPath( KConfigSkeleton::ItemPath *item,
return w;
}
-KPrefsWidString *KPrefsWidManager::addWidPassword( KConfigSkeleton::ItemString *item,
+KPrefsWidString *KPrefsWidManager::addWidPassword( TDEConfigSkeleton::ItemString *item,
TQWidget *parent )
{
KPrefsWidString *w = new KPrefsWidString( item, parent, TQLineEdit::Password );
@@ -682,7 +682,7 @@ KPrefsWidString *KPrefsWidManager::addWidPassword( KConfigSkeleton::ItemString *
return w;
}
-KPrefsWidFont *KPrefsWidManager::addWidFont( KConfigSkeleton::ItemFont *item,
+KPrefsWidFont *KPrefsWidManager::addWidFont( TDEConfigSkeleton::ItemFont *item,
TQWidget *parent,
const TQString &sampleText )
{
@@ -691,7 +691,7 @@ KPrefsWidFont *KPrefsWidManager::addWidFont( KConfigSkeleton::ItemFont *item,
return w;
}
-KPrefsWidInt *KPrefsWidManager::addWidInt( KConfigSkeleton::ItemInt *item,
+KPrefsWidInt *KPrefsWidManager::addWidInt( TDEConfigSkeleton::ItemInt *item,
TQWidget *parent )
{
KPrefsWidInt *w = new KPrefsWidInt( item, parent );
@@ -733,7 +733,7 @@ void KPrefsWidManager::writeWidConfig()
}
-KPrefsDialog::KPrefsDialog( KConfigSkeleton *prefs, TQWidget *parent, char *name,
+KPrefsDialog::KPrefsDialog( TDEConfigSkeleton *prefs, TQWidget *parent, char *name,
bool modal )
: KDialogBase(IconList,i18n("Preferences"),Ok|Apply|Cancel|Default,Ok,parent,
name,modal,true),
@@ -752,13 +752,13 @@ KPrefsDialog::~KPrefsDialog()
void KPrefsDialog::autoCreate()
{
- KConfigSkeletonItem::List items = prefs()->items();
+ TDEConfigSkeletonItem::List items = prefs()->items();
TQMap<TQString,TQWidget *> mGroupPages;
TQMap<TQString,TQGridLayout *> mGroupLayouts;
TQMap<TQString,int> mCurrentRows;
- KConfigSkeletonItem::List::ConstIterator it;
+ TDEConfigSkeletonItem::List::ConstIterator it;
for( it = items.begin(); it != items.end(); ++it ) {
TQString group = (*it)->group();
TQString name = (*it)->name();
@@ -857,9 +857,9 @@ void KPrefsDialog::slotDefault()
}
-KPrefsModule::KPrefsModule( KConfigSkeleton *prefs, TQWidget *parent,
+KPrefsModule::KPrefsModule( TDEConfigSkeleton *prefs, TQWidget *parent,
const char *name )
- : KCModule( parent, name ),
+ : TDECModule( parent, name ),
KPrefsWidManager( prefs )
{
emit changed( false );
diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h
index 4ef604ee2..eebdb9394 100644
--- a/libtdepim/kprefsdialog.h
+++ b/libtdepim/kprefsdialog.h
@@ -95,10 +95,10 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid
/**
Create a bool value control element consisting of a TQCheckbox.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *parent );
+ KPrefsWidBool( TDEConfigSkeleton::ItemBool *item, TQWidget *parent );
/**
Return the TQCheckbox used by this control element.
@@ -111,7 +111,7 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid
TQValueList<TQWidget *> widgets() const;
private:
- KConfigSkeleton::ItemBool *mItem;
+ TDEConfigSkeleton::ItemBool *mItem;
TQCheckBox *mCheck;
};
@@ -130,10 +130,10 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid
Create a integer value control element consisting of a label and a
spinbox.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidInt( KConfigSkeleton::ItemInt *item, TQWidget *parent );
+ KPrefsWidInt( TDEConfigSkeleton::ItemInt *item, TQWidget *parent );
/**
Return TQLabel used by this control element.
@@ -151,7 +151,7 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid
TQValueList<TQWidget *> widgets() const;
private:
- KConfigSkeleton::ItemInt *mItem;
+ TDEConfigSkeleton::ItemInt *mItem;
TQLabel *mLabel;
TQSpinBox *mSpin;
@@ -170,10 +170,10 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid
/**
Create a time value control element consisting of a label and a spinbox.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidTime( KConfigSkeleton::ItemDateTime *item, TQWidget *parent );
+ KPrefsWidTime( TDEConfigSkeleton::ItemDateTime *item, TQWidget *parent );
/**
Return TQLabel used by this widget.
@@ -188,7 +188,7 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid
void writeConfig();
private:
- KConfigSkeleton::ItemDateTime *mItem;
+ TDEConfigSkeleton::ItemDateTime *mItem;
TQLabel *mLabel;
KTimeEdit *mTimeEdit;
@@ -208,10 +208,10 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
Create a duration value control element consisting of a label and a
spinbox.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item, TQWidget *parent );
+ KPrefsWidDuration( TDEConfigSkeleton::ItemDateTime *item, TQWidget *parent );
/**
Return TQLabel used by this widget.
@@ -226,7 +226,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
void writeConfig();
private:
- KConfigSkeleton::ItemDateTime *mItem;
+ TDEConfigSkeleton::ItemDateTime *mItem;
TQLabel *mLabel;
TQTimeEdit *mTimeEdit;
@@ -245,10 +245,10 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid
/**
Create a time value control element consisting of a label and a date box.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, TQWidget *parent );
+ KPrefsWidDate( TDEConfigSkeleton::ItemDateTime *item, TQWidget *parent );
/**
Return TQLabel used by this widget.
@@ -263,7 +263,7 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid
void writeConfig();
private:
- KConfigSkeleton::ItemDateTime *mItem;
+ TDEConfigSkeleton::ItemDateTime *mItem;
TQLabel *mLabel;
KDateEdit *mDateEdit;
@@ -285,10 +285,10 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid
Create a color value control element consisting of a test field and a
button for opening a color dialog.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidColor( KConfigSkeleton::ItemColor *item, TQWidget *parent );
+ KPrefsWidColor( TDEConfigSkeleton::ItemColor *item, TQWidget *parent );
/**
Destruct color setting widget.
*/
@@ -307,7 +307,7 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid
void writeConfig();
private:
- KConfigSkeleton::ItemColor *mItem;
+ TDEConfigSkeleton::ItemColor *mItem;
TQLabel *mLabel;
KColorButton *mButton;
@@ -328,11 +328,11 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid
Create a font value control element consisting of a test field and a
button for opening a font dialog.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
@param sampleText Sample text for previewing the selected font.
*/
- KPrefsWidFont( KConfigSkeleton::ItemFont *item,
+ KPrefsWidFont( TDEConfigSkeleton::ItemFont *item,
TQWidget *parent, const TQString &sampleText );
/**
Destruct font setting widget.
@@ -359,7 +359,7 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid
void selectFont();
private:
- KConfigSkeleton::ItemFont *mItem;
+ TDEConfigSkeleton::ItemFont *mItem;
TQLabel *mLabel;
TQLabel *mPreview;
@@ -384,10 +384,10 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid
Create a control element for selection of an option. It consists of a box
with several radio buttons.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidRadios( KConfigSkeleton::ItemEnum *item, TQWidget *parent );
+ KPrefsWidRadios( TDEConfigSkeleton::ItemEnum *item, TQWidget *parent );
virtual ~KPrefsWidRadios();
/**
@@ -410,7 +410,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid
TQValueList<TQWidget *> widgets() const;
private:
- KConfigSkeleton::ItemEnum *mItem;
+ TDEConfigSkeleton::ItemEnum *mItem;
TQButtonGroup *mBox;
};
@@ -432,10 +432,10 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid
Create a control element for selection of an option. It consists of a
combo box.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidCombo( KConfigSkeleton::ItemEnum *item, TQWidget *parent );
+ KPrefsWidCombo( TDEConfigSkeleton::ItemEnum *item, TQWidget *parent );
virtual ~KPrefsWidCombo();
void readConfig();
@@ -445,7 +445,7 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid
TQValueList<TQWidget *> widgets() const;
private:
- KConfigSkeleton::ItemEnum *mItem;
+ TDEConfigSkeleton::ItemEnum *mItem;
TQComboBox *mCombo;
};
@@ -465,11 +465,11 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid
Create a string value control element consisting of a test label and a
line edit.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
@param echomode Describes how a line edit should display its contents.
*/
- KPrefsWidString( KConfigSkeleton::ItemString *item, TQWidget *parent,
+ KPrefsWidString( TDEConfigSkeleton::ItemString *item, TQWidget *parent,
TQLineEdit::EchoMode echomode=TQLineEdit::Normal );
/**
Destructor.
@@ -491,7 +491,7 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid
TQValueList<TQWidget *> widgets() const;
private:
- KConfigSkeleton::ItemString *mItem;
+ TDEConfigSkeleton::ItemString *mItem;
TQLabel *mLabel;
TQLineEdit *mEdit;
@@ -512,12 +512,12 @@ class KDE_EXPORT KPrefsWidPath : public KPrefsWid
Create a string value control element consisting of a test label and a
line edit.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
@param filter URLRequester filter
@param mode Describes how a line edit should display its contents.
*/
- KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *parent,
+ KPrefsWidPath( TDEConfigSkeleton::ItemPath *item, TQWidget *parent,
const TQString &filter = TQString(), uint mode = KFile::File );
/**
Destructor.
@@ -539,7 +539,7 @@ class KDE_EXPORT KPrefsWidPath : public KPrefsWid
TQValueList<TQWidget *> widgets() const;
private:
- KConfigSkeleton::ItemPath *mItem;
+ TDEConfigSkeleton::ItemPath *mItem;
TQLabel *mLabel;
KURLRequester *mURLRequester;
@@ -562,13 +562,13 @@ class KDE_EXPORT KPrefsWidManager
@param prefs KPrefs object used to access te configuration.
*/
- KPrefsWidManager( KConfigSkeleton *prefs );
+ KPrefsWidManager( TDEConfigSkeleton *prefs );
/**
Destructor.
*/
virtual ~KPrefsWidManager();
- KConfigSkeleton *prefs() const { return mPrefs; }
+ TDEConfigSkeleton *prefs() const { return mPrefs; }
/**
Register a custom KPrefsWid object.
@@ -578,116 +578,116 @@ class KDE_EXPORT KPrefsWidManager
/**
Register a @ref KPrefsWidBool object.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidBool *addWidBool( KConfigSkeleton::ItemBool *item,
+ KPrefsWidBool *addWidBool( TDEConfigSkeleton::ItemBool *item,
TQWidget *parent );
/**
Register a @ref KPrefsWidInt object.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidInt *addWidInt( KConfigSkeleton::ItemInt *item,
+ KPrefsWidInt *addWidInt( TDEConfigSkeleton::ItemInt *item,
TQWidget *parent );
/**
Register a @ref KPrefsWidDate object.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidDate *addWidDate( KConfigSkeleton::ItemDateTime *item,
+ KPrefsWidDate *addWidDate( TDEConfigSkeleton::ItemDateTime *item,
TQWidget *parent );
/**
Register a @ref KPrefsWidTime object.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidTime *addWidTime( KConfigSkeleton::ItemDateTime *item,
+ KPrefsWidTime *addWidTime( TDEConfigSkeleton::ItemDateTime *item,
TQWidget *parent );
/**
Register a @ref KPrefsWidDuration object.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidDuration *addWidDuration( KConfigSkeleton::ItemDateTime *item,
+ KPrefsWidDuration *addWidDuration( TDEConfigSkeleton::ItemDateTime *item,
TQWidget *parent );
/**
Register a @ref KPrefsWidColor object.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidColor *addWidColor( KConfigSkeleton::ItemColor *item,
+ KPrefsWidColor *addWidColor( TDEConfigSkeleton::ItemColor *item,
TQWidget *parent );
/**
Register a @ref KPrefsWidRadios object. The choices represented by the
given item object are automatically added as radio buttons.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidRadios *addWidRadios( KConfigSkeleton::ItemEnum *item,
+ KPrefsWidRadios *addWidRadios( TDEConfigSkeleton::ItemEnum *item,
TQWidget *parent );
/**
Register a @ref KPrefsWidCombo object. The choices represented by the
given item object are automatically added to the combo box.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidCombo *addWidCombo( KConfigSkeleton::ItemEnum *item,
+ KPrefsWidCombo *addWidCombo( TDEConfigSkeleton::ItemEnum *item,
TQWidget *parent );
/**
Register a @ref KPrefsWidString object.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidString *addWidString( KConfigSkeleton::ItemString *item,
+ KPrefsWidString *addWidString( TDEConfigSkeleton::ItemString *item,
TQWidget *parent );
/**
Register a path @ref KPrefsWidPath object.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
@param filter URLRequester filter
@param mode URLRequester mode
*/
- KPrefsWidPath *addWidPath ( KConfigSkeleton::ItemPath *item, TQWidget *parent,
+ KPrefsWidPath *addWidPath ( TDEConfigSkeleton::ItemPath *item, TQWidget *parent,
const TQString &filter = TQString(),
uint mode = KFile::File );
/**
Register a password @ref KPrefsWidString object, with echomode set to TQLineEdit::Password.
- @param item The KConfigSkeletonItem representing the preferences entry.
+ @param item The TDEConfigSkeletonItem representing the preferences entry.
@param parent Parent widget.
*/
- KPrefsWidString *addWidPassword ( KConfigSkeleton::ItemString *item,
+ KPrefsWidString *addWidPassword ( TDEConfigSkeleton::ItemString *item,
TQWidget *parent );
/**
Register a @ref KPrefsWidFont object.
- @param item The KConfigSkeletonItem representing the preferences
+ @param item The TDEConfigSkeletonItem representing the preferences
entry.
@param parent Parent widget.
@param sampleText Sample text for previewing the selected font.
*/
- KPrefsWidFont *addWidFont( KConfigSkeleton::ItemFont *item,
+ KPrefsWidFont *addWidFont( TDEConfigSkeleton::ItemFont *item,
TQWidget *parent, const TQString &sampleText );
/** Set all widgets to default values. */
@@ -700,7 +700,7 @@ class KDE_EXPORT KPrefsWidManager
void writeWidConfig();
private:
- KConfigSkeleton *mPrefs;
+ TDEConfigSkeleton *mPrefs;
TQPtrList<KPrefsWid> mPrefsWids;
};
@@ -731,7 +731,7 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
@param name Widget name.
@param modal true, if dialog has to be modal, false for non-modal.
*/
- KPrefsDialog( KConfigSkeleton *prefs, TQWidget *parent = 0, char *name = 0,
+ KPrefsDialog( TDEConfigSkeleton *prefs, TQWidget *parent = 0, char *name = 0,
bool modal = false );
/**
Destructor.
@@ -772,12 +772,12 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
};
-class KDE_EXPORT KPrefsModule : public KCModule, public KPrefsWidManager
+class KDE_EXPORT KPrefsModule : public TDECModule, public KPrefsWidManager
{
Q_OBJECT
public:
- KPrefsModule( KConfigSkeleton *, TQWidget *parent = 0, const char *name = 0 );
+ KPrefsModule( TDEConfigSkeleton *, TQWidget *parent = 0, const char *name = 0 );
virtual void addWid( KPrefsWid * );
diff --git a/libtdepim/kresourceprefs.cpp b/libtdepim/kresourceprefs.cpp
index c343f806d..614c17980 100644
--- a/libtdepim/kresourceprefs.cpp
+++ b/libtdepim/kresourceprefs.cpp
@@ -24,14 +24,14 @@
#include "kresourceprefs.h"
KResourcePrefs::KResourcePrefs( const TQString &name )
- : KConfigSkeleton( name )
+ : TDEConfigSkeleton( name )
{
}
void KResourcePrefs::addGroupPrefix( const TQString &prefix )
{
- KConfigSkeletonItem::List itemList = items();
- KConfigSkeletonItem::List::Iterator it;
+ TDEConfigSkeletonItem::List itemList = items();
+ TDEConfigSkeletonItem::List::Iterator it;
for ( it = itemList.begin(); it != itemList.end(); ++it )
(*it)->setGroup( prefix + ":" + (*it)->group() );
diff --git a/libtdepim/kresourceprefs.h b/libtdepim/kresourceprefs.h
index 6d96deadb..968d86a9e 100644
--- a/libtdepim/kresourceprefs.h
+++ b/libtdepim/kresourceprefs.h
@@ -35,7 +35,7 @@ class TQString;
The prefix should be an unique identifier to avoid name clashes and the method
has to be called before readConfig(), otherwise the wrong entries are read.
*/
-class KDE_EXPORT KResourcePrefs : public KConfigSkeleton
+class KDE_EXPORT KResourcePrefs : public TDEConfigSkeleton
{
public:
KResourcePrefs( const TQString &name = TQString() );
diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp
index 1bebe3350..9f1a6fd8e 100644
--- a/libtdepim/ldapclient.cpp
+++ b/libtdepim/ldapclient.cpp
@@ -44,8 +44,8 @@
using namespace KPIM;
-KConfig *KPIM::LdapSearch::s_config = 0L;
-static KStaticDeleter<KConfig> configDeleter;
+TDEConfig *KPIM::LdapSearch::s_config = 0L;
+static KStaticDeleter<TDEConfig> configDeleter;
TQString LdapObject::toString() const
{
@@ -136,12 +136,12 @@ void LdapClient::startQuery( const TQString& filter )
startParseLDIF();
mActive = true;
- mJob = KIO::get( url, false, false );
- connect( mJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
- connect( mJob, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
- this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
- connect( mJob, TQT_SIGNAL( result( KIO::Job* ) ),
+ mJob = TDEIO::get( url, false, false );
+ connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+ connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( slotDone() ) );
}
@@ -155,12 +155,12 @@ void LdapClient::cancelQuery()
mActive = false;
}
-void LdapClient::slotData( KIO::Job*, const TQByteArray& data )
+void LdapClient::slotData( TDEIO::Job*, const TQByteArray& data )
{
parseLDIF( data );
}
-void LdapClient::slotInfoMessage( KIO::Job*, const TQString & )
+void LdapClient::slotInfoMessage( TDEIO::Job*, const TQString & )
{
//tqDebug("Job said \"%s\"", info.latin1());
}
@@ -175,7 +175,7 @@ void LdapClient::slotDone()
}
#endif
int err = mJob->error();
- if ( err && err != KIO::ERR_USER_CANCELED ) {
+ if ( err && err != TDEIO::ERR_USER_CANCELED ) {
emit error( mJob->errorString() );
}
emit done();
@@ -274,7 +274,7 @@ void LdapClient::setCompletionWeight( int weight )
mCompletionWeight = weight;
}
-void LdapSearch::readConfig( LdapServer &server, KConfig *config, int j, bool active )
+void LdapSearch::readConfig( LdapServer &server, TDEConfig *config, int j, bool active )
{
TQString prefix;
if ( active ) prefix = "Selected";
@@ -309,7 +309,7 @@ void LdapSearch::readConfig( LdapServer &server, KConfig *config, int j, bool ac
server.setMech( config->readEntry( prefix + TQString( "Mech%1" ).arg( j ) ) );
}
-void LdapSearch::writeConfig( const LdapServer &server, KConfig *config, int j, bool active )
+void LdapSearch::writeConfig( const LdapServer &server, TDEConfig *config, int j, bool active )
{
TQString prefix;
if ( active ) prefix = "Selected";
@@ -327,10 +327,10 @@ void LdapSearch::writeConfig( const LdapServer &server, KConfig *config, int j,
config->writeEntry( prefix + TQString( "Mech%1" ).arg( j ), server.mech() );
}
-KConfig* LdapSearch::config()
+TDEConfig* LdapSearch::config()
{
if ( !s_config )
- configDeleter.setObject( s_config, new KConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals
+ configDeleter.setObject( s_config, new TDEConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals
return s_config;
}
@@ -349,7 +349,7 @@ LdapSearch::LdapSearch()
TQT_SLOT(slotFileChanged(const TQString&)));
}
-void LdapSearch::readWeighForClient( LdapClient *client, KConfig *config, int clientNumber )
+void LdapSearch::readWeighForClient( LdapClient *client, TDEConfig *config, int clientNumber )
{
const int completionWeight = config->readNumEntry( TQString( "SelectedCompletionWeight%1" ).arg( clientNumber ), -1 );
if ( completionWeight != -1 )
@@ -358,7 +358,7 @@ void LdapSearch::readWeighForClient( LdapClient *client, KConfig *config, int cl
void LdapSearch::updateCompletionWeights()
{
- KConfig *config = KPIM::LdapSearch::config();
+ TDEConfig *config = KPIM::LdapSearch::config();
config->setGroup( "LDAP" );
for ( uint i = 0; i < mClients.size(); i++ ) {
readWeighForClient( mClients[i], config, i );
@@ -374,7 +374,7 @@ void LdapSearch::readConfig()
mClients.clear();
// stolen from KAddressBook
- KConfig *config = KPIM::LdapSearch::config();
+ TDEConfig *config = KPIM::LdapSearch::config();
config->setGroup( "LDAP" );
int numHosts = config->readUnsignedNumEntry( "NumSelectedHosts");
if ( !numHosts ) {
diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h
index 7eaa3fd00..502937299 100644
--- a/libtdepim/ldapclient.h
+++ b/libtdepim/ldapclient.h
@@ -195,8 +195,8 @@ class KDE_EXPORT LdapClient : public TQObject
void cancelQuery();
protected slots:
- void slotData( KIO::Job*, const TQByteArray &data );
- void slotInfoMessage( KIO::Job*, const TQString &info );
+ void slotData( TDEIO::Job*, const TQByteArray &data );
+ void slotInfoMessage( TDEIO::Job*, const TQString &info );
void slotDone();
protected:
@@ -209,7 +209,7 @@ class KDE_EXPORT LdapClient : public TQObject
TQString mScope;
TQStringList mAttrs;
- TQGuardedPtr<KIO::SimpleJob> mJob;
+ TQGuardedPtr<TDEIO::SimpleJob> mJob;
bool mActive;
bool mReportObjectClass;
@@ -251,9 +251,9 @@ class KDE_EXPORT LdapSearch : public TQObject
public:
LdapSearch();
- static KConfig *config();
- static void readConfig( LdapServer &server, KConfig *config, int num, bool active );
- static void writeConfig( const LdapServer &server, KConfig *config, int j, bool active );
+ static TDEConfig *config();
+ static void readConfig( LdapServer &server, TDEConfig *config, int num, bool active );
+ static void writeConfig( const LdapServer &server, TDEConfig *config, int j, bool active );
void startSearch( const TQString& txt );
void cancelSearch();
@@ -279,7 +279,7 @@ class KDE_EXPORT LdapSearch : public TQObject
void slotFileChanged( const TQString& );
private:
- void readWeighForClient( LdapClient *client, KConfig *config, int clientNumber );
+ void readWeighForClient( LdapClient *client, TDEConfig *config, int clientNumber );
void readConfig();
void finish();
void makeSearchData( TQStringList& ret, LdapResultList& resList );
@@ -292,7 +292,7 @@ class KDE_EXPORT LdapSearch : public TQObject
TQString mConfigFile;
private:
- static KConfig *s_config;
+ static TDEConfig *s_config;
class LdapSearchPrivate* d;
};
diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp
index 53bfba32b..fe67137b1 100644
--- a/libtdepim/ldapsearchdialog.cpp
+++ b/libtdepim/ldapsearchdialog.cpp
@@ -221,14 +221,14 @@ void LDAPSearchDialog::restoreSettings()
mLdapClientList.setAutoDelete( true );
mLdapClientList.clear();
- KConfig kabConfig( "kaddressbookrc" );
+ TDEConfig kabConfig( "kaddressbookrc" );
kabConfig.setGroup( "LDAPSearch" );
mSearchType->setCurrentItem( kabConfig.readNumEntry( "SearchType", 0 ) );
// then read the config file and register all selected
// server in the list
- KConfig* config = KABC::AddressLineEdit::config(); // singleton kabldaprc config object
- KConfigGroupSaver saver( config, "LDAP" );
+ TDEConfig* config = KABC::AddressLineEdit::config(); // singleton kabldaprc config object
+ TDEConfigGroupSaver saver( config, "LDAP" );
mNumHosts = config->readUnsignedNumEntry( "NumSelectedHosts" );
if ( !mNumHosts ) {
KMessageBox::error( this, i18n( "You must select a LDAP server before searching.\nYou can do this from the menu Settings/Configure KAddressBook." ) );
@@ -308,7 +308,7 @@ void LDAPSearchDialog::restoreSettings()
void LDAPSearchDialog::saveSettings()
{
- KConfig config( "kaddressbookrc" );
+ TDEConfig config( "kaddressbookrc" );
config.setGroup( "LDAPSearch" );
config.writeEntry( "SearchType", mSearchType->currentItem() );
config.sync();
diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp
index 066ba27b3..bbd7d29a9 100644
--- a/libtdepim/recentaddresses.cpp
+++ b/libtdepim/recentaddresses.cpp
@@ -47,14 +47,14 @@ static KStaticDeleter<RecentAddresses> sd;
RecentAddresses * RecentAddresses::s_self = 0;
-RecentAddresses * RecentAddresses::self( KConfig *config)
+RecentAddresses * RecentAddresses::self( TDEConfig *config)
{
if ( !s_self )
sd.setObject( s_self, new RecentAddresses(config) );
return s_self;
}
-RecentAddresses::RecentAddresses(KConfig * config)
+RecentAddresses::RecentAddresses(TDEConfig * config)
{
if ( !config )
load( TDEGlobal::config() );
@@ -68,14 +68,14 @@ RecentAddresses::~RecentAddresses()
// on s_self
}
-void RecentAddresses::load( KConfig *config )
+void RecentAddresses::load( TDEConfig *config )
{
TQStringList addresses;
TQString name;
TQString email;
m_addresseeList.clear();
- KConfigGroupSaver cs( config, "General" );
+ TDEConfigGroupSaver cs( config, "General" );
m_maxCount = config->readNumEntry( "Maximum Recent Addresses", 40 );
addresses = config->readListEntry( "Recent Addresses" );
for ( TQStringList::Iterator it = addresses.begin(); it != addresses.end(); ++it ) {
@@ -91,9 +91,9 @@ void RecentAddresses::load( KConfig *config )
adjustSize();
}
-void RecentAddresses::save( KConfig *config )
+void RecentAddresses::save( TDEConfig *config )
{
- KConfigGroupSaver cs( config, "General" );
+ TDEConfigGroupSaver cs( config, "General" );
config->writeEntry( "Recent Addresses", addresses() );
}
diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h
index 8d649e812..08976a027 100644
--- a/libtdepim/recentaddresses.h
+++ b/libtdepim/recentaddresses.h
@@ -37,7 +37,7 @@
#include <tdepimmacros.h>
-class KConfig;
+class TDEConfig;
class KEditListBox;
namespace KRecentAddress {
@@ -65,7 +65,7 @@ public:
/**
* @returns the only possible instance of this class.
*/
- static RecentAddresses * self(KConfig *config = 0L);
+ static RecentAddresses * self(TDEConfig *config = 0L);
/*
* @return true if self() was called, i.e. a RecentAddresses instance exists
@@ -102,13 +102,13 @@ public:
* Loads the list of recently used addresses from the configfile.
* Automatically done on startup.
*/
- void load( KConfig * );
+ void load( TDEConfig * );
/**
* Saves the list of recently used addresses to the configfile.
* Make sure to call TDEGlobal::config()->sync() afterwards, to really save.
*/
- void save( KConfig * );
+ void save( TDEConfig * );
/**
* Removes all entries from the history.
@@ -116,7 +116,7 @@ public:
void clear();
private:
- RecentAddresses(KConfig *config = 0L);
+ RecentAddresses(TDEConfig *config = 0L);
KABC::Addressee::List m_addresseeList;
diff --git a/libtdepim/resourceabc.cpp b/libtdepim/resourceabc.cpp
index dbcc98f87..16eeadc5b 100644
--- a/libtdepim/resourceabc.cpp
+++ b/libtdepim/resourceabc.cpp
@@ -26,7 +26,7 @@
using namespace KPIM;
-ResourceABC::ResourceABC( const KConfig* config )
+ResourceABC::ResourceABC( const TDEConfig* config )
: KABC::Resource( config )
{
}
diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h
index c7e019fb1..fe2e45bf1 100644
--- a/libtdepim/resourceabc.h
+++ b/libtdepim/resourceabc.h
@@ -47,7 +47,7 @@ class KDE_EXPORT ResourceABC : public KABC::Resource
public:
- ResourceABC( const KConfig* );
+ ResourceABC( const TDEConfig* );
virtual ~ResourceABC();
/**
diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp
index 7572c8478..b6962d511 100644
--- a/libtdepim/tests/testdistrlist.cpp
+++ b/libtdepim/tests/testdistrlist.cpp
@@ -152,8 +152,8 @@ void TestDistrList::cleanup()
TQString tdehome = TQFile::decodeName( getenv("TDEHOME") );
KURL urltdehome; urltdehome.setPath( tdehome );
- // don't use KIO::NetAccess here since it needs X
- // KIO::NetAccess::del( urltdehome, 0 )i;
+ // don't use TDEIO::NetAccess here since it needs X
+ // TDEIO::NetAccess::del( urltdehome, 0 )i;
assert( removeDirAndContentsRecursively( tdehome ) );
}
diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp
index 4e3dec288..1e404165e 100644
--- a/libtdepim/tests/testwizard.cpp
+++ b/libtdepim/tests/testwizard.cpp
@@ -32,11 +32,11 @@
#include <tqlayout.h>
#include <tqcheckbox.h>
-class TestConfigWizard : public KConfigWizard
+class TestConfigWizard : public TDEConfigWizard
{
public:
TestConfigWizard() :
- KConfigWizard( new KConfigPropagator( MyConfig::self(),
+ TDEConfigWizard( new TDEConfigPropagator( MyConfig::self(),
"propagator_test.kcfg" ) )
{
TQFrame *page = createWizardPage( "My Wizard Page" );
@@ -83,7 +83,7 @@ static const KCmdLineOptions options[] =
int main(int argc,char **argv)
{
- TDEAboutData aboutData("testwizard","Test KConfigWizard","0.1");
+ TDEAboutData aboutData("testwizard","Test TDEConfigWizard","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options );