From 58cb2c2c17b1e6dd48cbfbcb69ec2f50f1ced9ee Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 10:48:41 -0600
Subject: Rename KLock and KTrader to avoid conflicts with KDE4

---
 ksysv/IOCore.cpp  | 4 ++--
 ksysv/IOCore.h    | 2 +-
 ksysv/OldView.cpp | 2 +-
 ksysv/OldView.h   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'ksysv')

diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp
index 1951aa2..75af033 100644
--- a/ksysv/IOCore.cpp
+++ b/ksysv/IOCore.cpp
@@ -273,9 +273,9 @@ bool ksv::IO::saveConfiguration (TQDataStream& s,
   return true;
 }
 
-KTrader::OfferList ksv::IO::servicesForFile (const TQString& filename)
+TDETrader::OfferList ksv::IO::servicesForFile (const TQString& filename)
 {
-  static KTrader* trader = KTrader::self();
+  static TDETrader* trader = TDETrader::self();
   static KMimeMagic* magic = KMimeMagic::self();
   const TQString mimetype = magic->findFileType(filename)->mimeType();
 
diff --git a/ksysv/IOCore.h b/ksysv/IOCore.h
index db1ca96..fa89e0c 100644
--- a/ksysv/IOCore.h
+++ b/ksysv/IOCore.h
@@ -54,7 +54,7 @@ namespace ksv
                                  TQValueList<KSVData>* start,
                                  TQValueList<KSVData>* stop);
 
-    KTrader::OfferList servicesForFile (const TQString& filename);
+    TDETrader::OfferList servicesForFile (const TQString& filename);
     KService::Ptr preferredServiceForFile (const TQString& filename);
 
   } // namespace IO
diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp
index d3357ad..dbacbe6 100644
--- a/ksysv/OldView.cpp
+++ b/ksysv/OldView.cpp
@@ -1015,7 +1015,7 @@ void KSVContent::popupServicesMenu (KListView*, TQListViewItem* i, const TQPoint
         = ksv::IO::servicesForFile (static_cast<KSVItem*>(i)->filenameAndPath());
 
       int i = 0;
-      for (KTrader::OfferList::Iterator it = mOpenWithOffers.begin();
+      for (TDETrader::OfferList::Iterator it = mOpenWithOffers.begin();
            it != mOpenWithOffers.end();
            ++it)
         {
diff --git a/ksysv/OldView.h b/ksysv/OldView.h
index acf319d..c71b995 100644
--- a/ksysv/OldView.h
+++ b/ksysv/OldView.h
@@ -172,7 +172,7 @@ private:
   TQSize mMinSize;
 
   KPopupMenu* mOpenWithMenu;
-  KTrader::OfferList mOpenWithOffers;
+  TDETrader::OfferList mOpenWithOffers;
 
   TQCString m_buffer;
 };
-- 
cgit v1.2.1