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 /buildtools/pascal | |
| parent | 054f5901ab09f6ea6235bd12fbd167922fdf0f67 (diff) | |
| download | tdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.tar.gz tdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'buildtools/pascal')
| -rw-r--r-- | buildtools/pascal/pascalglobaloptionsdlg.cpp | 2 | ||||
| -rw-r--r-- | buildtools/pascal/pascalglobaloptionsdlg.h | 2 | ||||
| -rw-r--r-- | buildtools/pascal/pascalproject_part.cpp | 2 | ||||
| -rw-r--r-- | buildtools/pascal/pascalprojectoptionsdlg.cpp | 4 | ||||
| -rw-r--r-- | buildtools/pascal/pascalprojectoptionsdlg.h | 2 | ||||
| -rw-r--r-- | buildtools/pascal/service.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index cf9e42cf..ccbf8dc1 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.cpp +++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp @@ -40,7 +40,7 @@ PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget delete defaultopts_button; - offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'"); + offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'"); ServiceComboBox::insertStringList(compiler_box, offers, &service_names, &service_execs); diff --git a/buildtools/pascal/pascalglobaloptionsdlg.h b/buildtools/pascal/pascalglobaloptionsdlg.h index 15658399..5e6e3d23 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.h +++ b/buildtools/pascal/pascalglobaloptionsdlg.h @@ -37,7 +37,7 @@ protected slots: private: PascalProjectPart *m_part; - KTrader::OfferList offers; + TDETrader::OfferList offers; TQString currentCompiler; TQStringList service_names; TQStringList service_execs; diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index 4dd34709..c5da93fe 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -417,7 +417,7 @@ void PascalProjectPart::loadProjectConfig( ) if (m_compilerExec.isEmpty()) { - KTrader::OfferList offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'"); + TDETrader::OfferList offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'"); TQValueList<KService::Ptr>::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-TDevelop-Default").toBool()) { diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp index 33e3f88c..e878eec5 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.cpp +++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp @@ -31,7 +31,7 @@ PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidg { config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); - offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'"); + offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'"); ServiceComboBox::insertStringList(compiler_box, offers, &service_names, &service_execs); @@ -108,7 +108,7 @@ void PascalProjectOptionsDlg::readConfig( TQString config ) if (compiler.isEmpty()) { - offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'"); + offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'"); TQValueList<KService::Ptr>::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-TDevelop-Default").toBool()) { diff --git a/buildtools/pascal/pascalprojectoptionsdlg.h b/buildtools/pascal/pascalprojectoptionsdlg.h index 1f8e3b8c..acedb14d 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.h +++ b/buildtools/pascal/pascalprojectoptionsdlg.h @@ -45,7 +45,7 @@ private: TQString currentConfig; bool dirty; - KTrader::OfferList offers; + TDETrader::OfferList offers; TQStringList service_names; TQStringList service_execs; diff --git a/buildtools/pascal/service.cpp b/buildtools/pascal/service.cpp index 15b607ff..c74ce97e 100644 --- a/buildtools/pascal/service.cpp +++ b/buildtools/pascal/service.cpp @@ -66,7 +66,7 @@ int ServiceComboBox::itemForText(const TQString &str, const TQStringList &names) TQString ServiceComboBox::defaultCompiler() { - KTrader::OfferList offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'"); + TDETrader::OfferList offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'"); TQValueList<KService::Ptr>::ConstIterator it; for (it = offers.begin(); it != offers.end(); ++it) { if ((*it)->property("X-TDevelop-Default").toBool()) { |