Fix ftbfs on Fedora 34

error: reference to ‘data’ is ambiguous

Signed-off-by: François Andriot <francois.andriot@free.fr>
pull/14/head
François Andriot 3 years ago committed by Slávek Banko
parent 34649195bf
commit ba5f58bf38

@ -43,11 +43,11 @@
#include "adaglobaloptionsdlg.h"
typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory;
static const KDevPluginInfo data("kdevadaproject");
K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) )
static const KDevPluginInfo pluginData("kdevadaproject");
K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( pluginData ) )
AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& )
:KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" )
:KDevBuildTool(&pluginData, parent, name ? name : "AdaProjectPart" )
{
setInstance(AdaProjectFactory::instance());
setXMLFile("kdevadaproject.rc");

@ -35,8 +35,8 @@
typedef KDevGenericFactory<AntProjectPart> AntProjectFactory;
static const KDevPluginInfo data("kdevantproject");
K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( data ))
static const KDevPluginInfo pluginData("kdevantproject");
K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( pluginData ))
AntOptions::AntOptions()
@ -46,7 +46,7 @@ AntOptions::AntOptions()
AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &)
: KDevBuildTool(&data, parent, name ? name : "AntProjectPart")
: KDevBuildTool(&pluginData, parent, name ? name : "AntProjectPart")
{
setInstance(AntProjectFactory::instance());

@ -62,12 +62,12 @@
#define RUN_OPTIONS 2
#define MAKE_OPTIONS 3
static const KDevPluginInfo data("kdevautoproject");
static const KDevPluginInfo pluginData("kdevautoproject");
K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) )
K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( pluginData ) )
AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args)
: KDevBuildTool(&data, parent, name ? name : "AutoProjectPart")
: KDevBuildTool(&pluginData, parent, name ? name : "AutoProjectPart")
, m_lastCompilationFailed(false)
{
setInstance(AutoProjectFactory::instance());

@ -62,11 +62,11 @@
#include <kdevplugininfo.h>
typedef KDevGenericFactory<CustomProjectPart> CustomProjectFactory;
static const KDevPluginInfo data( "kdevcustomproject" );
K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) )
static const KDevPluginInfo pluginData( "kdevcustomproject" );
K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( pluginData ) )
CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & )
: KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" )
: KDevBuildTool( &pluginData, parent, name ? name : "CustomProjectPart" )
, m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false )
{
setInstance( CustomProjectFactory::instance() );

@ -49,11 +49,11 @@
#include <kdevplugininfo.h>
typedef KDevGenericFactory<PascalProjectPart> PascalProjectFactory;
static const KDevPluginInfo data("kdevpascalproject");
K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) )
static const KDevPluginInfo pluginData("kdevpascalproject");
K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( pluginData ) )
PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& )
:KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" )
:KDevBuildTool(&pluginData, parent, name ? name : "PascalProjectPart" )
{
setInstance(PascalProjectFactory::instance());
setXMLFile("kdevpascalproject.rc");

@ -57,11 +57,11 @@
#include <urlutil.h>
typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory;
static const KDevPluginInfo data("kdevtrollproject");
K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) )
static const KDevPluginInfo pluginData("kdevtrollproject");
K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( pluginData ) )
TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args )
: KDevBuildTool(&data, parent, name ? name : "TrollProjectPart")
: KDevBuildTool(&pluginData, parent, name ? name : "TrollProjectPart")
{
setInstance(TrollProjectFactory::instance());

@ -37,11 +37,11 @@
#include "kdevplugininfo.h"
typedef KDevGenericFactory<ScriptProjectPart> ScriptProjectFactory;
static const KDevPluginInfo data("kdevscriptproject");
K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) )
static const KDevPluginInfo pluginData("kdevscriptproject");
K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( pluginData ) )
ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &)
: KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart")
: KDevBuildTool(&pluginData, parent, name ? name : "ScriptProjectPart")
{
setInstance(ScriptProjectFactory::instance());

@ -13,11 +13,11 @@
#include "editorchooser_widget.h"
typedef KDevGenericFactory<EditorChooserPart> EditorChooserFactory;
static const KDevPluginInfo data("kdeveditorchooser");
K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( data ) )
static const KDevPluginInfo pluginData("kdeveditorchooser");
K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( pluginData ) )
EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const TQStringList &)
: KDevPlugin(&data, parent, name ? name : "EditorChooserPart")
: KDevPlugin(&pluginData, parent, name ? name : "EditorChooserPart")
{
setInstance(EditorChooserFactory::instance());

@ -20,11 +20,11 @@
using namespace VisualBoyAdvance;
typedef KDevGenericFactory<VisualBoyAdvancePart> VisualBoyAdvanceFactory;
static const KDevPluginInfo data("kdevvisualboyadvance");
K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( data ) )
static const KDevPluginInfo pluginData("kdevvisualboyadvance");
K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( pluginData ) )
VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &)
: KDevPlugin(&data, parent, name){
: KDevPlugin(&pluginData, parent, name){
setInstance(VisualBoyAdvanceFactory::instance());
setXMLFile("kdevpart_visualboyadvance.rc");

@ -40,8 +40,8 @@ enum { KDEV_PCS_VERSION = 6 };
typedef KDevGenericFactory<AdaSupportPart> AdaSupportPartFactory;
static const KDevPluginInfo data("kdevadasupport");
K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (data))
static const KDevPluginInfo pluginData("kdevadasupport");
K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (pluginData))
struct AdaSupportPartData {
@ -51,7 +51,7 @@ struct AdaSupportPartData {
};
AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &)
: KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
: KDevLanguageSupport (&pluginData, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
{
setInstance (AdaSupportPartFactory::instance ());

@ -33,11 +33,11 @@
#include <codemodel.h>
typedef KDevGenericFactory<BashSupportPart> BashSupportFactory;
static const KDevPluginInfo data("kdevbashsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( data ) )
static const KDevPluginInfo pluginData("kdevbashsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( pluginData ) )
BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStringList& )
: KDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" )
: KDevLanguageSupport (&pluginData, parent, name ? name : "BashSupportPart" )
{
setInstance(BashSupportFactory::instance());
setXMLFile("kdevbashsupport.rc");

@ -22,14 +22,14 @@
#include "%{APPNAMELC}projectconfig.h"
typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
KDevPluginInfo data("kdev%{APPNAMELC}");
K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
KDevPluginInfo pluginData("kdev%{APPNAMELC}");
K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) );
#define GLOBALDOC_OPTIONS 1
#define PROJECTDOC_OPTIONS 2
%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
: KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
: KDevPlugin(&pluginData, parent, name ? name : "%{APPNAME}Part")
{
setInstance(%{APPNAME}Factory::instance());
setXMLFile("kdev%{APPNAMELC}.rc");

@ -22,14 +22,14 @@
#include "%{APPNAMELC}projectconfig.h"
typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
KDevPluginInfo data("kdev%{APPNAMELC}");
K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
KDevPluginInfo pluginData("kdev%{APPNAMELC}");
K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) );
#define GLOBALDOC_OPTIONS 1
#define PROJECTDOC_OPTIONS 2
%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
: KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
: KDevPlugin(&pluginData, parent, name ? name : "%{APPNAME}Part")
{
setInstance(%{APPNAME}Factory::instance());
setXMLFile("kdev%{APPNAMELC}.rc");

@ -16,10 +16,10 @@
K_EXPORT_COMPONENT_FACTORY( libkdevcppsupport, CppSupportFactory )
static const KDevPluginInfo data("kdevcppsupport");
static const KDevPluginInfo pluginData("kdevcppsupport");
CppSupportFactory::CppSupportFactory()
: KDevGenericFactory<CppSupportPart>( data )
: KDevGenericFactory<CppSupportPart>( pluginData )
{
}
@ -35,5 +35,5 @@ TDEInstance *CppSupportFactory::createInstance()
const KDevPluginInfo * CppSupportFactory::info()
{
return &data;
return &pluginData;
}

@ -45,11 +45,11 @@
//#include "programmingbycontract.h"
typedef KDevGenericFactory<CSharpSupportPart> CSharpSupportFactory;
static const KDevPluginInfo data("kdevcsharpsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) )
static const KDevPluginInfo pluginData("kdevcsharpsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( pluginData ) )
CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &)
: KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart")
: KDevLanguageSupport(&pluginData, parent, name ? name : "CSharpSupportPart")
{
setInstance(CSharpSupportFactory::instance());

@ -45,11 +45,11 @@
typedef KDevGenericFactory<FortranSupportPart> FortranSupportFactory;
static const KDevPluginInfo data("kdevfortransupport");
K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( data ) )
static const KDevPluginInfo pluginData("kdevfortransupport");
K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( pluginData ) )
FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const TQStringList &)
: KDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart")
: KDevLanguageSupport(&pluginData, parent, name ? name : "FortranSupportPart")
{
setInstance(FortranSupportFactory::instance());

@ -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;
}

@ -50,8 +50,8 @@
#include "subclassingdlg.h"
typedef KDevGenericFactory<kjsSupportPart> kjsSupportFactory;
static const KDevPluginInfo data("kdevkjssupport");
K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( data ) );
static const KDevPluginInfo pluginData("kdevkjssupport");
K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( pluginData ) );
class typeProperty
@ -63,7 +63,7 @@ class typeProperty
};
kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStringList& )
: KDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" )
: KDevLanguageSupport(&pluginData, parent, name ? name : "kjsSupportPart" )
{
setInstance(kjsSupportFactory::instance());
setXMLFile("kdevkjssupport.rc");

@ -44,11 +44,11 @@ struct PascalSupportPartData{
};
typedef KDevGenericFactory<PascalSupportPart> PascalSupportFactory;
static const KDevPluginInfo data("kdevpascalsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) )
static const KDevPluginInfo pluginData("kdevpascalsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( pluginData ) )
PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &)
: KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ),
: KDevLanguageSupport(&pluginData, parent, name ? name : "KDevPascalSupport" ),
d( new PascalSupportPartData() )
{
setInstance(PascalSupportFactory::instance());

@ -45,11 +45,11 @@
//#include "programmingbycontract.h"
typedef KDevGenericFactory<PerlSupportPart> PerlSupportFactory;
static const KDevPluginInfo data("kdevperlsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( data ) )
static const KDevPluginInfo pluginData("kdevperlsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( pluginData ) )
PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStringList &)
: KDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart")
: KDevLanguageSupport(&pluginData, parent, name ? name : "PerlSupportPart")
{
setInstance(PerlSupportFactory::instance());

@ -66,11 +66,11 @@
using namespace std;
static const KDevPluginInfo data("kdevphpsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( data ) )
static const KDevPluginInfo pluginData("kdevphpsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( pluginData ) )
PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStringList &)
: KDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart")
: KDevLanguageSupport(&pluginData, parent, name ? name : "PHPSupportPart")
{
m_htmlView = 0;
m_parser = 0;

@ -39,11 +39,11 @@
#include "pythonimplementationwidget.h"
typedef KDevGenericFactory<PythonSupportPart> PythonSupportFactory;
static const KDevPluginInfo data("kdevpythonsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( data ) )
static const KDevPluginInfo pluginData("kdevpythonsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( pluginData ) )
PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const TQStringList &)
: KDevLanguageSupport(&data, parent, name ? name : "PythonSupportPart")
: KDevLanguageSupport(&pluginData, parent, name ? name : "PythonSupportPart")
{
setInstance(PythonSupportFactory::instance());

@ -38,11 +38,11 @@
#include <codemodel_utils.h>
typedef KDevGenericFactory<RubySupportPart> RubySupportFactory;
static const KDevPluginInfo data("kdevrubysupport");
K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( data ) )
static const KDevPluginInfo pluginData("kdevrubysupport");
K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( pluginData ) )
RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStringList& )
: KDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" )
: KDevLanguageSupport (&pluginData, parent, name ? name : "RubySupportPart" )
{
setInstance(RubySupportFactory::instance());
setXMLFile("kdevrubysupport.rc");

@ -30,11 +30,11 @@
#include "domutil.h"
typedef KDevGenericFactory<SQLSupportPart> SQLSupportFactory;
static const KDevPluginInfo data("kdevsqlsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( data ) )
static const KDevPluginInfo pluginData("kdevsqlsupport");
K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( pluginData ) )
SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& )
: KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" )
: KDevLanguageSupport ( &pluginData, parent, name ? name : "SQLSupportPart" )
{
setInstance( SQLSupportFactory::instance() );
setXMLFile( "kdevsqlsupport.rc" );

@ -33,7 +33,7 @@ to create factories for TDevelop plugins. For example, for DummyPlugin
the factory can be created (in dummyplugin.cpp file) as:
@code
typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory;
K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) )
K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( pluginData ) )
@endcode
Data should be a const static object. This way it complies with the requirements
for data objecs of KDevGenericFactory constructor.
@ -47,12 +47,12 @@ For example, dummyplugin.cpp file could contain:
@code
#include <kdevplugininfo.h>
static const KDevPluginInfo data("KDevDummyPlugin");
static const KDevPluginInfo pluginData("KDevDummyPlugin");
typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory;
K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) )
K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( pluginData ) )
DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & )
:KDevPlugin(&data, parent, name)
:KDevPlugin(&pluginData, parent, name)
{
}
@endcode

