summaryrefslogtreecommitdiffstats
path: root/konqueror/konq_factory.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:49:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:49:49 -0600
commitdc5f267664506a312203c26bfe9001a448b0bb0f (patch)
treea78c7f15e87303d22b89619db42fc56ad8f4a046 /konqueror/konq_factory.h
parent98f4a055baf6eb7ea5c3d69d6a3f2162b491e253 (diff)
downloadtdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.tar.gz
tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_factory.h')
-rw-r--r--konqueror/konq_factory.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h
index d856dbfa..5d771354 100644
--- a/konqueror/konq_factory.h
+++ b/konqueror/konq_factory.h
@@ -69,13 +69,13 @@ public:
static KonqViewFactory createView( const TQString &serviceType,
const TQString &serviceName = TQString::null,
KService::Ptr *serviceImpl = 0,
- KTrader::OfferList *partServiceOffers = 0,
- KTrader::OfferList *appServiceOffers = 0,
+ TDETrader::OfferList *partServiceOffers = 0,
+ TDETrader::OfferList *appServiceOffers = 0,
bool forceAutoEmbed = false );
static void getOffers( const TQString & serviceType,
- KTrader::OfferList *partServiceOffers = 0,
- KTrader::OfferList *appServiceOffers = 0);
+ TDETrader::OfferList *partServiceOffers = 0,
+ TDETrader::OfferList *appServiceOffers = 0);
static const TDEAboutData* aboutData();