From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kresources/README.design | 6 +++--- kresources/configdialog.cpp | 6 +++--- kresources/configpage.cpp | 18 +++++++++--------- kresources/configpage.h | 2 +- kresources/factory.cpp | 10 +++++----- kresources/kcmkresources.cpp | 4 ++-- kresources/manager.h | 2 +- kresources/managerimpl.cpp | 12 ++++++------ kresources/resource.h | 2 +- kresources/selectdialog.cpp | 2 +- 10 files changed, 32 insertions(+), 32 deletions(-) (limited to 'kresources') diff --git a/kresources/README.design b/kresources/README.design index df37dad40..563d0aeed 100644 --- a/kresources/README.design +++ b/kresources/README.design @@ -27,7 +27,7 @@ Resource families are usually implemented as (abstract) classes in a library, e.g. the calendar resource in libkcal en the addressbook resource family in libkabc. Resource type are like plugins: that can be loaded on-demand, they are implemented in -their own library, and a .desktop file tells KDE where to tqfind +their own library, and a .desktop file tells KDE where to find them. The user then configures one or more resources for a certain @@ -94,7 +94,7 @@ For examples, check the following files in kdepim/libkcal: - kcmcalendars.{h,cpp} Defines the KControl applet for calendar resources - kcalendars.desktop - This .desktop files tells KControl where to tqfind the + This .desktop files tells KControl where to find the applet for calendar resources. - Makefile.am How to build and install the calendar resource family @@ -119,7 +119,7 @@ kdepim/kresources/exchange: Defines the configuration widget for the exchange resource - exchange.desktop This file is installed so that the resource manager can - tqfind the exchange resource type + find the exchange resource type - Makefile.am How to build and install the exchange resource type diff --git a/kresources/configdialog.cpp b/kresources/configdialog.cpp index 69fcc798a..bbebc47a3 100644 --- a/kresources/configdialog.cpp +++ b/kresources/configdialog.cpp @@ -47,7 +47,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily, TQVBoxLayout *mainLayout = new TQVBoxLayout( main, 0, spacingHint() ); TQGroupBox *generalGroupBox = new TQGroupBox( 2, Qt::Horizontal, main ); - generalGroupBox->tqlayout()->setSpacing( spacingHint() ); + generalGroupBox->layout()->setSpacing( spacingHint() ); generalGroupBox->setTitle( i18n( "General Settings" ) ); new TQLabel( i18n( "Name:" ), generalGroupBox ); @@ -62,7 +62,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily, mainLayout->addWidget( generalGroupBox ); TQGroupBox *resourceGroupBox = new TQGroupBox( 2, Qt::Horizontal, main ); - resourceGroupBox->tqlayout()->setSpacing( spacingHint() ); + resourceGroupBox->layout()->setSpacing( spacingHint() ); resourceGroupBox->setTitle( i18n( "%1 Resource Settings" ) .arg( factory->typeName( resource->type() ) ) ); mainLayout->addWidget( resourceGroupBox ); @@ -82,7 +82,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily, TQT_SLOT( slotNameChanged(const TQString &))); slotNameChanged( mName->text() ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } void ConfigDialog::setInEditMode( bool value ) diff --git a/kresources/configpage.cpp b/kresources/configpage.cpp index d84db12f1..5e5e61198 100644 --- a/kresources/configpage.cpp +++ b/kresources/configpage.cpp @@ -106,9 +106,9 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) TQGroupBox *groupBox = new TQGroupBox( i18n( "Resources" ), this ); groupBox->setColumnLayout(0, Qt::Vertical ); - groupBox->tqlayout()->setSpacing( 6 ); - groupBox->tqlayout()->setMargin( 11 ); - TQGridLayout *groupBoxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 2 ); + groupBox->layout()->setSpacing( 6 ); + groupBox->layout()->setMargin( 11 ); + TQGridLayout *groupBoxLayout = new TQGridLayout( groupBox->layout(), 2, 2 ); mFamilyCombo = new KComboBox( false, groupBox ); groupBoxLayout->addMultiCellWidget( mFamilyCombo, 0, 0, 0, 1 ); @@ -130,7 +130,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) mEditButton->setEnabled( false ); mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), this, TQT_SLOT(slotStandard()) ); mStandardButton->setEnabled( false ); - buttonBox->tqlayout(); + buttonBox->layout(); groupBoxLayout->addWidget( buttonBox, 1, 1 ); @@ -179,7 +179,7 @@ void ConfigPage::load() KTrader::OfferList::ConstIterator end = plugins.end(); for ( ; it != end; ++it ) { const TQString family = (*it)->property( "X-KDE-ResourceFamily" ).toString(); - if ( compatFamilyNames.tqfind( family ) == compatFamilyNames.end() ) + if ( compatFamilyNames.find( family ) == compatFamilyNames.end() ) compatFamilyNames.append( family ); } @@ -300,7 +300,7 @@ void ConfigPage::slotAdd() if ( !ok ) return; - TQString type = types[ descs.tqfindIndex( desc ) ]; + TQString type = types[ descs.findIndex( desc ) ]; // Create new resource Resource *resource = mCurrentManager->createResource( type ); @@ -460,7 +460,7 @@ void ConfigPage::resourceModified( Resource *resource ) { kdDebug(5650) << "ConfigPage::resourceModified( " << resource->resourceName() << " )" << endl; - ConfigViewItem *item = tqfindItem( resource ); + ConfigViewItem *item = findItem( resource ); if ( !item ) return; // TODO: Reread resource config. Otherwise we won't see the modification. @@ -473,13 +473,13 @@ void ConfigPage::resourceDeleted( Resource *resource ) kdDebug(5650) << "ConfigPage::resourceDeleted( " << resource->resourceName() << " )" << endl; - ConfigViewItem *item = tqfindItem( resource ); + ConfigViewItem *item = findItem( resource ); if ( !item ) return; delete item; } -ConfigViewItem *ConfigPage::tqfindItem( Resource *resource ) +ConfigViewItem *ConfigPage::findItem( Resource *resource ) { TQListViewItem *i; for( i = mListView->firstChild(); i; i = i->nextSibling() ) { diff --git a/kresources/configpage.h b/kresources/configpage.h index 919731b6c..ec1fb3799 100644 --- a/kresources/configpage.h +++ b/kresources/configpage.h @@ -76,7 +76,7 @@ class KRESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver ); - factory = mSelves->tqfind( resourceFamily ); + factory = mSelves->find( resourceFamily ); if ( !factory ) { factory = new Factory( resourceFamily ); @@ -79,7 +79,7 @@ TQStringList Factory::typeNames() const ConfigWidget *Factory::configWidget( const TQString& type, TQWidget *parent ) { - if ( type.isEmpty() || !mTypeMap.tqcontains( type ) ) + if ( type.isEmpty() || !mTypeMap.contains( type ) ) return 0; KService::Ptr ptr = mTypeMap[ type ]; @@ -109,7 +109,7 @@ ConfigWidget *Factory::configWidget( const TQString& type, TQWidget *parent ) TQString Factory::typeName( const TQString &type ) const { - if ( type.isEmpty() || !mTypeMap.tqcontains( type ) ) + if ( type.isEmpty() || !mTypeMap.contains( type ) ) return TQString(); KService::Ptr ptr = mTypeMap[ type ]; @@ -118,7 +118,7 @@ TQString Factory::typeName( const TQString &type ) const TQString Factory::typeDescription( const TQString &type ) const { - if ( type.isEmpty() || !mTypeMap.tqcontains( type ) ) + if ( type.isEmpty() || !mTypeMap.contains( type ) ) return TQString(); KService::Ptr ptr = mTypeMap[ type ]; @@ -129,7 +129,7 @@ Resource *Factory::resource( const TQString& type, const KConfig *config ) { kdDebug(5650) << "Factory::resource( " << type << ", config )" << endl; - if ( type.isEmpty() || !mTypeMap.tqcontains( type ) ) { + if ( type.isEmpty() || !mTypeMap.contains( type ) ) { kdDebug(5650) << "Factory::resource() no such type " << type << endl; return 0; } diff --git a/kresources/kcmkresources.cpp b/kresources/kcmkresources.cpp index 9929e24ab..41fdb91fe 100644 --- a/kresources/kcmkresources.cpp +++ b/kresources/kcmkresources.cpp @@ -35,9 +35,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kresources, ResourcesFactory( "kcmkresources" ) KCMKResources::KCMKResources( TQWidget *parent, const char *name, const TQStringList& ) : KCModule( ResourcesFactory::instance(), parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); mConfigPage = new KRES::ConfigPage( this ); - tqlayout->addWidget( mConfigPage ); + layout->addWidget( mConfigPage ); connect( mConfigPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); setButtons( Help | Apply ); KAboutData *about = diff --git a/kresources/manager.h b/kresources/manager.h index c11ecaab5..ab1562716 100644 --- a/kresources/manager.h +++ b/kresources/manager.h @@ -335,7 +335,7 @@ class Manager : private ManagerNotifier ++it ) { TQString desc = mFactory->typeName( *it ); if ( !mFactory->typeDescription( *it ).isEmpty() ) - desc += TQString::tqfromLatin1(" (") + mFactory->typeDescription( *it ) + TQString::tqfromLatin1(")"); + desc += TQString::fromLatin1(" (") + mFactory->typeDescription( *it ) + TQString::fromLatin1(")"); typeDescs.append( desc ); } diff --git a/kresources/managerimpl.cpp b/kresources/managerimpl.cpp index 15dd33428..b5d9ec32f 100644 --- a/kresources/managerimpl.cpp +++ b/kresources/managerimpl.cpp @@ -353,7 +353,7 @@ Resource *ManagerImpl::readResourceConfig( const TQString &identifier, if ( checkActive ) { TQStringList activeKeys = mConfig->readListEntry( "ResourceKeys" ); - resource->setActive( activeKeys.tqcontains( identifier ) ); + resource->setActive( activeKeys.contains( identifier ) ); } mResources.append( resource ); @@ -383,20 +383,20 @@ void ManagerImpl::writeResourceConfig( Resource *resource, bool checkActive ) TQStringList activeKeys = mConfig->readListEntry( "ResourceKeys" ); TQStringList passiveKeys = mConfig->readListEntry( "PassiveResourceKeys" ); if ( resource->isActive() ) { - if ( passiveKeys.tqcontains( key ) ) { // remove it from passive list + if ( passiveKeys.contains( key ) ) { // remove it from passive list passiveKeys.remove( key ); mConfig->writeEntry( "PassiveResourceKeys", passiveKeys ); } - if ( !activeKeys.tqcontains( key ) ) { // add it to active list + if ( !activeKeys.contains( key ) ) { // add it to active list activeKeys.append( key ); mConfig->writeEntry( "ResourceKeys", activeKeys ); } } else if ( !resource->isActive() ) { - if ( activeKeys.tqcontains( key ) ) { // remove it from active list + if ( activeKeys.contains( key ) ) { // remove it from active list activeKeys.remove( key ); mConfig->writeEntry( "ResourceKeys", activeKeys ); } - if ( !passiveKeys.tqcontains( key ) ) { // add it to passive list + if ( !passiveKeys.contains( key ) ) { // add it to passive list passiveKeys.append( key ); mConfig->writeEntry( "PassiveResourceKeys", passiveKeys ); } @@ -414,7 +414,7 @@ void ManagerImpl::removeResource( Resource *resource ) mConfig->setGroup( "General" ); TQStringList activeKeys = mConfig->readListEntry( "ResourceKeys" ); - if ( activeKeys.tqcontains( key ) ) { + if ( activeKeys.contains( key ) ) { activeKeys.remove( key ); mConfig->writeEntry( "ResourceKeys", activeKeys ); } else { diff --git a/kresources/resource.h b/kresources/resource.h index eec790bbe..63190378d 100644 --- a/kresources/resource.h +++ b/kresources/resource.h @@ -252,7 +252,7 @@ service_DATA = resourceexample.desktop data. Subclasses of ResourceCalendar would implement this API for local files, remote files, specific calendar servers etc. */ -class KRESOURCES_EXPORT Resource : public TQObject +class KRESOURCES_EXPORT Resource : public QObject { friend class Factory; friend class ManagerImpl; diff --git a/kresources/selectdialog.cpp b/kresources/selectdialog.cpp index 4e2d28ec7..cc1c7e593 100644 --- a/kresources/selectdialog.cpp +++ b/kresources/selectdialog.cpp @@ -59,7 +59,7 @@ SelectDialog::SelectDialog( TQPtrList list, TQWidget *parent, buttonBox->addStretch(); buttonBox->addButton( KStdGuiItem::ok(), this, TQT_SLOT( accept() ) ); buttonBox->addButton( KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) ); - buttonBox->tqlayout(); + buttonBox->layout(); mainLayout->addWidget( buttonBox ); -- cgit v1.2.1