diff options
| author | François Andriot <francois.andriot@free.fr> | 2021-02-28 00:15:56 +0000 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-05-12 22:27:27 +0200 |
| commit | ba5f58bf38a62eb83990951168951274c96a8e24 (patch) | |
| tree | 6eee557d0117e4f5667cef37f9cc5acc5b084c21 /vcs | |
| parent | 34649195bfef57a2d3f4d34bcfbf2d4252dac465 (diff) | |
| download | tdevelop-ba5f58bf38a62eb83990951168951274c96a8e24.tar.gz tdevelop-ba5f58bf38a62eb83990951168951274c96a8e24.zip | |
Fix ftbfs on Fedora 34
error: reference to ‘data’ is ambiguous
Signed-off-by: François Andriot <francois.andriot@free.fr>
Diffstat (limited to 'vcs')
| -rw-r--r-- | vcs/clearcase/clearcasepart.cpp | 6 | ||||
| -rw-r--r-- | vcs/cvsservice/cvspart.cpp | 6 | ||||
| -rw-r--r-- | vcs/perforce/perforcepart.cpp | 6 | ||||
| -rw-r--r-- | vcs/subversion/subversion_part.cpp | 6 |
4 files changed, 12 insertions, 12 deletions
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<ClearcasePart> 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"), diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index 2bda55f1..6ded6ecb 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -72,16 +72,16 @@ bool g_projectWasJustCreated = false; // Plugin factory /////////////////////////////////////////////////////////////////////////////// -static const KDevPluginInfo data("kdevcvsservice"); +static const KDevPluginInfo pluginData("kdevcvsservice"); typedef KDevGenericFactory<CvsServicePart> CvsFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( pluginData ) ) /////////////////////////////////////////////////////////////////////////////// // class CvsServicePart /////////////////////////////////////////////////////////////////////////////// CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & ) - : KDevVersionControl( &data, parent, + : KDevVersionControl( &pluginData, parent, name ? name : "CvsService" ), actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ), actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ), diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index f92666b6..76a4456a 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -33,13 +33,13 @@ #include "commitdlg.h" #include "execcommand.h" -static const KDevPluginInfo data("kdevperforce"); +static const KDevPluginInfo pluginData("kdevperforce"); typedef KDevGenericFactory<PerforcePart> PerforceFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( pluginData ) ) PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & ) - : KDevVersionControl( &data, parent, name ? name : "PerforcePart" ) + : KDevVersionControl( &pluginData, parent, name ? name : "PerforcePart" ) { setInstance(PerforceFactory::instance()); setupActions(); diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index f3f43cd9..98b44848 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -56,15 +56,15 @@ using namespace SvnGlobal; -static const KDevPluginInfo data("kdevsubversion"); +static const KDevPluginInfo pluginData("kdevsubversion"); typedef KDevGenericFactory<subversionPart> subversionFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( pluginData ) ) //bool g_projectWasJustCreated = false; subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevVersionControl(&data, parent, name ? name : "Subversion" ) { + : KDevVersionControl(&pluginData, parent, name ? name : "Subversion" ) { setInstance(subversionFactory::instance()); m_projWidget = 0; |