TDE
/
tdepim
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KLock and KTrader to avoid conflicts with KDE4

Browse Source
pull/21/head
Timothy Pearson 12 years ago
parent 6dea944252
commit b440a9c608
29 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File

4
akregator/src/akregator_part.cpp
Unescape View File

@ -238,9 +238,9 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
void Part::loadPlugins() void Part::loadPlugins()
{ {
// "[X-TDE-akregator-plugintype] == 'storage'" // "[X-TDE-akregator-plugintype] == 'storage'"
KTrader::OfferList offers = PluginManager::query(); TDETrader::OfferList offers = PluginManager::query();
for( KTrader::OfferList::ConstIterator it = offers.begin(), end = offers.end(); it != end; ++it ) for( TDETrader::OfferList::ConstIterator it = offers.begin(), end = offers.end(); it != end; ++it )
{ {
Akregator::Plugin* plugin = PluginManager::createFromService(*it); Akregator::Plugin* plugin = PluginManager::createFromService(*it);
if (plugin) if (plugin)

2
akregator/src/akregator_plugin.desktop
Unescape View File

@ -69,7 +69,7 @@ Type=TQStringList
[PropertyDef::X-TDE-akregator-email] [PropertyDef::X-TDE-akregator-email]
Type=TQStringList Type=TQStringList
# Priority of the plugin. When KTrader returns multiple offers, the one with the highest rank is chosen. # Priority of the plugin. When TDETrader returns multiple offers, the one with the highest rank is chosen.
# Range: 0 (disabled) - 255 (highest) # Range: 0 (disabled) - 255 (highest)
[PropertyDef::X-TDE-akregator-rank] [PropertyDef::X-TDE-akregator-rank]
Type=int Type=int

8
akregator/src/pluginmanager.cpp
Unescape View File

@ -39,7 +39,7 @@ PluginManager::m_store;
// PUBLIC INTERFACE // PUBLIC INTERFACE
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
KTrader::OfferList TDETrader::OfferList
PluginManager::query( const TQString& constraint ) PluginManager::query( const TQString& constraint )
{ {
// Add versioning constraint // Add versioning constraint
@ -53,14 +53,14 @@ PluginManager::query( const TQString& constraint )
kdDebug() << "Plugin trader constraint: " << str << endl; kdDebug() << "Plugin trader constraint: " << str << endl;
return KTrader::self()->query( "Akregator/Plugin", str ); return TDETrader::self()->query( "Akregator/Plugin", str );
} }
Plugin* Plugin*
PluginManager::createFromQuery( const TQString &constraint ) PluginManager::createFromQuery( const TQString &constraint )
{ {
KTrader::OfferList offers = query( constraint ); TDETrader::OfferList offers = query( constraint );
if ( offers.isEmpty() ) { if ( offers.isEmpty() ) {
kdWarning() << k_funcinfo << "No matching plugin found.\n"; kdWarning() << k_funcinfo << "No matching plugin found.\n";
@ -156,7 +156,7 @@ PluginManager::getService( const Plugin* plugin )
void void
PluginManager::showAbout( const TQString &constraint ) PluginManager::showAbout( const TQString &constraint )
{ {
KTrader::OfferList offers = query( constraint ); TDETrader::OfferList offers = query( constraint );
if ( offers.isEmpty() ) if ( offers.isEmpty() )
return; return;

2
akregator/src/pluginmanager.h
Unescape View File

@ -55,7 +55,7 @@ class PluginManager
* @return A list of services that satisfy the query * @return A list of services that satisfy the query
* @see http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html * @see http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html
*/ */
static KTrader::OfferList query( const TQString& constraint = TQString() ); static TDETrader::OfferList query( const TQString& constraint = TQString() );
/** /**
* Load and instantiate plugin from query * Load and instantiate plugin from query

2
akregator/src/speechclient.cpp
Unescape View File

@ -153,7 +153,7 @@ bool SpeechClient::isTextToSpeechInstalled() const
void SpeechClient::setupSpeechSystem() void SpeechClient::setupSpeechSystem()
{ {
KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'"); TDETrader::OfferList offers = TDETrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
if (offers.count() == 0) if (offers.count() == 0)
{ {
kdDebug() << "KTTSD not installed, disable support" << endl; kdDebug() << "KTTSD not installed, disable support" << endl;

4
kaddressbook/contacteditorwidgetmanager.cpp
Unescape View File

@ -75,10 +75,10 @@ void ContactEditorWidgetManager::reload()
{ {
mFactories.clear(); mFactories.clear();
kdDebug(5720) << "ContactEditorWidgetManager::reload()" << endl; kdDebug(5720) << "ContactEditorWidgetManager::reload()" << endl;
const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/ContactEditorWidget", const TDETrader::OfferList plugins = TDETrader::self()->query( "KAddressBook/ContactEditorWidget",
TQString( "[X-TDE-KAddressBook-CEWPluginVersion] == %1" ).arg( KAB_CEW_PLUGIN_VERSION ) ); TQString( "[X-TDE-KAddressBook-CEWPluginVersion] == %1" ).arg( KAB_CEW_PLUGIN_VERSION ) );
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) { for ( it = plugins.begin(); it != plugins.end(); ++it ) {
KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() ); KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() );
if ( !factory ) { if ( !factory ) {

2
kaddressbook/editors/imeditorwidget.cpp
Unescape View File

@ -167,7 +167,7 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c
//mWidget->btnDown->setEnabled( false ); //mWidget->btnDown->setEnabled( false );
mPreferred = preferredIM; mPreferred = preferredIM;
mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true ); mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true );
mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KABC/IMProtocol" ) ) ); mProtocols = KPluginInfo::fromServices( TDETrader::self()->query( TQString::fromLatin1( "KABC/IMProtocol" ) ) );
// order the protocols by putting them in a qmap, then sorting the set of keys and recreating the list // order the protocols by putting them in a qmap, then sorting the set of keys and recreating the list
TQMap<TQString, KPluginInfo *> protocolMap; TQMap<TQString, KPluginInfo *> protocolMap;

4
kaddressbook/extensionmanager.cpp
Unescape View File

@ -216,10 +216,10 @@ void ExtensionManager::createExtensionWidgets()
} }
// load the other extensions // load the other extensions
const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension", const TDETrader::OfferList plugins = TDETrader::self()->query( "KAddressBook/Extension",
TQString( "[X-TDE-KAddressBook-ExtensionPluginVersion] == %1" ).arg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) ); TQString( "[X-TDE-KAddressBook-ExtensionPluginVersion] == %1" ).arg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) );
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) { for ( it = plugins.begin(); it != plugins.end(); ++it ) {
KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() ); KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() );
if ( !factory ) { if ( !factory ) {

4
kaddressbook/viewmanager.cpp
Unescape View File

@ -386,9 +386,9 @@ void ViewManager::scrollDown()
void ViewManager::createViewFactories() void ViewManager::createViewFactories()
{ {
const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/View", const TDETrader::OfferList plugins = TDETrader::self()->query( "KAddressBook/View",
TQString( "[X-TDE-KAddressBook-ViewPluginVersion] == %1" ).arg( KAB_VIEW_PLUGIN_VERSION ) ); TQString( "[X-TDE-KAddressBook-ViewPluginVersion] == %1" ).arg( KAB_VIEW_PLUGIN_VERSION ) );
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) { for ( it = plugins.begin(); it != plugins.end(); ++it ) {
if ( !(*it)->hasServiceType( "KAddressBook/View" ) ) if ( !(*it)->hasServiceType( "KAddressBook/View" ) )
continue; continue;

4
kaddressbook/xxportmanager.cpp
Unescape View File

@ -120,9 +120,9 @@ void XXPortManager::loadPlugins()
{ {
mXXPortObjects.clear(); mXXPortObjects.clear();
const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort", const TDETrader::OfferList plugins = TDETrader::self()->query( "KAddressBook/XXPort",
TQString( "[X-TDE-KAddressBook-XXPortPluginVersion] == %1" ).arg( KAB_XXPORT_PLUGIN_VERSION ) ); TQString( "[X-TDE-KAddressBook-XXPortPluginVersion] == %1" ).arg( KAB_XXPORT_PLUGIN_VERSION ) );
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) { for ( it = plugins.begin(); it != plugins.end(); ++it ) {
if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) ) if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) )
continue; continue;

2
kalarm/kalarmapp.cpp
Unescape View File

@ -135,7 +135,7 @@ KAlarmApp::KAlarmApp()
} }
// Check if the speech synthesis daemon is installed // Check if the speech synthesis daemon is installed
mSpeechEnabled = (KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'").count() > 0); mSpeechEnabled = (TDETrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'").count() > 0);
if (!mSpeechEnabled) if (!mSpeechEnabled)
kdDebug(5950) << "KAlarmApp::KAlarmApp(): speech synthesis disabled (KTTSD not found)" << endl; kdDebug(5950) << "KAlarmApp::KAlarmApp(): speech synthesis disabled (KTTSD not found)" << endl;
// Check if KOrganizer is installed // Check if KOrganizer is installed

2
kmail/regexplineedit.cpp
Unescape View File

@ -79,7 +79,7 @@ namespace KMail {
connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
this, TQT_SIGNAL( textChanged( const TQString & ) ) ); this, TQT_SIGNAL( textChanged( const TQString & ) ) );
if( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { if( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
mRegExpEditButton = new TQPushButton( i18n("Edit..."), this, mRegExpEditButton = new TQPushButton( i18n("Edit..."), this,
"mRegExpEditButton" ); "mRegExpEditButton" );
mRegExpEditButton->setSizePolicy( TQSizePolicy::Minimum, mRegExpEditButton->setSizePolicy( TQSizePolicy::Minimum,

4
kmobile/kmobile.cpp
Unescape View File

@ -267,8 +267,8 @@ void KMobile::addDevice()
dialog->selectButton->connect( dialog->selectButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(accept()) ); dialog->selectButton->connect( dialog->selectButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(accept()) );
dialog->cancelButton->connect( dialog->cancelButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(reject()) ); dialog->cancelButton->connect( dialog->cancelButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(reject()) );
KTrader::OfferList list = KMobileItem::getMobileDevicesList(); TDETrader::OfferList list = KMobileItem::getMobileDevicesList();
KTrader::OfferListIterator it; TDETrader::OfferListIterator it;
KService::Ptr ptr; KService::Ptr ptr;
for ( it = list.begin(); it != list.end(); ++it ) { for ( it = list.begin(); it != list.end(); ++it ) {
ptr = *it; ptr = *it;

8
kmobile/kmobileitem.cpp
Unescape View File

@ -144,17 +144,17 @@ void KMobileItem::writeKonquMimeFile() const
/* /*
* get a list of all services providing a libkmobile device driver * get a list of all services providing a libkmobile device driver
*/ */
KTrader::OfferList KMobileItem::getMobileDevicesList() TDETrader::OfferList KMobileItem::getMobileDevicesList()
{ {
KTrader::OfferList offers = KTrader::self()->query(KMOBILE_MIMETYPE_DEVICE); TDETrader::OfferList offers = TDETrader::self()->query(KMOBILE_MIMETYPE_DEVICE);
return offers; return offers;
} }
KService::Ptr KMobileItem::getServicePtr() const KService::Ptr KMobileItem::getServicePtr() const
{ {
KTrader::OfferList list = getMobileDevicesList(); TDETrader::OfferList list = getMobileDevicesList();
KTrader::OfferListIterator it; TDETrader::OfferListIterator it;
KService::Ptr ptr; KService::Ptr ptr;
for ( it = list.begin(); it != list.end(); ++it ) { for ( it = list.begin(); it != list.end(); ++it ) {
KService::Ptr ptr = *it; KService::Ptr ptr = *it;

2
kmobile/kmobileitem.h
Unescape View File

@ -26,7 +26,7 @@ public:
TQString config_SectionName( int idx = -1 ) const; TQString config_SectionName( int idx = -1 ) const;
TQPixmap getIcon() const; TQPixmap getIcon() const;
static KTrader::OfferList getMobileDevicesList(); static TDETrader::OfferList getMobileDevicesList();
protected: protected:
TQString getKonquMimeType() const; TQString getKonquMimeType() const;

2
kontact/TODO
Unescape View File

@ -5,7 +5,7 @@ UNTIL KDE 3.2
* Unified Identity handling (Name, Mail address, SMTP, use KMIdentity TDEPIM wide?) * Unified Identity handling (Name, Mail address, SMTP, use KMIdentity TDEPIM wide?)
Currently this is dublicated in at least KMail, KNode and KOrganizer Currently this is dublicated in at least KMail, KNode and KOrganizer
* Molularize KOrganizer and KMail Settings and turn them into kcm's * Molularize KOrganizer and KMail Settings and turn them into kcm's
* Think about extending the kcm idea and add a framework to locate kcm's for apps via KTrader * Think about extending the kcm idea and add a framework to locate kcm's for apps via TDETrader
- same for unified credits - same for unified credits
- find a solution for a setup wizard - find a solution for a setup wizard
- replace Splash class with QSplashScreen (done) - replace Splash class with QSplashScreen (done)

2
kontact/Thoughts
Unescape View File

@ -172,7 +172,7 @@ MiB: And don't forget KNotesIface loadKNotes() :-)
h: That doesn't sound extendable ;) h: That doesn't sound extendable ;)
h: So if I would like to add a 'New ShortMessage' part we would have to extend h: So if I would like to add a 'New ShortMessage' part we would have to extend
h: that library... better use KTrader and some sort of a common framework h: that library... better use TDETrader and some sort of a common framework
h: and Mib's comments shows that problem! h: and Mib's comments shows that problem!
d: That's what KDCOPServiceStarter is for :) d: That's what KDCOPServiceStarter is for :)

2
kontact/plugins/summary/kcmkontactsummary.cpp
Unescape View File

@ -118,7 +118,7 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
void KCMKontactSummary::load() void KCMKontactSummary::load()
{ {
KTrader::OfferList offers = KTrader::self()->query( TDETrader::OfferList offers = TDETrader::self()->query(
TQString::fromLatin1( "Kontact/Plugin" ), TQString::fromLatin1( "Kontact/Plugin" ),
TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );

2
kontact/src/kcmkontact.cpp
Unescape View File

@ -113,7 +113,7 @@ PluginSelection::~PluginSelection()
void PluginSelection::readConfig() void PluginSelection::readConfig()
{ {
const KTrader::OfferList offers = KTrader::self()->query( const TDETrader::OfferList offers = TDETrader::self()->query(
TQString::fromLatin1( "Kontact/Plugin" ), TQString::fromLatin1( "Kontact/Plugin" ),
TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );

2
kontact/src/main.cpp
Unescape View File

@ -75,7 +75,7 @@ class KontactApp : public KUniqueApplication {
static void listPlugins() static void listPlugins()
{ {
TDEInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options TDEInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options
KTrader::OfferList offers = KTrader::self()->query( TDETrader::OfferList offers = TDETrader::self()->query(
TQString::fromLatin1( "Kontact/Plugin" ), TQString::fromLatin1( "Kontact/Plugin" ),
TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) { for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) {

2
kontact/src/mainwindow.cpp
Unescape View File

@ -123,7 +123,7 @@ void MainWindow::initGUI()
connect( helpMenu, TQT_SIGNAL( showAboutApplication() ), connect( helpMenu, TQT_SIGNAL( showAboutApplication() ),
TQT_SLOT( showAboutDialog() ) ); TQT_SLOT( showAboutDialog() ) );
KTrader::OfferList offers = KTrader::self()->query( TDETrader::OfferList offers = TDETrader::self()->query(
TQString::fromLatin1( "Kontact/Plugin" ), TQString::fromLatin1( "Kontact/Plugin" ),
TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" ); mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" );

40
korganizer/kocore.cpp
Unescape View File

@ -62,7 +62,7 @@ KOCore::~KOCore()
mSelf = 0; mSelf = 0;
} }
KTrader::OfferList KOCore::availablePlugins( const TQString &type, int version ) TDETrader::OfferList KOCore::availablePlugins( const TQString &type, int version )
{ {
TQString constraint; TQString constraint;
if ( version >= 0 ) { if ( version >= 0 ) {
@ -70,28 +70,28 @@ KTrader::OfferList KOCore::availablePlugins( const TQString &type, int version )
.arg( TQString::number( version ) ); .arg( TQString::number( version ) );
} }
return KTrader::self()->query( type, constraint ); return TDETrader::self()->query( type, constraint );
} }
KTrader::OfferList KOCore::availablePlugins() TDETrader::OfferList KOCore::availablePlugins()
{ {
return availablePlugins( KOrg::Plugin::serviceType(), return availablePlugins( KOrg::Plugin::serviceType(),
KOrg::Plugin::interfaceVersion() ); KOrg::Plugin::interfaceVersion() );
} }
KTrader::OfferList KOCore::availableCalendarDecorations() TDETrader::OfferList KOCore::availableCalendarDecorations()
{ {
return availablePlugins( KOrg::CalendarDecoration::serviceType(), return availablePlugins( KOrg::CalendarDecoration::serviceType(),
KOrg::CalendarDecoration::interfaceVersion() ); KOrg::CalendarDecoration::interfaceVersion() );
} }
KTrader::OfferList KOCore::availableParts() TDETrader::OfferList KOCore::availableParts()
{ {
return availablePlugins( KOrg::Part::serviceType(), return availablePlugins( KOrg::Part::serviceType(),
KOrg::Part::interfaceVersion() ); KOrg::Part::interfaceVersion() );
} }
KTrader::OfferList KOCore::availablePrintPlugins() TDETrader::OfferList KOCore::availablePrintPlugins()
{ {
return availablePlugins( KOrg::PrintPlugin::serviceType(), return availablePlugins( KOrg::PrintPlugin::serviceType(),
KOrg::PrintPlugin::interfaceVersion() ); KOrg::PrintPlugin::interfaceVersion() );
@ -126,8 +126,8 @@ KOrg::Plugin *KOCore::loadPlugin( KService::Ptr service )
KOrg::Plugin *KOCore::loadPlugin( const TQString &name ) KOrg::Plugin *KOCore::loadPlugin( const TQString &name )
{ {
KTrader::OfferList list = availablePlugins(); TDETrader::OfferList list = availablePlugins();
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for( it = list.begin(); it != list.end(); ++it ) { for( it = list.begin(); it != list.end(); ++it ) {
if ( (*it)->desktopEntryName() == name ) { if ( (*it)->desktopEntryName() == name ) {
return loadPlugin( *it ); return loadPlugin( *it );
@ -160,8 +160,8 @@ KOrg::CalendarDecoration *KOCore::loadCalendarDecoration(KService::Ptr service)
KOrg::CalendarDecoration *KOCore::loadCalendarDecoration( const TQString &name ) KOrg::CalendarDecoration *KOCore::loadCalendarDecoration( const TQString &name )
{ {
KTrader::OfferList list = availableCalendarDecorations(); TDETrader::OfferList list = availableCalendarDecorations();
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for( it = list.begin(); it != list.end(); ++it ) { for( it = list.begin(); it != list.end(); ++it ) {
if ( (*it)->desktopEntryName() == name ) { if ( (*it)->desktopEntryName() == name ) {
return loadCalendarDecoration( *it ); return loadCalendarDecoration( *it );
@ -246,8 +246,8 @@ KXMLGUIClient* KOCore::xmlguiClient( TQWidget *wdg ) const
KOrg::Part *KOCore::loadPart( const TQString &name, KOrg::MainWindow *parent ) KOrg::Part *KOCore::loadPart( const TQString &name, KOrg::MainWindow *parent )
{ {
KTrader::OfferList list = availableParts(); TDETrader::OfferList list = availableParts();
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for( it = list.begin(); it != list.end(); ++it ) { for( it = list.begin(); it != list.end(); ++it ) {
if ( (*it)->desktopEntryName() == name ) { if ( (*it)->desktopEntryName() == name ) {
return loadPart( *it, parent ); return loadPart( *it, parent );
@ -258,8 +258,8 @@ KOrg::Part *KOCore::loadPart( const TQString &name, KOrg::MainWindow *parent )
KOrg::PrintPlugin *KOCore::loadPrintPlugin( const TQString &name ) KOrg::PrintPlugin *KOCore::loadPrintPlugin( const TQString &name )
{ {
KTrader::OfferList list = availablePrintPlugins(); TDETrader::OfferList list = availablePrintPlugins();
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for( it = list.begin(); it != list.end(); ++it ) { for( it = list.begin(); it != list.end(); ++it ) {
if ( (*it)->desktopEntryName() == name ) { if ( (*it)->desktopEntryName() == name ) {
return loadPrintPlugin( *it ); return loadPrintPlugin( *it );
@ -274,8 +274,8 @@ KOrg::CalendarDecoration::List KOCore::calendarDecorations()
TQStringList selectedPlugins = KOPrefs::instance()->mSelectedPlugins; TQStringList selectedPlugins = KOPrefs::instance()->mSelectedPlugins;
mCalendarDecorations.clear(); mCalendarDecorations.clear();
KTrader::OfferList plugins = availableCalendarDecorations(); TDETrader::OfferList plugins = availableCalendarDecorations();
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for( it = plugins.begin(); it != plugins.end(); ++it ) { for( it = plugins.begin(); it != plugins.end(); ++it ) {
if ( (*it)->hasServiceType("Calendar/Decoration") ) { if ( (*it)->hasServiceType("Calendar/Decoration") ) {
TQString name = (*it)->desktopEntryName(); TQString name = (*it)->desktopEntryName();
@ -297,8 +297,8 @@ KOrg::Part::List KOCore::loadParts( KOrg::MainWindow *parent )
TQStringList selectedPlugins = KOPrefs::instance()->mSelectedPlugins; TQStringList selectedPlugins = KOPrefs::instance()->mSelectedPlugins;
KTrader::OfferList plugins = availableParts(); TDETrader::OfferList plugins = availableParts();
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for( it = plugins.begin(); it != plugins.end(); ++it ) { for( it = plugins.begin(); it != plugins.end(); ++it ) {
if ( selectedPlugins.find( (*it)->desktopEntryName() ) != if ( selectedPlugins.find( (*it)->desktopEntryName() ) !=
selectedPlugins.end() ) { selectedPlugins.end() ) {
@ -323,8 +323,8 @@ KOrg::PrintPlugin::List KOCore::loadPrintPlugins()
TQStringList selectedPlugins = KOPrefs::instance()->mSelectedPlugins; TQStringList selectedPlugins = KOPrefs::instance()->mSelectedPlugins;
KTrader::OfferList plugins = availablePrintPlugins(); TDETrader::OfferList plugins = availablePrintPlugins();
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for( it = plugins.begin(); it != plugins.end(); ++it ) { for( it = plugins.begin(); it != plugins.end(); ++it ) {
if ( selectedPlugins.find( (*it)->desktopEntryName() ) != if ( selectedPlugins.find( (*it)->desktopEntryName() ) !=
selectedPlugins.end() ) { selectedPlugins.end() ) {

10
korganizer/kocore.h
Unescape View File

@ -41,10 +41,10 @@ class KDE_EXPORT KOCore
static KOCore *self(); static KOCore *self();
KTrader::OfferList availablePlugins(); TDETrader::OfferList availablePlugins();
KTrader::OfferList availableCalendarDecorations(); TDETrader::OfferList availableCalendarDecorations();
KTrader::OfferList availableParts(); TDETrader::OfferList availableParts();
KTrader::OfferList availablePrintPlugins(); TDETrader::OfferList availablePrintPlugins();
KOrg::Plugin *loadPlugin( KService::Ptr service ); KOrg::Plugin *loadPlugin( KService::Ptr service );
KOrg::Plugin *loadPlugin( const TQString & ); KOrg::Plugin *loadPlugin( const TQString & );
@ -87,7 +87,7 @@ class KDE_EXPORT KOCore
protected: protected:
KOCore(); KOCore();
KTrader::OfferList availablePlugins( const TQString &type, TDETrader::OfferList availablePlugins( const TQString &type,
int pluginInterfaceVersion = -1 ); int pluginInterfaceVersion = -1 );
private: private:

4
korganizer/koprefsdialog.cpp
Unescape View File

@ -1142,12 +1142,12 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name )
void KOPrefsDialogPlugins::usrReadConfig() void KOPrefsDialogPlugins::usrReadConfig()
{ {
mListView->clear(); mListView->clear();
KTrader::OfferList plugins = KOCore::self()->availablePlugins(); TDETrader::OfferList plugins = KOCore::self()->availablePlugins();
plugins += KOCore::self()->availableParts(); plugins += KOCore::self()->availableParts();
TQStringList selectedPlugins = KOPrefs::instance()->mSelectedPlugins; TQStringList selectedPlugins = KOPrefs::instance()->mSelectedPlugins;
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for( it = plugins.begin(); it != plugins.end(); ++it ) { for( it = plugins.begin(); it != plugins.end(); ++it ) {
TQCheckListItem *item = new PluginItem( mListView, *it ); TQCheckListItem *item = new PluginItem( mListView, *it );
if ( selectedPlugins.find( (*it)->desktopEntryName() ) != if ( selectedPlugins.find( (*it)->desktopEntryName() ) !=

4
korganizer/korgac/alarmdialog.cpp
Unescape View File

@ -553,8 +553,8 @@ void AlarmDialog::wakeUp()
void AlarmDialog::slotSave() void AlarmDialog::slotSave()
{ {
TDEConfig *config = kapp->config(); TDEConfig *config = kapp->config();
KLockFile::Ptr lock = config->lockFile(); TDELockFile::Ptr lock = config->lockFile();
if ( lock.data()->lock() != KLockFile::LockOK ) if ( lock.data()->lock() != TDELockFile::LockOK )
return; return;
config->setGroup( "General" ); config->setGroup( "General" );

4
korganizer/korgplugins.cpp
Unescape View File

@ -39,8 +39,8 @@ int main(int argc,char **argv)
TDEApplication app; TDEApplication app;
KTrader::OfferList plugins = KOCore::self()->availablePlugins(); TDETrader::OfferList plugins = KOCore::self()->availablePlugins();
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for(it = plugins.begin(); it != plugins.end(); ++it) { for(it = plugins.begin(); it != plugins.end(); ++it) {
kdDebug(5850) << "Plugin: " << (*it)->desktopEntryName() << " (" kdDebug(5850) << "Plugin: " << (*it)->desktopEntryName() << " ("
<< (*it)->name() << ")" << endl; << (*it)->name() << ")" << endl;

2
libtdepim/komposer/core/pluginmanager.cpp
Unescape View File

@ -82,7 +82,7 @@ PluginManager::PluginManager( TQObject *parent )
this, TQT_SLOT( loadAllPlugins() ) ); this, TQT_SLOT( loadAllPlugins() ) );
d->plugins = KPluginInfo::fromServices( d->plugins = KPluginInfo::fromServices(
KTrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ), TDETrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ),
TQString::fromLatin1( "[X-Komposer-Version] == 1" ) ) ); TQString::fromLatin1( "[X-Komposer-Version] == 1" ) ) );
} }

4
libtdepim/komposer/core/prefsmodule.cpp
Unescape View File

@ -100,9 +100,9 @@ EditorSelection::readConfig()
{ {
m_editorsCombo->clear(); m_editorsCombo->clear();
KTrader::OfferList editors = KTrader::self()->query( TDETrader::OfferList editors = TDETrader::self()->query(
TQString::fromLatin1( "Komposer/Editor" ) ); TQString::fromLatin1( "Komposer/Editor" ) );
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
int i = 0; int i = 0;
for ( it = editors.begin(); it != editors.end(); ++it, ++i ) { for ( it = editors.begin(); it != editors.end(); ++it, ++i ) {
if ( !(*it)->hasServiceType( TQString::fromLatin1( "Komposer/Editor" ) ) ) if ( !(*it)->hasServiceType( TQString::fromLatin1( "Komposer/Editor" ) ) )

2
libtdepim/kscoringeditor.cpp
Unescape View File

@ -129,7 +129,7 @@ void SingleConditionWidget::toggleRegExpButton( int selected )
{ {
bool isRegExp = (KScoringExpression::MATCH == selected || bool isRegExp = (KScoringExpression::MATCH == selected ||
KScoringExpression::MATCHCS == selected) && KScoringExpression::MATCHCS == selected) &&
!KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
regExpButton->setEnabled( isRegExp ); regExpButton->setEnabled( isRegExp );
} }

Write Preview
Loading…
Cancel
Save