@ -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());

@ -41,11 +41,11 @@
#define BOOKMARKSETTINGSPAGE 1
typedef KDevGenericFactory<BookmarksPart> 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());

@ -139,12 +139,12 @@ class FunctionCompletion : public CustomCompleter {
typedef KDevGenericFactory<ClassViewPart> 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());

@ -55,11 +55,11 @@ namespace ctags
}
typedef KDevGenericFactory<CTags2Part> 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");

@ -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");

@ -34,11 +34,11 @@
#include <kdialogbase.h>
typedef KDevGenericFactory<DistpartPart> 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());

@ -72,13 +72,13 @@
#define GLOBALDOC_OPTIONS 1
#define PROJECTDOC_OPTIONS 2
static const KDevPluginInfo data("kdevdocumentation");
static const KDevPluginInfo pluginData("kdevdocumentation");
typedef KDevGenericFactory<DocumentationPart> 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());

@ -48,11 +48,11 @@
#define PROJECTOPTIONS 1
typedef KDevGenericFactory<DoxygenPart> 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");

@ -54,16 +54,16 @@
#include "config.h"
static const KDevPluginInfo data("kdevfilecreate");
static const KDevPluginInfo pluginData("kdevfilecreate");
typedef KDevGenericFactory<FileCreatePart> 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");

