summaryrefslogtreecommitdiffstats
path: root/parts/vcsmanager
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:53:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:53:25 -0600
commitda1941ccadffe5ae70ee111c53f0ec2b3d990869 (patch)
treeee683f46b49e6abdbdef78ed45ca65b47538bc23 /parts/vcsmanager
parent054f5901ab09f6ea6235bd12fbd167922fdf0f67 (diff)
downloadtdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.tar.gz
tdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'parts/vcsmanager')
-rw-r--r--parts/vcsmanager/vcsmanagerprojectconfig.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.cpp b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
index c087d415..2fe41c9c 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfig.cpp
+++ b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
@@ -52,8 +52,8 @@ void VCSManagerProjectConfig::setup( )
int current = 0;
TQString constraint = TQString("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION);
- KTrader::OfferList offers = KTrader::self()->query("TDevelop/VersionControl", constraint );
- KTrader::OfferList::const_iterator it = offers.begin();
+ TDETrader::OfferList offers = TDETrader::self()->query("TDevelop/VersionControl", constraint );
+ TDETrader::OfferList::const_iterator it = offers.begin();
for ( int i = 1; it != offers.end(); ++it, ++i )
{
vcsCombo->insertItem( (*it)->genericName(), i );