diff options
| author | François Andriot <[email protected]> | 2021-02-28 00:15:56 +0000 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2021-05-13 09:04:39 +0900 |
| commit | b2944938471de15d95e0c7a3671b2bc7de102487 (patch) | |
| tree | 232083f93b64806341a7f8c720b6b4d3870885f2 /parts/astyle | |
| 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 <[email protected]>
(cherry picked from commit ba5f58bf38a62eb83990951168951274c96a8e24)
Diffstat (limited to 'parts/astyle')
| -rw-r--r-- | parts/astyle/astyle_part.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 16d590ab..0797b6b3 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -33,7 +33,7 @@ #include "astyle_widget.h" #include "astyle_adaptor.h" -static const KDevPluginInfo data("kdevastyle"); +static const KDevPluginInfo pluginData("kdevastyle"); namespace { const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm"; @@ -41,10 +41,10 @@ namespace { typedef KDevGenericFactory<AStylePart> AStyleFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( pluginData ) ) AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) - : KDevSourceFormatter(&data, parent, name ? name : "AStylePart") + : KDevSourceFormatter(&pluginData, parent, name ? name : "AStylePart") { setInstance(AStyleFactory::instance()); |