@ -31,11 +31,11 @@
#include "fileselector_widget.h"
typedef KDevGenericFactory<FileSelectorPart> 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());

@ -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());

@ -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() );

@ -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");

@ -22,13 +22,13 @@
#include "fullscreen_part.h"
static const KDevPluginInfo data("kdevfullscreen");
static const KDevPluginInfo pluginData("kdevfullscreen");
typedef KDevGenericFactory<FullScreenPart> 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());

@ -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());

@ -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());

@ -23,13 +23,13 @@
#include "partexplorerform.h"
static const KDevPluginInfo data("kdevpartexplorer");
static const KDevPluginInfo pluginData("kdevpartexplorer");
typedef KDevGenericFactory<PartExplorerPlugin> 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() );

@ -44,13 +44,13 @@
#include "kdeveditorutil.h"
typedef KDevGenericFactory<QuickOpenPart> 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");

@ -19,13 +19,13 @@
#include "kdevcore.h"
#include "regexptestdlg.h"
static const KDevPluginInfo data("kdevregexptest");
static const KDevPluginInfo pluginData("kdevregexptest");
typedef KDevGenericFactory<RegexpTestPart> 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");

@ -41,14 +41,14 @@
#include "tdescriptactionmanager.h"
typedef KDevGenericFactory<scriptingPart> 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");

