From b2944938471de15d95e0c7a3671b2bc7de102487 Mon Sep 17 00:00:00 2001 From: François Andriot 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 (cherry picked from commit ba5f58bf38a62eb83990951168951274c96a8e24) --- languages/cpp/app_templates/kdevpart/kdevpart_part.cpp | 6 +++--- languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp | 6 +++--- languages/cpp/cppsupportfactory.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'languages/cpp') 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( data ) +: KDevGenericFactory( pluginData ) { } @@ -35,5 +35,5 @@ TDEInstance *CppSupportFactory::createInstance() const KDevPluginInfo * CppSupportFactory::info() { - return &data; + return &pluginData; } -- cgit v1.2.3