summaryrefslogtreecommitdiffstats
path: root/parts/diff
diff options
context:
space:
mode:
authorFrançois Andriot <francois.andriot@free.fr>2021-02-28 00:15:56 +0000
committerSlávek Banko <slavek.banko@axis.cz>2021-05-12 22:27:27 +0200
commitba5f58bf38a62eb83990951168951274c96a8e24 (patch)
tree6eee557d0117e4f5667cef37f9cc5acc5b084c21 /parts/diff
parent34649195bfef57a2d3f4d34bcfbf2d4252dac465 (diff)
downloadtdevelop-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 'parts/diff')
-rw-r--r--parts/diff/diffpart.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 01c703d0..eb2063c4 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -36,13 +36,13 @@
#include "diffdlg.h"
#include "diffwidget.h"
-static const KDevPluginInfo data("kdevdiff");
+static const KDevPluginInfo pluginData("kdevdiff");
typedef KDevGenericFactory<DiffPart> DiffFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( pluginData ) )
DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &)
- : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0)
+ : KDevDiffFrontend(&pluginData, parent, name ? name : "DiffPart"), proc(0)
{
setInstance(DiffFactory::instance());
setXMLFile("kdevdiff.rc");