summaryrefslogtreecommitdiffstats
path: root/kompare/kompare_shell.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:52:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:52:50 -0600
commit0117fbed932653a04aeef16b2ed7edee858959ac (patch)
tree769ae82d3aec3a66184bd33b65843380b5265fbb /kompare/kompare_shell.cpp
parent087f8d4521b0bc6614dc4b664b23674a7f5f5020 (diff)
downloadtdesdk-0117fbed932653a04aeef16b2ed7edee858959ac.tar.gz
tdesdk-0117fbed932653a04aeef16b2ed7edee858959ac.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kompare/kompare_shell.cpp')
-rw-r--r--kompare/kompare_shell.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index a903f6d4..dd4fda2a 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -60,7 +60,7 @@ KompareShell::KompareShell()
setupActions();
setupStatusBar();
- KTrader::OfferList offers = KTrader::self()->query( "text/x-diff",
+ TDETrader::OfferList offers = TDETrader::self()->query( "text/x-diff",
"Kompare/ViewPart", TQString(), TQString() );
#ifdef NDEBUG
for( int i = 0; i < offers.count(); i++ )
@@ -108,7 +108,7 @@ KompareShell::KompareShell()
}
offers.clear();
- offers = KTrader::self()->query( "text/x-diff", "KParts/ReadOnlyPart", "'Kompare/NavigationPart' in ServiceTypes", TQString() );
+ offers = TDETrader::self()->query( "text/x-diff", "KParts/ReadOnlyPart", "'Kompare/NavigationPart' in ServiceTypes", TQString() );
if ( offers.count() == 0 )
{
KMessageBox::error(this, i18n( "Could not find our KompareNavigationPart." ) );