summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:41:00 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:41:00 -0600
commitbd4e86464b9ab0afe8cb010127fdd397683e1b52 (patch)
tree05cdd9f287e3f3b6b0df388f94f13226d0b4edb3
parentdad8adc7ea83f4cbfcc9c3bb02cd6aaec1bbe693 (diff)
downloadkile-bd4e8646.tar.gz
kile-bd4e8646.zip
Rename KLock and KTrader to avoid conflicts with KDE4
-rw-r--r--src/kile/docpart.cpp2
-rw-r--r--src/kile/kileprojectview.cpp2
-rw-r--r--src/kile/kileprojectview.h2
-rw-r--r--src/kile/kilestructurewidget.cpp2
-rw-r--r--src/kile/kilestructurewidget.h2
-rw-r--r--src/kile/texdocdialog.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/kile/docpart.cpp b/src/kile/docpart.cpp
index 359737b..331c071 100644
--- a/src/kile/docpart.cpp
+++ b/src/kile/docpart.cpp
@@ -59,7 +59,7 @@ void DocumentationViewer::urlSelected(const TQString &url, int button, int state
//TDEHTML can't handle it, look for an appropriate application
else
{
- KTrader::OfferList offers = KTrader::self()->query(mime, "Type == 'Application'");
+ TDETrader::OfferList offers = TDETrader::self()->query(mime, "Type == 'Application'");
KService::Ptr ptr = offers.first();
KURL::List lst;
lst.append(cURL);
diff --git a/src/kile/kileprojectview.cpp b/src/kile/kileprojectview.cpp
index 0e9c7fe..9bc762a 100644
--- a/src/kile/kileprojectview.cpp
+++ b/src/kile/kileprojectview.cpp
@@ -254,7 +254,7 @@ void KileProjectView::popup(KListView *, TQListViewItem * item, const TQPoint &
if ( ! isKilePrFile )
{
KPopupMenu *apps = new KPopupMenu( m_popup);
- m_offerList = KTrader::self()->query(KMimeType::findByURL(itm->url())->name(), "Type == 'Application'");
+ m_offerList = TDETrader::self()->query(KMimeType::findByURL(itm->url())->name(), "Type == 'Application'");
for (uint i=0; i < m_offerList.count(); ++i)
apps->insertItem(SmallIcon(m_offerList[i]->icon()), m_offerList[i]->name(), i+1);
diff --git a/src/kile/kileprojectview.h b/src/kile/kileprojectview.h
index 1bf0255..01e3264 100644
--- a/src/kile/kileprojectview.h
+++ b/src/kile/kileprojectview.h
@@ -159,7 +159,7 @@ private:
uint m_nProjects;
KToggleAction *m_toggle;
- KTrader::OfferList m_offerList;
+ TDETrader::OfferList m_offerList;
};
#endif
diff --git a/src/kile/kilestructurewidget.cpp b/src/kile/kilestructurewidget.cpp
index 988b002..a4db758 100644
--- a/src/kile/kilestructurewidget.cpp
+++ b/src/kile/kilestructurewidget.cpp
@@ -771,7 +771,7 @@ namespace KileWidget
KURL url;
url.setPath(m_popupInfo);
- m_offerList = KTrader::self()->query(KMimeType::findByURL(url)->name(), "Type == 'Application'");
+ m_offerList = TDETrader::self()->query(KMimeType::findByURL(url)->name(), "Type == 'Application'");
for (uint i=0; i < m_offerList.count(); ++i)
{
m_popup->insertItem(SmallIcon(m_offerList[i]->icon()), m_offerList[i]->name(), i+SectioningGraphicsOfferlist);
diff --git a/src/kile/kilestructurewidget.h b/src/kile/kilestructurewidget.h
index 238af4e..b057cf3 100644
--- a/src/kile/kilestructurewidget.h
+++ b/src/kile/kilestructurewidget.h
@@ -239,7 +239,7 @@ namespace KileWidget
KileListViewItem *m_popupItem;
TQString m_popupInfo;
- KTrader::OfferList m_offerList;
+ TDETrader::OfferList m_offerList;
};
}
diff --git a/src/kile/texdocdialog.cpp b/src/kile/texdocdialog.cpp
index 9de82e7..d7eb9f7 100644
--- a/src/kile/texdocdialog.cpp
+++ b/src/kile/texdocdialog.cpp
@@ -413,7 +413,7 @@ void TexDocDialog::showFile(const TQString &filename)
KURL url;
url.setPath(filename);
- KTrader::OfferList offers = KTrader::self()->query( getMimeType(filename),"Type == 'Application'");
+ TDETrader::OfferList offers = TDETrader::self()->query( getMimeType(filename),"Type == 'Application'");
if ( offers.isEmpty() )
{
KMessageBox::error(this,i18n("No TDE service found for this file."));