@ -33,12 +33,12 @@
#include "snippetsettings.h"
#include "snippetconfig.h"
static const KDevPluginInfo data("kdevsnippet");
static const KDevPluginInfo pluginData("kdevsnippet");
typedef KDevGenericFactory<SnippetPart> 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");

@ -25,11 +25,11 @@
typedef KDevGenericFactory<TextToolsPart> 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");

@ -19,13 +19,13 @@
#include "kdevapi.h"
#include "kdevcore.h"
static const KDevPluginInfo data("kdevtipofday");
static const KDevPluginInfo pluginData("kdevtipofday");
typedef KDevGenericFactory<TipOfDayPart> 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());

@ -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<int, TQString> 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());

@ -15,11 +15,11 @@
#define UICHOOSERSETTINGSPAGE 1
typedef KDevGenericFactory<UIChooserPart> 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());

@ -23,11 +23,11 @@
#include "valgrinditem.h"
typedef KDevGenericFactory<ValgrindPart> 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" );

@ -42,14 +42,14 @@
#include "vcsmanagerprojectconfig.h"
typedef KDevGenericFactory<VCSManagerPart> 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;

@ -37,13 +37,13 @@
#include "clearcasemanipulator.h"
static const KDevPluginInfo data("kdevclearcase");
static const KDevPluginInfo pluginData("kdevclearcase");
typedef KDevGenericFactory<ClearcasePart> ClearcaseFactory;
K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) )
K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( pluginData ) )
ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & )
: KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ),
: KDevVersionControl( &pluginData, parent, name ? name : "ClearcasePart" ),
default_checkin(""),
default_checkout(""),
default_uncheckout("-rm"),

