From b2944938471de15d95e0c7a3671b2bc7de102487 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 (cherry picked from commit ba5f58bf38a62eb83990951168951274c96a8e24) --- vcs/clearcase/clearcasepart.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vcs/clearcase') diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp index aeb1eea9..8f05fbad 100644 --- a/vcs/clearcase/clearcasepart.cpp +++ b/vcs/clearcase/clearcasepart.cpp @@ -37,13 +37,13 @@ #include "clearcasemanipulator.h" -static const KDevPluginInfo data("kdevclearcase"); +static const KDevPluginInfo pluginData("kdevclearcase"); typedef KDevGenericFactory ClearcaseFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( pluginData ) ) ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & ) - : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ), + : KDevVersionControl( &pluginData, parent, name ? name : "ClearcasePart" ), default_checkin(""), default_checkout(""), default_uncheckout("-rm"), -- cgit v1.2.1