From ba5f58bf38a62eb83990951168951274c96a8e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 28 Feb 2021 00:15:56 +0000 Subject: Fix ftbfs on Fedora 34 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit error: reference to ‘data’ is ambiguous Signed-off-by: François Andriot --- buildtools/ada/adaproject_part.cpp | 6 +++--- buildtools/ant/antprojectpart.cpp | 6 +++--- buildtools/autotools/autoprojectpart.cpp | 6 +++--- buildtools/custommakefiles/customprojectpart.cpp | 6 +++--- buildtools/pascal/pascalproject_part.cpp | 6 +++--- buildtools/qmake/trollprojectpart.cpp | 6 +++--- buildtools/script/scriptprojectpart.cpp | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) (limited to 'buildtools') diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index 5eacf5d0..f778c9b2 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -43,11 +43,11 @@ #include "adaglobaloptionsdlg.h" typedef KDevGenericFactory AdaProjectFactory; -static const KDevPluginInfo data("kdevadaproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) ) +static const KDevPluginInfo pluginData("kdevadaproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( pluginData ) ) AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& ) - :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" ) + :KDevBuildTool(&pluginData, parent, name ? name : "AdaProjectPart" ) { setInstance(AdaProjectFactory::instance()); setXMLFile("kdevadaproject.rc"); diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index a9e5a2d4..f53357da 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -35,8 +35,8 @@ typedef KDevGenericFactory AntProjectFactory; -static const KDevPluginInfo data("kdevantproject"); -K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( data )) +static const KDevPluginInfo pluginData("kdevantproject"); +K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( pluginData )) AntOptions::AntOptions() @@ -46,7 +46,7 @@ AntOptions::AntOptions() AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &) - : KDevBuildTool(&data, parent, name ? name : "AntProjectPart") + : KDevBuildTool(&pluginData, parent, name ? name : "AntProjectPart") { setInstance(AntProjectFactory::instance()); diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 014e8e2f..c1008072 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -62,12 +62,12 @@ #define RUN_OPTIONS 2 #define MAKE_OPTIONS 3 -static const KDevPluginInfo data("kdevautoproject"); +static const KDevPluginInfo pluginData("kdevautoproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( pluginData ) ) AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args) - : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart") + : KDevBuildTool(&pluginData, parent, name ? name : "AutoProjectPart") , m_lastCompilationFailed(false) { setInstance(AutoProjectFactory::instance()); diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index f61782ae..cbbb4315 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -62,11 +62,11 @@ #include typedef KDevGenericFactory CustomProjectFactory; -static const KDevPluginInfo data( "kdevcustomproject" ); -K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) ) +static const KDevPluginInfo pluginData( "kdevcustomproject" ); +K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( pluginData ) ) CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & ) - : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" ) + : KDevBuildTool( &pluginData, parent, name ? name : "CustomProjectPart" ) , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false ) { setInstance( CustomProjectFactory::instance() ); diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index 98127f0a..d4670adb 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -49,11 +49,11 @@ #include typedef KDevGenericFactory PascalProjectFactory; -static const KDevPluginInfo data("kdevpascalproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) ) +static const KDevPluginInfo pluginData("kdevpascalproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( pluginData ) ) PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& ) - :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" ) + :KDevBuildTool(&pluginData, parent, name ? name : "PascalProjectPart" ) { setInstance(PascalProjectFactory::instance()); setXMLFile("kdevpascalproject.rc"); diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index fe16d538..82bb7416 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -57,11 +57,11 @@ #include typedef KDevGenericFactory TrollProjectFactory; -static const KDevPluginInfo data("kdevtrollproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) ) +static const KDevPluginInfo pluginData("kdevtrollproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( pluginData ) ) TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args ) - : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart") + : KDevBuildTool(&pluginData, parent, name ? name : "TrollProjectPart") { setInstance(TrollProjectFactory::instance()); diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index 8f6b5fb4..42ce8935 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -37,11 +37,11 @@ #include "kdevplugininfo.h" typedef KDevGenericFactory ScriptProjectFactory; -static const KDevPluginInfo data("kdevscriptproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) ) +static const KDevPluginInfo pluginData("kdevscriptproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( pluginData ) ) ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &) - : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") + : KDevBuildTool(&pluginData, parent, name ? name : "ScriptProjectPart") { setInstance(ScriptProjectFactory::instance()); -- cgit v1.2.1