@ -72,16 +72,16 @@ bool g_projectWasJustCreated = false;
// Plugin factory
///////////////////////////////////////////////////////////////////////////////
static const KDevPluginInfo data("kdevcvsservice");
static const KDevPluginInfo pluginData("kdevcvsservice");
typedef KDevGenericFactory<CvsServicePart> CvsFactory;
K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) )
K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( pluginData ) )
///////////////////////////////////////////////////////////////////////////////
// class CvsServicePart
///////////////////////////////////////////////////////////////////////////////
CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & )
: KDevVersionControl( &data, parent,
: KDevVersionControl( &pluginData, parent,
name ? name : "CvsService" ),
actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ),
actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ),

@ -33,13 +33,13 @@
#include "commitdlg.h"
#include "execcommand.h"
static const KDevPluginInfo data("kdevperforce");
static const KDevPluginInfo pluginData("kdevperforce");
typedef KDevGenericFactory<PerforcePart> PerforceFactory;
K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) )
K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( pluginData ) )
PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & )
: KDevVersionControl( &data, parent, name ? name : "PerforcePart" )
: KDevVersionControl( &pluginData, parent, name ? name : "PerforcePart" )
{
setInstance(PerforceFactory::instance());
setupActions();

@ -56,15 +56,15 @@
using namespace SvnGlobal;
static const KDevPluginInfo data("kdevsubversion");
static const KDevPluginInfo pluginData("kdevsubversion");
typedef KDevGenericFactory<subversionPart> subversionFactory;
K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) )
K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( pluginData ) )
//bool g_projectWasJustCreated = false;
subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& )
: KDevVersionControl(&data, parent, name ? name : "Subversion" ) {
: KDevVersionControl(&pluginData, parent, name ? name : "Subversion" ) {
setInstance(subversionFactory::instance());
m_projWidget = 0;

Loading…
Cancel
Save