diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:53:25 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:53:25 -0600 |
| commit | da1941ccadffe5ae70ee111c53f0ec2b3d990869 (patch) | |
| tree | ee683f46b49e6abdbdef78ed45ca65b47538bc23 /vcs | |
| parent | 054f5901ab09f6ea6235bd12fbd167922fdf0f67 (diff) | |
| download | tdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.tar.gz tdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'vcs')
| -rw-r--r-- | vcs/cvsservice/diffwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index 2261e2be..16ae5a95 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -155,8 +155,8 @@ void KDiffTextEdit::searchExtParts() init = true; // search all parts that can handle text/x-diff - KTrader::OfferList offers = KTrader::self()->query("text/x-diff", "('KParts/ReadOnlyPart' in ServiceTypes) and ('text/x-diff' in ServiceTypes)"); - KTrader::OfferList::const_iterator it; + TDETrader::OfferList offers = TDETrader::self()->query("text/x-diff", "('KParts/ReadOnlyPart' in ServiceTypes) and ('text/x-diff' in ServiceTypes)"); + TDETrader::OfferList::const_iterator it; for ( it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr ptr = (*it); extPartsTranslated << ptr->name(); |