diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:51:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:51:17 -0600 |
| commit | cd6d514066c22206c388eddbb7fbec32648dbaeb (patch) | |
| tree | a6971d850815be35a2210defbc4db3f7f2376eb4 /kviewshell | |
| parent | 805781daef7a5af43065787637b1884207aa38b0 (diff) | |
| download | tdegraphics-cd6d514066c22206c388eddbb7fbec32648dbaeb.tar.gz tdegraphics-cd6d514066c22206c388eddbb7fbec32648dbaeb.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kviewshell')
| -rw-r--r-- | kviewshell/kviewpart.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
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())); |