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 /kmobile | |
| parent | 6dea9442526e5ebacf313ad387c7dff4b87a53bf (diff) | |
| download | tdepim-b440a9c608596cd88efdb3bfa4661c5e37efbe4b.tar.gz tdepim-b440a9c608596cd88efdb3bfa4661c5e37efbe4b.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kmobile')
| -rw-r--r-- | kmobile/kmobile.cpp | 4 | ||||
| -rw-r--r-- | kmobile/kmobileitem.cpp | 8 | ||||
| -rw-r--r-- | kmobile/kmobileitem.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index 3e2663b5a..48d8d2983 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -267,8 +267,8 @@ void KMobile::addDevice() dialog->selectButton->connect( dialog->selectButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(accept()) ); dialog->cancelButton->connect( dialog->cancelButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(reject()) ); - KTrader::OfferList list = KMobileItem::getMobileDevicesList(); - KTrader::OfferListIterator it; + TDETrader::OfferList list = KMobileItem::getMobileDevicesList(); + TDETrader::OfferListIterator it; KService::Ptr ptr; for ( it = list.begin(); it != list.end(); ++it ) { ptr = *it; diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp index e7e97854f..8c249b768 100644 --- a/kmobile/kmobileitem.cpp +++ b/kmobile/kmobileitem.cpp @@ -144,17 +144,17 @@ void KMobileItem::writeKonquMimeFile() const /* * get a list of all services providing a libkmobile device driver */ -KTrader::OfferList KMobileItem::getMobileDevicesList() +TDETrader::OfferList KMobileItem::getMobileDevicesList() { - KTrader::OfferList offers = KTrader::self()->query(KMOBILE_MIMETYPE_DEVICE); + TDETrader::OfferList offers = TDETrader::self()->query(KMOBILE_MIMETYPE_DEVICE); return offers; } KService::Ptr KMobileItem::getServicePtr() const { - KTrader::OfferList list = getMobileDevicesList(); - KTrader::OfferListIterator it; + TDETrader::OfferList list = getMobileDevicesList(); + TDETrader::OfferListIterator it; KService::Ptr ptr; for ( it = list.begin(); it != list.end(); ++it ) { KService::Ptr ptr = *it; diff --git a/kmobile/kmobileitem.h b/kmobile/kmobileitem.h index d3dc1761e..02ee75cb7 100644 --- a/kmobile/kmobileitem.h +++ b/kmobile/kmobileitem.h @@ -26,7 +26,7 @@ public: TQString config_SectionName( int idx = -1 ) const; TQPixmap getIcon() const; - static KTrader::OfferList getMobileDevicesList(); + static TDETrader::OfferList getMobileDevicesList(); protected: TQString getKonquMimeType() const; |