diff options
| author | François Andriot <francois.andriot@free.fr> | 2021-02-28 00:15:56 +0000 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-05-13 09:04:39 +0900 |
| commit | b2944938471de15d95e0c7a3671b2bc7de102487 (patch) | |
| tree | 232083f93b64806341a7f8c720b6b4d3870885f2 /parts/diff | |
| parent | f1d98e1263bb48e9e23ff9eb137097b5335c8e05 (diff) | |
| download | tdevelop-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 'parts/diff')
| -rw-r--r-- | parts/diff/diffpart.cpp | 6 |
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"); |