summaryrefslogtreecommitdiffstats
path: root/languages/java
diff options
context:
space:
mode:
authorFrançois Andriot <francois.andriot@free.fr>2021-02-28 00:15:56 +0000
committerMichele Calgaro <michele.calgaro@yahoo.it>2021-05-13 09:04:39 +0900
commitb2944938471de15d95e0c7a3671b2bc7de102487 (patch)
tree232083f93b64806341a7f8c720b6b4d3870885f2 /languages/java
parentf1d98e1263bb48e9e23ff9eb137097b5335c8e05 (diff)
downloadtdevelop-b2944938471de15d95e0c7a3671b2bc7de102487.tar.gz
tdevelop-b2944938471de15d95e0c7a3671b2bc7de102487.zip
Fix ftbfs on Fedora 34
error: reference to ‘data’ is ambiguous Signed-off-by: François Andriot <francois.andriot@free.fr> (cherry picked from commit ba5f58bf38a62eb83990951168951274c96a8e24)
Diffstat (limited to 'languages/java')
-rw-r--r--languages/java/javasupportfactory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp
index 94e435f2..299e283f 100644
--- a/languages/java/javasupportfactory.cpp
+++ b/languages/java/javasupportfactory.cpp
@@ -14,11 +14,11 @@
#include <kdevplugininfo.h>
#include "javasupportfactory.h"
-static const KDevPluginInfo data("kdevjavasupport");
+static const KDevPluginInfo pluginData("kdevjavasupport");
K_EXPORT_COMPONENT_FACTORY( libkdevjavasupport, JavaSupportFactory )
JavaSupportFactory::JavaSupportFactory()
- : KDevGenericFactory<JavaSupportPart>( data )
+ : KDevGenericFactory<JavaSupportPart>( pluginData )
{
}
@@ -34,6 +34,6 @@ TDEInstance *JavaSupportFactory::createInstance()
const KDevPluginInfo *JavaSupportFactory::info()
{
- return &data;
+ return &pluginData;
}