Fix ftbfs on Fedora 34

error: reference to ‘data’ is ambiguous

Signed-off-by: François Andriot <francois.andriot@free.fr>

15 files changed, 45 insertions, 45 deletions

diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp
index 0d87f0a7..1ca3abfd 100644
--- a/languages/ada/adasupportpart.cpp
+++ b/languages/ada/adasupportpart.cpp
@@ -40,8 +40,8 @@ enum { KDEV_PCS_VERSION = 6 };
 
 typedef KDevGenericFactory<AdaSupportPart> AdaSupportPartFactory;
 
-static const KDevPluginInfo data("kdevadasupport");
-K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (data))
+static const KDevPluginInfo pluginData("kdevadasupport");
+K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (pluginData))
 
 
 struct AdaSupportPartData {
@@ -51,7 +51,7 @@ struct AdaSupportPartData {
 };
 
 AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
+    : KDevLanguageSupport (&pluginData, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
 {
     setInstance (AdaSupportPartFactory::instance ());
 
diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
index 7e30b913..ca289234 100644
--- a/languages/bash/bashsupport_part.cpp
+++ b/languages/bash/bashsupport_part.cpp
@@ -33,11 +33,11 @@
 #include <codemodel.h>
 
 typedef KDevGenericFactory<BashSupportPart> BashSupportFactory;
-static const KDevPluginInfo data("kdevbashsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( data ) )
+static const KDevPluginInfo pluginData("kdevbashsupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( pluginData ) )
 
 BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStringList& )
-: KDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" )
+: KDevLanguageSupport (&pluginData, parent, name ? name : "BashSupportPart" )
 {
 	setInstance(BashSupportFactory::instance());
 	setXMLFile("kdevbashsupport.rc");
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
index aa950c8a..6a2559ba 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
@@ -22,14 +22,14 @@
 #include "%{APPNAMELC}projectconfig.h"
 
 typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
-KDevPluginInfo data("kdev%{APPNAMELC}");
-K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
+KDevPluginInfo pluginData("kdev%{APPNAMELC}");
+K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) );
 
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
 %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
+    : KDevPlugin(&pluginData, parent, name ? name : "%{APPNAME}Part")
 {
     setInstance(%{APPNAME}Factory::instance());
     setXMLFile("kdev%{APPNAMELC}.rc");
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
index aa950c8a..6a2559ba 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
@@ -22,14 +22,14 @@
 #include "%{APPNAMELC}projectconfig.h"
 
 typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
-KDevPluginInfo data("kdev%{APPNAMELC}");
-K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
+KDevPluginInfo pluginData("kdev%{APPNAMELC}");
+K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) );
 
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
 %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
+    : KDevPlugin(&pluginData, parent, name ? name : "%{APPNAME}Part")
 {
     setInstance(%{APPNAME}Factory::instance());
     setXMLFile("kdev%{APPNAMELC}.rc");
diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp
index 5d11ab04..cf5ff24a 100644
--- a/languages/cpp/cppsupportfactory.cpp
+++ b/languages/cpp/cppsupportfactory.cpp
@@ -16,10 +16,10 @@
 
 K_EXPORT_COMPONENT_FACTORY( libkdevcppsupport, CppSupportFactory )
 
-static const KDevPluginInfo data("kdevcppsupport");
+static const KDevPluginInfo pluginData("kdevcppsupport");
 
 CppSupportFactory::CppSupportFactory()
-: KDevGenericFactory<CppSupportPart>( data )
+: KDevGenericFactory<CppSupportPart>( pluginData )
 {
 }
 
@@ -35,5 +35,5 @@ TDEInstance *CppSupportFactory::createInstance()
 
 const KDevPluginInfo * CppSupportFactory::info()
 {
-	return &data;
+	return &pluginData;
 }
diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
index 6da33030..8ecb44eb 100644
--- a/languages/csharp/csharpsupportpart.cpp
+++ b/languages/csharp/csharpsupportpart.cpp
@@ -45,11 +45,11 @@
 //#include "programmingbycontract.h"
 
 typedef KDevGenericFactory<CSharpSupportPart> CSharpSupportFactory;
-static const KDevPluginInfo data("kdevcsharpsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) )
+static const KDevPluginInfo pluginData("kdevcsharpsupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( pluginData ) )
 
 CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart")
+    : KDevLanguageSupport(&pluginData, parent, name ? name : "CSharpSupportPart")
 {
     setInstance(CSharpSupportFactory::instance());
 
diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp
index 4f749ed3..170ff230 100644
--- a/languages/fortran/fortransupportpart.cpp
+++ b/languages/fortran/fortransupportpart.cpp
@@ -45,11 +45,11 @@
 
 
 typedef KDevGenericFactory<FortranSupportPart> FortranSupportFactory;
-static const KDevPluginInfo data("kdevfortransupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( data ) )
+static const KDevPluginInfo pluginData("kdevfortransupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( pluginData ) )
 
 FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart")
+    : KDevLanguageSupport(&pluginData, parent, name ? name : "FortranSupportPart")
 {
     setInstance(FortranSupportFactory::instance());
 
diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp
index 94e435f2..299e283f 100644
--- a/languages/java/javasupportfactory.cpp
+++ b/languages/java/javasupportfactory.cpp
@@ -14,11 +14,11 @@
 #include <kdevplugininfo.h>
 #include "javasupportfactory.h"
 
-static const KDevPluginInfo data("kdevjavasupport");
+static const KDevPluginInfo pluginData("kdevjavasupport");
 K_EXPORT_COMPONENT_FACTORY( libkdevjavasupport, JavaSupportFactory )
 
 JavaSupportFactory::JavaSupportFactory()
-    : KDevGenericFactory<JavaSupportPart>( data )
+    : KDevGenericFactory<JavaSupportPart>( pluginData )
 {
 }
 
@@ -34,6 +34,6 @@ TDEInstance *JavaSupportFactory::createInstance()
 
 const KDevPluginInfo *JavaSupportFactory::info()
 {
-    return &data;
+    return &pluginData;
 }
 
diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
index 5a00e9c6..71c680b4 100644
--- a/languages/kjssupport/kjssupport_part.cpp
+++ b/languages/kjssupport/kjssupport_part.cpp
@@ -50,8 +50,8 @@
 #include "subclassingdlg.h"
 
 typedef KDevGenericFactory<kjsSupportPart> kjsSupportFactory;
-static const KDevPluginInfo data("kdevkjssupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( data ) );
+static const KDevPluginInfo pluginData("kdevkjssupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( pluginData ) );
 
 
 class typeProperty
@@ -63,7 +63,7 @@ class typeProperty
 };
 
 kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStringList& )
-: KDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" )
+: KDevLanguageSupport(&pluginData, parent, name ? name : "kjsSupportPart" )
 {
 	setInstance(kjsSupportFactory::instance());
 	setXMLFile("kdevkjssupport.rc");
diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp
index a61ab6a0..90532c22 100644
--- a/languages/pascal/pascalsupport_part.cpp
+++ b/languages/pascal/pascalsupport_part.cpp
@@ -44,11 +44,11 @@ struct PascalSupportPartData{
 };
 
 typedef KDevGenericFactory<PascalSupportPart> PascalSupportFactory;
-static const KDevPluginInfo data("kdevpascalsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) )
+static const KDevPluginInfo pluginData("kdevpascalsupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( pluginData ) )
 
 PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ),
+  : KDevLanguageSupport(&pluginData, parent, name ? name : "KDevPascalSupport" ),
     d( new PascalSupportPartData() )
 {
     setInstance(PascalSupportFactory::instance());
diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
index 3236e72e..1bcbb96b 100644
--- a/languages/perl/perlsupportpart.cpp
+++ b/languages/perl/perlsupportpart.cpp
@@ -45,11 +45,11 @@
 //#include "programmingbycontract.h"
 
 typedef KDevGenericFactory<PerlSupportPart> PerlSupportFactory;
-static const KDevPluginInfo data("kdevperlsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( data ) )
+static const KDevPluginInfo pluginData("kdevperlsupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( pluginData ) )
 
 PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart")
+    : KDevLanguageSupport(&pluginData, parent, name ? name : "PerlSupportPart")
 {
     setInstance(PerlSupportFactory::instance());
 
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index c189cc5c..252b2167 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -66,11 +66,11 @@
 
 using namespace std;
 
-static const KDevPluginInfo data("kdevphpsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( data ) )
+static const KDevPluginInfo pluginData("kdevphpsupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( pluginData ) )
 
 PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart")
+    : KDevLanguageSupport(&pluginData, parent, name ? name : "PHPSupportPart")
 {
    m_htmlView = 0;
    m_parser = 0;
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index e7529c2f..68baf71e 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -39,11 +39,11 @@
 #include "pythonimplementationwidget.h"
 
 typedef KDevGenericFactory<PythonSupportPart> PythonSupportFactory;
-static const KDevPluginInfo data("kdevpythonsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( data ) )
+static const KDevPluginInfo pluginData("kdevpythonsupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( pluginData ) )
 
 PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "PythonSupportPart")
+    : KDevLanguageSupport(&pluginData, parent, name ? name : "PythonSupportPart")
 {
     setInstance(PythonSupportFactory::instance());
 
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index e61d7cef..db9576b3 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -38,11 +38,11 @@
 #include <codemodel_utils.h>
 
 typedef KDevGenericFactory<RubySupportPart> RubySupportFactory;
-static const KDevPluginInfo data("kdevrubysupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( data ) )
+static const KDevPluginInfo pluginData("kdevrubysupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( pluginData ) )
 
 RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStringList& )
-  : KDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" )
+  : KDevLanguageSupport (&pluginData, parent, name ? name : "RubySupportPart" )
 {
   setInstance(RubySupportFactory::instance());
   setXMLFile("kdevrubysupport.rc");
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index e676cee5..96e8ed4f 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -30,11 +30,11 @@
 #include "domutil.h"
 
 typedef KDevGenericFactory<SQLSupportPart> SQLSupportFactory;
-static const KDevPluginInfo data("kdevsqlsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( data ) )
+static const KDevPluginInfo pluginData("kdevsqlsupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( pluginData ) )
 
 SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& )
-        : KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" )
+        : KDevLanguageSupport ( &pluginData, parent, name ? name : "SQLSupportPart" )
 {
     setInstance( SQLSupportFactory::instance() );
     setXMLFile( "kdevsqlsupport.rc" );