diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 10:52:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 10:52:50 -0600 |
| commit | 0117fbed932653a04aeef16b2ed7edee858959ac (patch) | |
| tree | 769ae82d3aec3a66184bd33b65843380b5265fbb /kompare | |
| parent | 087f8d4521b0bc6614dc4b664b23674a7f5f5020 (diff) | |
| download | tdesdk-0117fbed932653a04aeef16b2ed7edee858959ac.tar.gz tdesdk-0117fbed932653a04aeef16b2ed7edee858959ac.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kompare')
| -rw-r--r-- | kompare/kompare_shell.cpp | 4 | ||||
| -rw-r--r-- | kompare/libdialogpages/diffpage.cpp | 2 |
2 files changed, 3 insertions, 3 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." ) ); diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp index a70e3f44..2748b573 100644 --- a/kompare/libdialogpages/diffpage.cpp +++ b/kompare/libdialogpages/diffpage.cpp @@ -288,7 +288,7 @@ void DiffPage::addOptionsTab() TQToolTip::add( m_ignoreRegExpEdit, i18n( "Add the regular expression here that you want to use\nto ignore lines that match it." ) ); groupLayout->addWidget( m_ignoreRegExpEdit ); - if ( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) + if ( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { // Ok editor is available, use it TQButton* ignoreRegExpEditButton = new TQPushButton( i18n( "&Edit..." ), page, "regexp_editor_button" ); |