Rename KLock and KTrader to avoid conflicts with KDE4

5 files changed, 31 insertions, 31 deletions

diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp
index ace67c185..0b1d39dbe 100644
--- a/korganizer/kocore.cpp
+++ b/korganizer/kocore.cpp
@@ -62,7 +62,7 @@ KOCore::~KOCore()
   mSelf = 0;
 }
 
-KTrader::OfferList KOCore::availablePlugins( const TQString &type, int version )
+TDETrader::OfferList KOCore::availablePlugins( const TQString &type, int version )
 {
   TQString constraint;
   if ( version >= 0 ) {
@@ -70,28 +70,28 @@ KTrader::OfferList KOCore::availablePlugins( const TQString &type, int 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(),
                            KOrg::Plugin::interfaceVersion() );
 }
 
-KTrader::OfferList KOCore::availableCalendarDecorations()
+TDETrader::OfferList KOCore::availableCalendarDecorations()
 {
   return availablePlugins( KOrg::CalendarDecoration::serviceType(),
                            KOrg::CalendarDecoration::interfaceVersion() );
 }
 
-KTrader::OfferList KOCore::availableParts()
+TDETrader::OfferList KOCore::availableParts()
 {
   return availablePlugins( KOrg::Part::serviceType(),
                            KOrg::Part::interfaceVersion() );
 }
 
-KTrader::OfferList KOCore::availablePrintPlugins()
+TDETrader::OfferList KOCore::availablePrintPlugins()
 {
   return availablePlugins( KOrg::PrintPlugin::serviceType(),
                            KOrg::PrintPlugin::interfaceVersion() );
@@ -126,8 +126,8 @@ KOrg::Plugin *KOCore::loadPlugin( KService::Ptr service )
 
 KOrg::Plugin *KOCore::loadPlugin( const TQString &name )
 {
-  KTrader::OfferList list = availablePlugins();
-  KTrader::OfferList::ConstIterator it;
+  TDETrader::OfferList list = availablePlugins();
+  TDETrader::OfferList::ConstIterator it;
   for( it = list.begin(); it != list.end(); ++it ) {
     if ( (*it)->desktopEntryName() == name ) {
       return loadPlugin( *it );
@@ -160,8 +160,8 @@ KOrg::CalendarDecoration *KOCore::loadCalendarDecoration(KService::Ptr service)
 
 KOrg::CalendarDecoration *KOCore::loadCalendarDecoration( const TQString &name )
 {
-  KTrader::OfferList list = availableCalendarDecorations();
-  KTrader::OfferList::ConstIterator it;
+  TDETrader::OfferList list = availableCalendarDecorations();
+  TDETrader::OfferList::ConstIterator it;
   for( it = list.begin(); it != list.end(); ++it ) {
     if ( (*it)->desktopEntryName() == name ) {
       return loadCalendarDecoration( *it );
@@ -246,8 +246,8 @@ KXMLGUIClient* KOCore::xmlguiClient( TQWidget *wdg ) const
 
 KOrg::Part *KOCore::loadPart( const TQString &name, KOrg::MainWindow *parent )
 {
-  KTrader::OfferList list = availableParts();
-  KTrader::OfferList::ConstIterator it;
+  TDETrader::OfferList list = availableParts();
+  TDETrader::OfferList::ConstIterator it;
   for( it = list.begin(); it != list.end(); ++it ) {
     if ( (*it)->desktopEntryName() == name ) {
       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 )
 {
-  KTrader::OfferList list = availablePrintPlugins();
-  KTrader::OfferList::ConstIterator it;
+  TDETrader::OfferList list = availablePrintPlugins();
+  TDETrader::OfferList::ConstIterator it;
   for( it = list.begin(); it != list.end(); ++it ) {
     if ( (*it)->desktopEntryName() == name ) {
       return loadPrintPlugin( *it );
@@ -274,8 +274,8 @@ KOrg::CalendarDecoration::List KOCore::calendarDecorations()
     TQStringList selectedPlugins = KOPrefs::instance()->mSelectedPlugins;
 
     mCalendarDecorations.clear();
-    KTrader::OfferList plugins = availableCalendarDecorations();
-    KTrader::OfferList::ConstIterator it;
+    TDETrader::OfferList plugins = availableCalendarDecorations();
+    TDETrader::OfferList::ConstIterator it;
     for( it = plugins.begin(); it != plugins.end(); ++it ) {
       if ( (*it)->hasServiceType("Calendar/Decoration") ) {
         TQString name = (*it)->desktopEntryName();
@@ -297,8 +297,8 @@ KOrg::Part::List KOCore::loadParts( KOrg::MainWindow *parent )
 
   TQStringList selectedPlugins = KOPrefs::instance()->mSelectedPlugins;
 
-  KTrader::OfferList plugins = availableParts();
-  KTrader::OfferList::ConstIterator it;
+  TDETrader::OfferList plugins = availableParts();
+  TDETrader::OfferList::ConstIterator it;
   for( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( selectedPlugins.find( (*it)->desktopEntryName() ) !=
                                selectedPlugins.end() ) {
@@ -323,8 +323,8 @@ KOrg::PrintPlugin::List KOCore::loadPrintPlugins()
 
   TQStringList selectedPlugins = KOPrefs::instance()->mSelectedPlugins;
 
-  KTrader::OfferList plugins = availablePrintPlugins();
-  KTrader::OfferList::ConstIterator it;
+  TDETrader::OfferList plugins = availablePrintPlugins();
+  TDETrader::OfferList::ConstIterator it;
   for( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( selectedPlugins.find( (*it)->desktopEntryName() ) !=
                                selectedPlugins.end() ) {
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:
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 06ecccd33..3cfbe1711 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -1142,12 +1142,12 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name )
 void KOPrefsDialogPlugins::usrReadConfig()
 {
   mListView->clear();
-  KTrader::OfferList plugins = KOCore::self()->availablePlugins();
+  TDETrader::OfferList plugins = KOCore::self()->availablePlugins();
   plugins += KOCore::self()->availableParts();
 
   TQStringList selectedPlugins = KOPrefs::instance()->mSelectedPlugins;
 
-  KTrader::OfferList::ConstIterator it;
+  TDETrader::OfferList::ConstIterator it;
   for( it = plugins.begin(); it != plugins.end(); ++it ) {
     TQCheckListItem *item = new PluginItem( mListView, *it );
     if ( selectedPlugins.find( (*it)->desktopEntryName() ) !=
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index e85f630e9..bd005bc17 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -553,8 +553,8 @@ void AlarmDialog::wakeUp()
 void AlarmDialog::slotSave()
 {
   TDEConfig *config = kapp->config();
-  KLockFile::Ptr lock = config->lockFile();
-  if ( lock.data()->lock() != KLockFile::LockOK )
+  TDELockFile::Ptr lock = config->lockFile();
+  if ( lock.data()->lock() != TDELockFile::LockOK )
     return;
 
   config->setGroup( "General" );
diff --git a/korganizer/korgplugins.cpp b/korganizer/korgplugins.cpp
index 3d371f9da..8b2a5343b 100644
--- a/korganizer/korgplugins.cpp
+++ b/korganizer/korgplugins.cpp
@@ -39,8 +39,8 @@ int main(int argc,char **argv)
 
   TDEApplication app;
   
-  KTrader::OfferList plugins = KOCore::self()->availablePlugins();
-  KTrader::OfferList::ConstIterator it;
+  TDETrader::OfferList plugins = KOCore::self()->availablePlugins();
+  TDETrader::OfferList::ConstIterator it;
   for(it = plugins.begin(); it != plugins.end(); ++it) {
     kdDebug(5850) << "Plugin: " << (*it)->desktopEntryName() << " ("
               << (*it)->name() << ")" << endl;