summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:51:17 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:51:17 -0600
commitcd6d514066c22206c388eddbb7fbec32648dbaeb (patch)
treea6971d850815be35a2210defbc4db3f7f2376eb4
parent805781daef7a5af43065787637b1884207aa38b0 (diff)
downloadtdegraphics-cd6d514066c22206c388eddbb7fbec32648dbaeb.tar.gz
tdegraphics-cd6d514066c22206c388eddbb7fbec32648dbaeb.zip
Rename KLock and KTrader to avoid conflicts with KDE4
-rw-r--r--kpdf/part.cpp2
-rw-r--r--ksvg/core/CanvasFactory.cpp4
-rw-r--r--kview/photobook/photobook.cpp4
-rw-r--r--kviewshell/kviewpart.cpp20
4 files changed, 15 insertions, 15 deletions
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index 3e224fc9..458a0e2f 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -322,7 +322,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
slotNewConfig();
// [SPEECH] check for KTTSD presence and usability
- KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
+ TDETrader::OfferList offers = TDETrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
KpdfSettings::setUseKTTSD( (offers.count() > 0) );
KpdfSettings::writeConfig();
diff --git a/ksvg/core/CanvasFactory.cpp b/ksvg/core/CanvasFactory.cpp
index 3c331060..8910f879 100644
--- a/ksvg/core/CanvasFactory.cpp
+++ b/ksvg/core/CanvasFactory.cpp
@@ -57,8 +57,8 @@ void CanvasFactory::queryCanvas()
{
m_canvasList.clear();
- TQValueList<KService::Ptr> traderList = KTrader::self()->query("KSVG/Renderer", "(Type == 'Service')");
- KTrader::OfferList::Iterator it(traderList.begin());
+ TQValueList<KService::Ptr> traderList = TDETrader::self()->query("KSVG/Renderer", "(Type == 'Service')");
+ TDETrader::OfferList::Iterator it(traderList.begin());
for( ; it != traderList.end(); ++it)
{
KService::Ptr ptr = (*it);
diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp
index f90d50dd..a434994b 100644
--- a/kview/photobook/photobook.cpp
+++ b/kview/photobook/photobook.cpp
@@ -155,13 +155,13 @@ PhotoBook::PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name)
TQStringList mimetypes;
- KTrader::OfferList offers = KTrader::self()->query(
+ TDETrader::OfferList offers = TDETrader::self()->query(
"KImageViewer/Viewer", "KParts/ReadOnlyPart",
"DesktopEntryName == 'kviewviewer'", TQString()
);
for (
- KTrader::OfferList::Iterator i(offers.begin());
+ TDETrader::OfferList::Iterator i(offers.begin());
i != offers.end(); ++i
)
{
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index 23c68b2e..85a27558 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -89,13 +89,13 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
// create the displaying part
// Search for service
- KTrader::OfferList offers;
+ TDETrader::OfferList offers;
if (!args.isEmpty())
{
// If a default MimeType is specified try to load a MultiPage supporting it.
TQString defaultMimeType = args.first();
- offers = KTrader::self()->query(
+ offers = TDETrader::self()->query(
TQString::fromLatin1("KViewShell/MultiPage" ),
TQString("([X-TDE-MultiPageVersion] == %1) and "
"([X-TDE-MimeTypes] == '%2')").arg(MULTIPAGE_VERSION).arg(defaultMimeType));
@@ -104,7 +104,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
// If no default MimeType is given or no MultiPage has been found, try to load the Empty MultiPage.
if (offers.isEmpty())
{
- offers = KTrader::self()->query(
+ offers = TDETrader::self()->query(
TQString::fromLatin1("KViewShell/MultiPage" ),
TQString("([X-TDE-MultiPageVersion] == %1) and "
"([X-TDE-EmptyMultiPage] == 1)").arg(MULTIPAGE_VERSION));
@@ -470,15 +470,15 @@ TQStringList KViewPart::supportedMimeTypes()
TQStringList supportedMimeTypes;
// Search for service
- KTrader::OfferList offers = KTrader::self()->query(
+ TDETrader::OfferList offers = TDETrader::self()->query(
TQString::fromLatin1("KViewShell/MultiPage"),
TQString("([X-TDE-MultiPageVersion] == %1)").arg(MULTIPAGE_VERSION)
);
if (!offers.isEmpty())
{
- KTrader::OfferList::ConstIterator iterator = offers.begin();
- KTrader::OfferList::ConstIterator end = offers.end();
+ TDETrader::OfferList::ConstIterator iterator = offers.begin();
+ TDETrader::OfferList::ConstIterator end = offers.end();
for (; iterator != end; ++iterator)
{
@@ -515,15 +515,15 @@ TQStringList KViewPart::fileFormats() const
TQStringList supportedPattern;
// Search for service
- KTrader::OfferList offers = KTrader::self()->query(
+ TDETrader::OfferList offers = TDETrader::self()->query(
TQString::fromLatin1("KViewShell/MultiPage"),
TQString("([X-TDE-MultiPageVersion] == %1)").arg(MULTIPAGE_VERSION)
);
if (!offers.isEmpty())
{
- KTrader::OfferList::ConstIterator iterator = offers.begin();
- KTrader::OfferList::ConstIterator end = offers.end();
+ TDETrader::OfferList::ConstIterator iterator = offers.begin();
+ TDETrader::OfferList::ConstIterator end = offers.end();
for (; iterator != end; ++iterator)
{
@@ -767,7 +767,7 @@ bool KViewPart::openFile()
mimetype = KMimeType::findByURL(tmpFileURL);
// Search for service
- KTrader::OfferList offers = KTrader::self()->query(
+ TDETrader::OfferList offers = TDETrader::self()->query(
TQString::fromLatin1("KViewShell/MultiPage" ),
TQString("([X-TDE-MultiPageVersion] == %1) and "
"([X-TDE-MimeTypes] == '%2')").arg(MULTIPAGE_VERSION).arg(mimetype->name()));