Rename KLock and KTrader to avoid conflicts with KDE4

remotes/gitea/gg-tdeadmin-kcron
Timothy Pearson 11 years ago
parent 64d4c5289c
commit 58cb2c2c17

@ -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();

@ -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

@ -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)
{

@ -172,7 +172,7 @@ private:
TQSize mMinSize;
KPopupMenu* mOpenWithMenu;
KTrader::OfferList mOpenWithOffers;
TDETrader::OfferList mOpenWithOffers;
TQCString m_buffer;
};

Loading…
Cancel
Save