From 0b621eebc843e0c604d76f1da596353c82898316 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 14 Feb 2014 21:12:15 -0600 Subject: [PATCH] Finish renaming kresources->tderesources. --- tdeabc/plugins/dir/dir.desktop | 2 +- tdeabc/plugins/evolution/evolution.desktop | 2 +- tdeabc/plugins/file/file.desktop | 2 +- tdeabc/plugins/ldaptdeio/ldaptdeio.desktop | 2 +- tdeabc/plugins/net/net.desktop | 2 +- tdeabc/tdeabc_manager.desktop | 2 +- tderesources/configpage.cpp | 4 ++-- tderesources/factory.cpp | 2 +- tderesources/kcmtderesources.cpp | 10 +++++----- tderesources/kcmtderesources.h | 4 ++-- tderesources/manager.h | 2 +- tderesources/managerimpl.cpp | 2 +- tderesources/tderesources_manager.desktop | 2 +- tderesources/tderesources_plugin.desktop | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tdeabc/plugins/dir/dir.desktop b/tdeabc/plugins/dir/dir.desktop index 292815637..d78a2ed92 100644 --- a/tdeabc/plugins/dir/dir.desktop +++ b/tdeabc/plugins/dir/dir.desktop @@ -87,6 +87,6 @@ Name[zh_TW]=目錄 Name[zu]=Uhlu lwamafayela X-TDE-Library=tdeabc_dir Type=Service -ServiceTypes=KResources/Plugin +ServiceTypes=TDEResources/Plugin X-TDE-ResourceFamily=contact X-TDE-ResourceType=dir diff --git a/tdeabc/plugins/evolution/evolution.desktop b/tdeabc/plugins/evolution/evolution.desktop index 6893abdad..24407dd9f 100644 --- a/tdeabc/plugins/evolution/evolution.desktop +++ b/tdeabc/plugins/evolution/evolution.desktop @@ -21,6 +21,6 @@ Name[xh]=Utshintsho lwendawo ngokwenqanawa Name[zu]=Evolushini X-TDE-Library=tdeabc_evo Type=Service -ServiceTypes=KResources/Plugin +ServiceTypes=TDEResources/Plugin X-TDE-ResourceFamily=contact X-TDE-ResourceType=evolution diff --git a/tdeabc/plugins/file/file.desktop b/tdeabc/plugins/file/file.desktop index 4c7991989..92afbb482 100644 --- a/tdeabc/plugins/file/file.desktop +++ b/tdeabc/plugins/file/file.desktop @@ -77,6 +77,6 @@ Name[zh_HK]=檔案 Name[zh_TW]=檔案 X-TDE-Library=tdeabc_file Type=Service -ServiceTypes=KResources/Plugin +ServiceTypes=TDEResources/Plugin X-TDE-ResourceFamily=contact X-TDE-ResourceType=file diff --git a/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop b/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop index 683a38d13..953070226 100644 --- a/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop +++ b/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop @@ -5,6 +5,6 @@ Name[hi]=एलडीएपी (LDAP) Name[te]=ఎల్డిఏపి X-TDE-Library=tdeabc_ldaptdeio Type=Service -ServiceTypes=KResources/Plugin +ServiceTypes=TDEResources/Plugin X-TDE-ResourceFamily=contact X-TDE-ResourceType=ldaptdeio diff --git a/tdeabc/plugins/net/net.desktop b/tdeabc/plugins/net/net.desktop index adc7394b5..7daa9ce72 100644 --- a/tdeabc/plugins/net/net.desktop +++ b/tdeabc/plugins/net/net.desktop @@ -85,6 +85,6 @@ Name[zh_TW]=網路 Name[zu]=Umsebenzi wokuxhumana okusakazekile X-TDE-Library=tdeabc_net Type=Service -ServiceTypes=KResources/Plugin +ServiceTypes=TDEResources/Plugin X-TDE-ResourceFamily=contact X-TDE-ResourceType=net diff --git a/tdeabc/tdeabc_manager.desktop b/tdeabc/tdeabc_manager.desktop index 0af910f52..533ccfb7d 100644 --- a/tdeabc/tdeabc_manager.desktop +++ b/tdeabc/tdeabc_manager.desktop @@ -71,6 +71,6 @@ Name[zh_CN]=联系人 Name[zh_HK]=聯絡人 Name[zh_TW]=聯絡人 Type=Service -ServiceTypes=KResources/Manager +ServiceTypes=TDEResources/Manager X-TDE-ResourceFamily=contact diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp index 8378707e6..4ba33cc83 100644 --- a/tderesources/configpage.cpp +++ b/tderesources/configpage.cpp @@ -174,7 +174,7 @@ void ConfigPage::load() // KDE-3.3 compatibility code: get families from the plugins TQStringList compatFamilyNames; - const TDETrader::OfferList plugins = TDETrader::self()->query( "KResources/Plugin" ); + const TDETrader::OfferList plugins = TDETrader::self()->query( "TDEResources/Plugin" ); TDETrader::OfferList::ConstIterator it = plugins.begin(); TDETrader::OfferList::ConstIterator end = plugins.end(); for ( ; it != end; ++it ) { @@ -183,7 +183,7 @@ void ConfigPage::load() compatFamilyNames.append( family ); } - const TDETrader::OfferList managers = TDETrader::self()->query( "KResources/Manager" ); + const TDETrader::OfferList managers = TDETrader::self()->query( "TDEResources/Manager" ); TDETrader::OfferList::ConstIterator m_it; for( m_it = managers.begin(); m_it != managers.end(); ++m_it ) { TQString displayName = (*m_it)->property( "Name" ).toString(); diff --git a/tderesources/factory.cpp b/tderesources/factory.cpp index eea2d3673..bb6c31a53 100644 --- a/tderesources/factory.cpp +++ b/tderesources/factory.cpp @@ -58,7 +58,7 @@ Factory *Factory::self( const TQString& resourceFamily ) Factory::Factory( const TQString& resourceFamily ) : mResourceFamily( resourceFamily ) { - TDETrader::OfferList plugins = TDETrader::self()->query( "KResources/Plugin", TQString( "[X-TDE-ResourceFamily] == '%1'" ) + TDETrader::OfferList plugins = TDETrader::self()->query( "TDEResources/Plugin", TQString( "[X-TDE-ResourceFamily] == '%1'" ) .arg( resourceFamily ) ); TDETrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { diff --git a/tderesources/kcmtderesources.cpp b/tderesources/kcmtderesources.cpp index c3d5ae09e..60eda28b2 100644 --- a/tderesources/kcmtderesources.cpp +++ b/tderesources/kcmtderesources.cpp @@ -29,10 +29,10 @@ #include "kcmtderesources.h" -typedef KGenericFactory ResourcesFactory; +typedef KGenericFactory ResourcesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_tderesources, ResourcesFactory( "kcmtderesources" ) ) -KCMKResources::KCMKResources( TQWidget *parent, const char *name, const TQStringList& ) +KCMTDEResources::KCMTDEResources( TQWidget *parent, const char *name, const TQStringList& ) : TDECModule( ResourcesFactory::instance(), parent, name ) { TQVBoxLayout *layout = new TQVBoxLayout( this ); @@ -50,17 +50,17 @@ KCMKResources::KCMKResources( TQWidget *parent, const char *name, const TQString setAboutData(about); } -void KCMKResources::load() +void KCMTDEResources::load() { mConfigPage->load(); } -void KCMKResources::save() +void KCMTDEResources::save() { mConfigPage->save(); } -void KCMKResources::defaults() +void KCMTDEResources::defaults() { mConfigPage->defaults(); } diff --git a/tderesources/kcmtderesources.h b/tderesources/kcmtderesources.h index 08bf7ca4d..4c6b99214 100644 --- a/tderesources/kcmtderesources.h +++ b/tderesources/kcmtderesources.h @@ -24,12 +24,12 @@ #include -class TDERESOURCES_EXPORT KCMKResources : public TDECModule +class TDERESOURCES_EXPORT KCMTDEResources : public TDECModule { Q_OBJECT public: - KCMKResources( TQWidget *parent, const char *name, const TQStringList& ); + KCMTDEResources( TQWidget *parent, const char *name, const TQStringList& ); void load(); void save(); diff --git a/tderesources/manager.h b/tderesources/manager.h index 676f3bf4a..0a3fca823 100644 --- a/tderesources/manager.h +++ b/tderesources/manager.h @@ -73,7 +73,7 @@ class ManagerNotifier Since KDE 3.4 it's required to supply your application with a *.desktop file for each resource family you introduce. The ServiceType should be of - KResources/Manager. + TDEResources/Manager. */ template class Manager : private ManagerNotifier diff --git a/tderesources/managerimpl.cpp b/tderesources/managerimpl.cpp index 288a40223..ee93fc8b0 100644 --- a/tderesources/managerimpl.cpp +++ b/tderesources/managerimpl.cpp @@ -49,7 +49,7 @@ ManagerImpl::ManagerImpl( ManagerNotifier *notifier, const TQString &family ) // Register with DCOP if ( !kapp->dcopClient()->isRegistered() ) { - kapp->dcopClient()->registerAs( "KResourcesManager" ); + kapp->dcopClient()->registerAs( "TDEResourcesManager" ); kapp->dcopClient()->setDefaultObject( objId() ); } diff --git a/tderesources/tderesources_manager.desktop b/tderesources/tderesources_manager.desktop index 35a0d1b5d..f340cc804 100644 --- a/tderesources/tderesources_manager.desktop +++ b/tderesources/tderesources_manager.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=ServiceType -X-TDE-ServiceType=KResources/Manager +X-TDE-ServiceType=TDEResources/Manager Comment=KResource Manager Comment[af]=KHulpbron bestuurder Comment[be]=Кіраўнік рэсурсаў KResource diff --git a/tderesources/tderesources_plugin.desktop b/tderesources/tderesources_plugin.desktop index 56cfe5bad..daa65f898 100644 --- a/tderesources/tderesources_plugin.desktop +++ b/tderesources/tderesources_plugin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=ServiceType -X-TDE-ServiceType=KResources/Plugin +X-TDE-ServiceType=TDEResources/Plugin Comment=KResource Framework Plugin Comment[af]=KHulpbron Raamwerk Inprop module Comment[az]=KResource Əlavəsi