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/autotools/configureoptionswidget.cpp | 6 +++--- buildtools/autotools/configureoptionswidget.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'buildtools/autotools') diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index e65d4a35..53f3cb3c 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -79,9 +79,9 @@ ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget * TQDomDocument &dom = *part->projectDom(); m_environmentVariablesWidget = new EnvironmentVariablesWidget(dom, "/kdevautoproject/general/envvars", env_groupBox); - coffers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'C'"); - cxxoffers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'C++'"); - f77offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Fortran'"); + coffers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'C'"); + cxxoffers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'C++'"); + f77offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Fortran'"); ServiceComboBox::insertStringList(cservice_combo, coffers, &cservice_names, &cservice_execs); ServiceComboBox::insertStringList(cxxservice_combo, cxxoffers, &cxxservice_names, &cxxservice_execs); diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h index 33c78b1a..ea1d0d62 100644 --- a/buildtools/autotools/configureoptionswidget.h +++ b/buildtools/autotools/configureoptionswidget.h @@ -54,7 +54,7 @@ private: void saveSettings( const TQString &config ); KDevCompilerOptions *createCompilerOptions( const TQString &lang ); - KTrader::OfferList coffers, cxxoffers, f77offers; + TDETrader::OfferList coffers, cxxoffers, f77offers; TQStringList cservice_names, cservice_execs; TQStringList cxxservice_names, cxxservice_execs; TQStringList f77service_names, f77service_execs; -- cgit v1.2.1