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 /kbabel/commonui | |
parent | 087f8d4521b0bc6614dc4b664b23674a7f5f5020 (diff) | |
download | tdesdk-0117fbed932653a04aeef16b2ed7edee858959ac.tar.gz tdesdk-0117fbed932653a04aeef16b2ed7edee858959ac.zip |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/commonui')
-rw-r--r-- | kbabel/commonui/context.cpp | 2 | ||||
-rw-r--r-- | kbabel/commonui/finddialog.cpp | 2 | ||||
-rw-r--r-- | kbabel/commonui/projectprefwidgets.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp index 70a020a8..1c6ded1e 100644 --- a/kbabel/commonui/context.cpp +++ b/kbabel/commonui/context.cpp @@ -259,7 +259,7 @@ TQValueList<ContextInfo> SourceContext::resolvePath( const TQString& packageDir, bool SourceContext::loadPart() { - KTrader::OfferList offers = KTrader::self()->query( "KTextEditor/Document" ); + TDETrader::OfferList offers = TDETrader::self()->query( "KTextEditor/Document" ); if( offers.count() < 1 ) { KMessageBox::error(this,i18n("KBabel cannot start a text editor component.\n" diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp index 4c3f3f55..0fe463fd 100644 --- a/kbabel/commonui/finddialog.cpp +++ b/kbabel/commonui/finddialog.cpp @@ -133,7 +133,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent) _isRegExp = new TQCheckBox(i18n("Use regu&lar expression"),regexp); _regExpButton = 0; - if( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) + if( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { _regExpButton = new TQPushButton( i18n("&Edit..."), regexp ); connect( _regExpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( regExpButtonClicked())); diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp index 63579dc8..530d8a95 100644 --- a/kbabel/commonui/projectprefwidgets.cpp +++ b/kbabel/commonui/projectprefwidgets.cpp @@ -703,7 +703,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent) TQWhatsThis::add(label,msg); TQWhatsThis::add(contextInfoEdit,msg); - if( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) + if( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { _regExpButton = new TQPushButton( i18n("&Edit..."), hbox ); connect( _regExpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( regExpButtonClicked())); |