diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:52:27 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:52:27 -0600 |
commit | b440a9c608596cd88efdb3bfa4661c5e37efbe4b (patch) | |
tree | 83fe0c80cbb2bbcfefac383520869fe3a64e88f1 /korganizer/kocore.h | |
parent | 6dea9442526e5ebacf313ad387c7dff4b87a53bf (diff) | |
download | tdepim-b440a9c608596cd88efdb3bfa4661c5e37efbe4b.tar.gz tdepim-b440a9c608596cd88efdb3bfa4661c5e37efbe4b.zip |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/kocore.h')
-rw-r--r-- | korganizer/kocore.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/korganizer/kocore.h b/korganizer/kocore.h index 5ce1843dd..d160f68d1 100644 --- a/korganizer/kocore.h +++ b/korganizer/kocore.h @@ -41,10 +41,10 @@ class KDE_EXPORT KOCore static KOCore *self(); - KTrader::OfferList availablePlugins(); - KTrader::OfferList availableCalendarDecorations(); - KTrader::OfferList availableParts(); - KTrader::OfferList availablePrintPlugins(); + TDETrader::OfferList availablePlugins(); + TDETrader::OfferList availableCalendarDecorations(); + TDETrader::OfferList availableParts(); + TDETrader::OfferList availablePrintPlugins(); KOrg::Plugin *loadPlugin( KService::Ptr service ); KOrg::Plugin *loadPlugin( const TQString & ); @@ -87,7 +87,7 @@ class KDE_EXPORT KOCore protected: KOCore(); - KTrader::OfferList availablePlugins( const TQString &type, + TDETrader::OfferList availablePlugins( const TQString &type, int pluginInterfaceVersion = -1 ); private: |