From da1941ccadffe5ae70ee111c53f0ec2b3d990869 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 10:53:25 -0600 Subject: Rename KLock and KTrader to avoid conflicts with KDE4 --- buildtools/ada/adaglobaloptionsdlg.cpp | 2 +- buildtools/ada/adaglobaloptionsdlg.h | 2 +- buildtools/ada/adaproject_part.cpp | 2 +- buildtools/ada/adaprojectoptionsdlg.cpp | 4 ++-- buildtools/ada/adaprojectoptionsdlg.h | 2 +- buildtools/ada/service.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'buildtools/ada') diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp index a39c9c3f..cea68bdc 100644 --- a/buildtools/ada/adaglobaloptionsdlg.cpp +++ b/buildtools/ada/adaglobaloptionsdlg.cpp @@ -37,7 +37,7 @@ AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent, delete mainSourceUrl; delete defaultopts_button; - offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'"); + offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'"); ServiceComboBox::insertStringList(compiler_box, offers, &service_names, &service_execs); diff --git a/buildtools/ada/adaglobaloptionsdlg.h b/buildtools/ada/adaglobaloptionsdlg.h index f4247bf6..39e2e354 100644 --- a/buildtools/ada/adaglobaloptionsdlg.h +++ b/buildtools/ada/adaglobaloptionsdlg.h @@ -35,7 +35,7 @@ protected slots: private: AdaProjectPart *m_part; - KTrader::OfferList offers; + TDETrader::OfferList offers; TQString currentCompiler; TQStringList service_names; TQStringList service_execs; diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index e402d9a1..1ee9829a 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -389,7 +389,7 @@ void AdaProjectPart::loadProjectConfig( ) if (m_compilerExec.isEmpty()) { - KTrader::OfferList offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'"); + TDETrader::OfferList offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'"); TQValueList::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-TDevelop-Default").toBool()) { diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp index 14547cb7..436316f6 100644 --- a/buildtools/ada/adaprojectoptionsdlg.cpp +++ b/buildtools/ada/adaprojectoptionsdlg.cpp @@ -29,7 +29,7 @@ AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* paren { config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); - offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'"); + offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'"); ServiceComboBox::insertStringList(compiler_box, offers, &service_names, &service_execs); @@ -106,7 +106,7 @@ void AdaProjectOptionsDlg::readConfig( TQString config ) if (compiler.isEmpty()) { - offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'"); + offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'"); TQValueList::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-TDevelop-Default").toBool()) { diff --git a/buildtools/ada/adaprojectoptionsdlg.h b/buildtools/ada/adaprojectoptionsdlg.h index 49f06522..569f06c9 100644 --- a/buildtools/ada/adaprojectoptionsdlg.h +++ b/buildtools/ada/adaprojectoptionsdlg.h @@ -43,7 +43,7 @@ private: TQString currentConfig; bool dirty; - KTrader::OfferList offers; + TDETrader::OfferList offers; TQStringList service_names; TQStringList service_execs; diff --git a/buildtools/ada/service.cpp b/buildtools/ada/service.cpp index 9d113ce3..38bba269 100644 --- a/buildtools/ada/service.cpp +++ b/buildtools/ada/service.cpp @@ -64,7 +64,7 @@ int ServiceComboBox::itemForText(const TQString &str, const TQStringList &names) TQString ServiceComboBox::defaultCompiler() { - KTrader::OfferList offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'"); + TDETrader::OfferList offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'"); TQValueList::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-TDevelop-Default").toBool()) { -- cgit v1.2.1