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/cvsservice | |
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/cvsservice')
-rw-r--r-- | vcs/cvsservice/cvspart.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 ), |