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/fileview | |
| parent | f1d98e1263bb48e9e23ff9eb137097b5335c8e05 (diff) | |
| download | tdevelop-b2944938.tar.gz tdevelop-b2944938.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/fileview')
| -rw-r--r-- | parts/fileview/filegroupspart.cpp | 6 | ||||
| -rw-r--r-- | parts/fileview/fileviewpart.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp index 77fc9646..91b1a0bc 100644 --- a/parts/fileview/filegroupspart.cpp +++ b/parts/fileview/filegroupspart.cpp @@ -33,11 +33,11 @@ #define FILEGROUPS_OPTIONS 1 typedef KDevGenericFactory<FileGroupsPart> FileGroupsFactory; -static const KDevPluginInfo data("kdevfilegroups"); -K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) ) +static const KDevPluginInfo pluginData("kdevfilegroups"); +K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( pluginData ) ) FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FileGroupsPart") + : KDevPlugin(&pluginData, parent, name ? name : "FileGroupsPart") { deleteRequested = false; setInstance(FileGroupsFactory::instance()); diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp index 414cea52..25aa8f62 100644 --- a/parts/fileview/fileviewpart.cpp +++ b/parts/fileview/fileviewpart.cpp @@ -50,15 +50,15 @@ VCSColors FileViewPart::vcsColors; /////////////////////////////////////////////////////////////////////////////// typedef KDevGenericFactory<FileViewPart> FileViewFactory; -static const KDevPluginInfo data("kdevfileview"); -K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) ) +static const KDevPluginInfo pluginData("kdevfileview"); +K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( pluginData ) ) /////////////////////////////////////////////////////////////////////////////// // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FileViewPart"), + : KDevPlugin(&pluginData, parent, name ? name : "FileViewPart"), m_widget( 0 ) { setInstance( FileViewFactory::instance() ); |