summaryrefslogtreecommitdiffstats
path: root/languages/cpp
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 /languages/cpp
parent054f5901ab09f6ea6235bd12fbd167922fdf0f67 (diff)
downloadtdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.tar.gz
tdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'languages/cpp')
-rw-r--r--languages/cpp/app_templates/kapp/appview.cpp4
-rw-r--r--languages/cpp/createpcsdialog.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp
index 2c39dd78..c700800b 100644
--- a/languages/cpp/app_templates/kapp/appview.cpp
+++ b/languages/cpp/app_templates/kapp/appview.cpp
@@ -34,12 +34,12 @@
// string 'KParts/ReadOnlyPart' must be found in the ServiceTypes
// field. with this, only components of the type we want will be
// returned.
- KTrader::OfferList offers = KTrader::self()->query("text/html", "'KParts/ReadOnlyPart' in ServiceTypes");
+ TDETrader::OfferList offers = TDETrader::self()->query("text/html", "'KParts/ReadOnlyPart' in ServiceTypes");
KLibFactory *factory = 0;
// in theory, we only care about the first one.. but let's try all
// offers just in case the first can't be loaded for some reason
- KTrader::OfferList::Iterator it(offers.begin());
+ TDETrader::OfferList::Iterator it(offers.begin());
for( ; it != offers.end(); ++it)
{
KService::Ptr ptr = (*it);
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index 6100013a..afc910b8 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -204,10 +204,10 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const
m_settings = 0;
importerListView->header() ->hide();
- KTrader::OfferList lst = KTrader::self() ->query( "TDevelop/PCSImporter" );
+ TDETrader::OfferList lst = TDETrader::self() ->query( "TDevelop/PCSImporter" );
kdDebug( 9007 ) << "====================> found " << lst.size() << " importers" << endl;
- for ( KTrader::OfferList::Iterator it = lst.begin(); it != lst.end(); ++it )
+ for ( TDETrader::OfferList::Iterator it = lst.begin(); it != lst.end(); ++it )
{
KService::Ptr ptr = *it;