From b2944938471de15d95e0c7a3671b2bc7de102487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 28 Feb 2021 00:15:56 +0000 Subject: Fix ftbfs on Fedora 34 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit error: reference to ‘data’ is ambiguous Signed-off-by: François Andriot (cherry picked from commit ba5f58bf38a62eb83990951168951274c96a8e24) --- parts/astyle/astyle_part.cpp | 6 +++--- parts/bookmarks/bookmarks_part.cpp | 6 +++--- parts/classview/classviewpart.cpp | 8 ++++---- parts/ctags2/ctags2_part.cpp | 6 +++--- parts/diff/diffpart.cpp | 6 +++--- parts/distpart/distpart_part.cpp | 6 +++--- parts/documentation/documentation_part.cpp | 6 +++--- parts/doxygen/doxygenpart.cpp | 6 +++--- parts/filecreate/filecreate_part.cpp | 8 ++++---- parts/fileselector/fileselector_part.cpp | 6 +++--- parts/fileview/filegroupspart.cpp | 6 +++--- parts/fileview/fileviewpart.cpp | 6 +++--- parts/filter/filterpart.cpp | 6 +++--- parts/fullscreen/fullscreen_part.cpp | 6 +++--- parts/outputviews/appoutputviewpart.cpp | 6 +++--- parts/outputviews/makeviewpart.cpp | 6 +++--- parts/partexplorer/partexplorer_plugin.cpp | 6 +++--- parts/quickopen/quickopen_part.cpp | 6 +++--- parts/regexptest/regexptestpart.cpp | 6 +++--- parts/scripting/scriptingpart.cpp | 6 +++--- parts/snippet/snippet_part.cpp | 6 +++--- parts/texttools/texttoolspart.cpp | 6 +++--- parts/tipofday/tipofday_part.cpp | 6 +++--- parts/tools/tools_part.cpp | 6 +++--- parts/uimode/uichooser_part.cpp | 6 +++--- parts/valgrind/valgrind_part.cpp | 6 +++--- parts/vcsmanager/vcsmanagerpart.cpp | 6 +++--- 27 files changed, 83 insertions(+), 83 deletions(-) (limited to 'parts') 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 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()); diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp index 2d5a0a10..04fee8d7 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -41,11 +41,11 @@ #define BOOKMARKSETTINGSPAGE 1 typedef KDevGenericFactory BookmarksFactory; -static const KDevPluginInfo data("kdevbookmarks"); -K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) ) +static const KDevPluginInfo pluginData("kdevbookmarks"); +K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( pluginData ) ) BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin(&data, parent, name ? name : "BookmarksPart" ) + : KDevPlugin(&pluginData, parent, name ? name : "BookmarksPart" ) { setInstance(BookmarksFactory::instance()); diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp index 92e26bd0..d068adaa 100644 --- a/parts/classview/classviewpart.cpp +++ b/parts/classview/classviewpart.cpp @@ -139,12 +139,12 @@ class FunctionCompletion : public CustomCompleter { typedef KDevGenericFactory ClassViewFactory; -static const KDevPluginInfo data("kdevclassview"); -K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) ) +static const KDevPluginInfo pluginData("kdevclassview"); +K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( pluginData ) ) ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& ) - :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ), - KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ), + :/// KDevPlugin( &pluginData, parent, name ? name : "ClassViewPart" ), + KDevCodeBrowserFrontend( &pluginData, parent, name ? name : "ClassViewPart" ), m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0) { setInstance(ClassViewFactory::instance()); diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 92dd4dc7..1333ac54 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -55,11 +55,11 @@ namespace ctags } typedef KDevGenericFactory CTags2Factory; -static const KDevPluginInfo data("kdevctags2"); -K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) ) +static const KDevPluginInfo pluginData("kdevctags2"); +K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( pluginData ) ) CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin(&data, parent, name ? name : "ctags2Part" ) + : KDevPlugin(&pluginData, parent, name ? name : "ctags2Part" ) { setInstance(CTags2Factory::instance()); setXMLFile("kdevpart_ctags2.rc"); 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 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"); diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp index e8a3e11a..fd235a0a 100644 --- a/parts/distpart/distpart_part.cpp +++ b/parts/distpart/distpart_part.cpp @@ -34,11 +34,11 @@ #include typedef KDevGenericFactory DistpartFactory; -static const KDevPluginInfo data("kdevdistpart"); -K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) ) +static const KDevPluginInfo pluginData("kdevdistpart"); +K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( pluginData ) ) DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "DistpartPart") { + : KDevPlugin(&pluginData, parent, name ? name : "DistpartPart") { kdDebug(9007) << "DistpartPart::DistpartPart()" << endl; setInstance(DistpartFactory::instance()); diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 3b9e9b78..1d284a64 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -72,13 +72,13 @@ #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -static const KDevPluginInfo data("kdevdocumentation"); +static const KDevPluginInfo pluginData("kdevdocumentation"); typedef KDevGenericFactory DocumentationFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( pluginData ) ) DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& ) - :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ), + :KDevPlugin(&pluginData, parent, name ? name : "DocumentationPart" ), m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false) { setInstance(DocumentationFactory::instance()); diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index d965d98b..36d41e8d 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -48,11 +48,11 @@ #define PROJECTOPTIONS 1 typedef KDevGenericFactory DoxygenFactory; -static const KDevPluginInfo data("kdevdoxygen"); -K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) ) +static const KDevPluginInfo pluginData("kdevdoxygen"); +K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( pluginData ) ) DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) + : KDevPlugin(&pluginData, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) { setInstance(DoxygenFactory::instance()); setXMLFile("kdevdoxygen.rc"); diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index 1c371177..a1529097 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -54,16 +54,16 @@ #include "config.h" -static const KDevPluginInfo data("kdevfilecreate"); +static const KDevPluginInfo pluginData("kdevfilecreate"); typedef KDevGenericFactory FileCreateFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( pluginData ) ) using namespace FileCreate; FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & ) -// : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) - : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0) +// : KDevCreateFile(&pluginData, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) + : KDevCreateFile(&pluginData, parent, name ? name : "FileCreatePart"), m_subPopups(0) { setInstance(FileCreateFactory::instance()); setXMLFile("kdevpart_filecreate.rc"); diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index b5f9961a..de9b5fef 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -31,11 +31,11 @@ #include "fileselector_widget.h" typedef KDevGenericFactory FileSelectorFactory; -static const KDevPluginInfo data("kdevfileselector"); -K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) ) +static const KDevPluginInfo pluginData("kdevfileselector"); +K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( pluginData ) ) FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FileSelectorPart") + : KDevPlugin(&pluginData, parent, name ? name : "FileSelectorPart") { setInstance(FileSelectorFactory::instance()); 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 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 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() ); diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp index 5ebd265e..3a1351ad 100644 --- a/parts/filter/filterpart.cpp +++ b/parts/filter/filterpart.cpp @@ -26,11 +26,11 @@ #include "shellinsertdlg.h" #include "kdevfilterIface.h" -static const KDevPluginInfo data("kdevfilter"); -K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) ) +static const KDevPluginInfo pluginData("kdevfilter"); +K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( pluginData ) ) FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FilterPart") + : KDevPlugin(&pluginData, parent, name ? name : "FilterPart") { setInstance(FilterFactory::instance()); setXMLFile("kdevfilter.rc"); diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp index 0bdc714f..98581a9c 100644 --- a/parts/fullscreen/fullscreen_part.cpp +++ b/parts/fullscreen/fullscreen_part.cpp @@ -22,13 +22,13 @@ #include "fullscreen_part.h" -static const KDevPluginInfo data("kdevfullscreen"); +static const KDevPluginInfo pluginData("kdevfullscreen"); typedef KDevGenericFactory FullScreenFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( pluginData ) ) FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin(&data, parent, name ? name : "FullScreenPart" ) + : KDevPlugin(&pluginData, parent, name ? name : "FullScreenPart" ) { setInstance(FullScreenFactory::instance()); // const TDEAboutData &abdata1 = *(info()); diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 3a0e0e7d..3d8b47bf 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -29,12 +29,12 @@ #include "kdevpartcontroller.h" #include "settings.h" -static const KDevPluginInfo data("kdevappoutputview"); +static const KDevPluginInfo pluginData("kdevappoutputview"); typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( pluginData ) ) AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &) - : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart") + : KDevAppFrontend(&pluginData, parent, name ? name : "AppOutputViewPart") { setInstance(AppViewFactory::instance()); diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index 8b441e94..2df7d384 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -26,12 +26,12 @@ #include "makewidget.h" -static const KDevPluginInfo data("kdevmakeview"); +static const KDevPluginInfo pluginData("kdevmakeview"); typedef KDevGenericFactory< MakeViewPart > MakeViewFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( pluginData ) ) MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &) - : KDevMakeFrontend(&data, parent, name) + : KDevMakeFrontend(&pluginData, parent, name) { setInstance(MakeViewFactory::instance()); diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp index d5240edb..57b1cd58 100644 --- a/parts/partexplorer/partexplorer_plugin.cpp +++ b/parts/partexplorer/partexplorer_plugin.cpp @@ -23,13 +23,13 @@ #include "partexplorerform.h" -static const KDevPluginInfo data("kdevpartexplorer"); +static const KDevPluginInfo pluginData("kdevpartexplorer"); typedef KDevGenericFactory PartExplorerPluginFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( pluginData ) ) PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, const TQStringList & ) - : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" ) + : KDevPlugin( &pluginData, parent, name ? name : "PartExplorerPlugin" ) { // we need an instance setInstance( PartExplorerPluginFactory::instance() ); diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp index 4d316e68..78c97eb6 100644 --- a/parts/quickopen/quickopen_part.cpp +++ b/parts/quickopen/quickopen_part.cpp @@ -44,13 +44,13 @@ #include "kdeveditorutil.h" typedef KDevGenericFactory QuickOpenFactory; -static const KDevPluginInfo data("kdevquickopen"); -K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) ) +static const KDevPluginInfo pluginData("kdevquickopen"); +K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( pluginData ) ) using namespace KTextEditor; QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" ) + : KDevQuickOpen(&pluginData, parent, name ? name : "QuickOpenPart" ) { setInstance(QuickOpenFactory::instance()); setXMLFile("kdevpart_quickopen.rc"); diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp index 6c45a492..1e16d144 100644 --- a/parts/regexptest/regexptestpart.cpp +++ b/parts/regexptest/regexptestpart.cpp @@ -19,13 +19,13 @@ #include "kdevcore.h" #include "regexptestdlg.h" -static const KDevPluginInfo data("kdevregexptest"); +static const KDevPluginInfo pluginData("kdevregexptest"); typedef KDevGenericFactory RegexpTestFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( pluginData ) ) RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "RegexpTestPart") + : KDevPlugin(&pluginData, parent, name ? name : "RegexpTestPart") { setInstance(RegexpTestFactory::instance()); setXMLFile("kdevregexptest.rc"); diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index 80a33c9e..d0558b79 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -41,14 +41,14 @@ #include "tdescriptactionmanager.h" typedef KDevGenericFactory scriptingFactory; -KDevPluginInfo data("kdevscripting"); -K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) ) +KDevPluginInfo pluginData("kdevscripting"); +K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( pluginData ) ) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L) + : KDevPlugin(&pluginData, parent, name ? name : "scriptingPart"), m_scripts(0L) { setInstance(scriptingFactory::instance()); setXMLFile("kdevscripting.rc"); diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index 82969151..1c650ce2 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -33,12 +33,12 @@ #include "snippetsettings.h" #include "snippetconfig.h" -static const KDevPluginInfo data("kdevsnippet"); +static const KDevPluginInfo pluginData("kdevsnippet"); typedef KDevGenericFactory snippetFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( pluginData ) ) SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin(&data, parent, name ? name : "SnippetPart" ) + : KDevPlugin(&pluginData, parent, name ? name : "SnippetPart" ) { setInstance(snippetFactory::instance()); setXMLFile("kdevpart_snippet.rc"); diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp index 4453030a..7e38f061 100644 --- a/parts/texttools/texttoolspart.cpp +++ b/parts/texttools/texttoolspart.cpp @@ -25,11 +25,11 @@ typedef KDevGenericFactory TextToolsFactory; -static const KDevPluginInfo data("kdevtexttools"); -K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) ) +static const KDevPluginInfo pluginData("kdevtexttools"); +K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( pluginData ) ) TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "TextToolsPart") + : KDevPlugin(&pluginData, parent, name ? name : "TextToolsPart") { setInstance(TextToolsFactory::instance()); // setXMLFile("kdevfileview.rc"); diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index 6cd63deb..9172d44b 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -19,13 +19,13 @@ #include "kdevapi.h" #include "kdevcore.h" -static const KDevPluginInfo data("kdevtipofday"); +static const KDevPluginInfo pluginData("kdevtipofday"); typedef KDevGenericFactory TipOfDayFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( pluginData ) ) TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "TipOfDayPart") + : KDevPlugin(&pluginData, parent, name ? name : "TipOfDayPart") { setInstance(TipOfDayFactory::instance()); diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index 8734eadc..61f962ad 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -34,13 +34,13 @@ #define TOOLSSETTINGS 1 #define EXTRATOOLSSETTINGS 2 -static const KDevPluginInfo data("kdevtools"); -K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) ) +static const KDevPluginInfo pluginData("kdevtools"); +K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( pluginData ) ) TQMap externalToolMenuEntries; ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin( &data, parent, name ? name : "ToolsPart") + : KDevPlugin( &pluginData, parent, name ? name : "ToolsPart") { setInstance(ToolsFactory::instance()); diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp index fdc9fa6a..a547bdef 100644 --- a/parts/uimode/uichooser_part.cpp +++ b/parts/uimode/uichooser_part.cpp @@ -15,11 +15,11 @@ #define UICHOOSERSETTINGSPAGE 1 typedef KDevGenericFactory UIChooserFactory; -static const KDevPluginInfo data("kdevuichooser"); -K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) ) +static const KDevPluginInfo pluginData("kdevuichooser"); +K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( pluginData ) ) UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin( &data, parent, name ? name : "UIChooserPart") + : KDevPlugin( &pluginData, parent, name ? name : "UIChooserPart") { setInstance(UIChooserFactory::instance()); diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp index 1b262175..5c78d952 100644 --- a/parts/valgrind/valgrind_part.cpp +++ b/parts/valgrind/valgrind_part.cpp @@ -23,11 +23,11 @@ #include "valgrinditem.h" typedef KDevGenericFactory ValgrindFactory; -static const KDevPluginInfo data("kdevvalgrind"); -K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) ) +static const KDevPluginInfo pluginData("kdevvalgrind"); +K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( pluginData ) ) ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin( &data, parent, name ? name : "ValgrindPart" ) + : KDevPlugin( &pluginData, parent, name ? name : "ValgrindPart" ) { setInstance( ValgrindFactory::instance() ); setXMLFile( "kdevpart_valgrind.rc" ); diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp index ec176c47..e8606636 100644 --- a/parts/vcsmanager/vcsmanagerpart.cpp +++ b/parts/vcsmanager/vcsmanagerpart.cpp @@ -42,14 +42,14 @@ #include "vcsmanagerprojectconfig.h" typedef KDevGenericFactory VCSManagerFactory; -KDevPluginInfo data("kdevvcsmanager"); -K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) ) +KDevPluginInfo pluginData("kdevvcsmanager"); +K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( pluginData ) ) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, parent, name ? name : "VCSManagerPart") + : KDevPlugin(&pluginData, parent, name ? name : "VCSManagerPart") { kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl; -- cgit v1.2.1