Rename KLock and KTrader to avoid conflicts with KDE4

14 files changed, 18 insertions, 18 deletions

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<KService::Ptr>::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<KService::Ptr>::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<KService::Ptr>::ConstIterator it;
     for (it = offers.begin(); it != offers.end(); ++it) {
         if ((*it)->property("X-TDevelop-Default").toBool()) {
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;
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()) {