Browse Source

Rename KInstance and KAboutData to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
73ff676f11
100 changed files with 336 additions and 336 deletions
  1. +8
    -8
      chalk/doc/chalk.xmi
  2. +2
    -2
      chalk/plugins/viewplugins/screenshot/main.cpp
  3. +3
    -3
      chalk/ui/kis_aboutdata.h
  4. +5
    -5
      chalk/ui/kis_factory.cc
  5. +6
    -6
      chalk/ui/kis_factory.h
  6. +4
    -4
      example/example_aboutdata.h
  7. +5
    -5
      example/example_factory.cc
  8. +7
    -7
      example/example_factory.h
  9. +3
    -3
      filters/karbon/xfig/xfigimport_factory.cc
  10. +3
    -3
      filters/karbon/xfig/xfigimport_factory.h
  11. +1
    -1
      filters/kspread/kexi/kspread_kexiimport.h
  12. +3
    -3
      karbon/karbon_aboutdata.h
  13. +5
    -5
      karbon/karbon_factory.cc
  14. +6
    -6
      karbon/karbon_factory.h
  15. +1
    -1
      karbon/widgets/vtoolbox.cc
  16. +1
    -1
      karbon/widgets/vtoolbox.h
  17. +3
    -3
      kchart/kchart_aboutdata.h
  18. +5
    -5
      kchart/kchart_factory.cc
  19. +7
    -7
      kchart/kchart_factory.h
  20. +2
    -2
      kexi/core/kexi.cpp
  21. +1
    -1
      kexi/core/kexi.h
  22. +3
    -3
      kexi/core/kexiaboutdata.cpp
  23. +1
    -1
      kexi/core/kexiaboutdata.h
  24. +1
    -1
      kexi/core/kexidialogbase.cpp
  25. +1
    -1
      kexi/doc/dev/TODO-Kexi-js
  26. +5
    -5
      kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
  27. +5
    -5
      kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h
  28. +5
    -5
      kexi/formeditor/test/kfd_part.cpp
  29. +5
    -5
      kexi/formeditor/test/kfd_part.h
  30. +2
    -2
      kexi/formeditor/test/main.cpp
  31. +3
    -3
      kexi/kexidb/drivermanager.cpp
  32. +4
    -4
      kexi/kexidb/simplecommandlineapp.cpp
  33. +3
    -3
      kexi/kexidb/simplecommandlineapp.h
  34. +2
    -2
      kexi/main/keximainwindowimpl.cpp
  35. +1
    -1
      kexi/main/keximainwindowimpl.h
  36. +1
    -1
      kexi/main/startup/KexiStartupDialog.cpp
  37. +3
    -3
      kexi/migration/migratemanager.cpp
  38. +2
    -2
      kexi/plugins/macros/tests/komacrotest.cpp
  39. +2
    -2
      kexi/plugins/macros/tests/komacrotestgui.cpp
  40. +1
    -1
      kexi/tests/altertable/altertable.cpp
  41. +1
    -1
      kexi/tests/gui/finddialog/main.cpp
  42. +4
    -4
      kexi/tests/newapi/main.cpp
  43. +1
    -1
      kexi/tests/newapi/mysqlcursor.cpp
  44. +1
    -1
      kexi/tests/parser/main.cpp
  45. +3
    -3
      kformula/kformula_aboutdata.h
  46. +5
    -5
      kformula/kformula_factory.cc
  47. +7
    -7
      kformula/kformula_factory.h
  48. +3
    -3
      kivio/kiviopart/kivio_aboutdata.h
  49. +5
    -5
      kivio/kiviopart/kivio_factory.cpp
  50. +6
    -6
      kivio/kiviopart/kivio_factory.h
  51. +1
    -1
      kivio/kiviopart/kivioarrowheadaction.cpp
  52. +1
    -1
      kivio/kiviopart/kiviostencilsetaction.cpp
  53. +3
    -3
      kivio/plugins/kivioconnectortool/plugin.cpp
  54. +3
    -3
      kivio/plugins/kivioconnectortool/plugin.h
  55. +3
    -3
      kivio/plugins/kivioselecttool/plugin.cpp
  56. +3
    -3
      kivio/plugins/kivioselecttool/plugin.h
  57. +3
    -3
      kivio/plugins/kiviosmlconnector/plugin.cpp
  58. +3
    -3
      kivio/plugins/kiviosmlconnector/plugin.h
  59. +3
    -3
      kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp
  60. +3
    -3
      kivio/plugins/kiviotargettool/kiviotargettoolfactory.h
  61. +3
    -3
      kivio/plugins/kiviotexttool/plugin.cpp
  62. +3
    -3
      kivio/plugins/kiviotexttool/plugin.h
  63. +3
    -3
      kivio/plugins/kiviozoomtool/plugin.cpp
  64. +3
    -3
      kivio/plugins/kiviozoomtool/plugin.h
  65. +2
    -2
      koshell/koshell_main.cc
  66. +7
    -7
      kounavail/kounavail.cc
  67. +7
    -7
      kounavail/kounavail.h
  68. +3
    -3
      kplato/kptaboutdata.h
  69. +5
    -5
      kplato/kptfactory.cc
  70. +6
    -6
      kplato/kptfactory.h
  71. +3
    -3
      kpresenter/KPrAboutData.h
  72. +5
    -5
      kpresenter/KPrFactory.cpp
  73. +6
    -6
      kpresenter/KPrFactory.h
  74. +3
    -3
      kspread/kspread_aboutdata.h
  75. +5
    -5
      kspread/kspread_factory.cc
  76. +6
    -6
      kspread/kspread_factory.h
  77. +3
    -3
      kspread/plugins/calculator/main.cpp
  78. +3
    -3
      kspread/plugins/calculator/main.h
  79. +3
    -3
      kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
  80. +2
    -2
      kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h
  81. +4
    -4
      kugar/kudesigner/kudesigner_aboutdata.h
  82. +5
    -5
      kugar/kudesigner/kudesigner_factory.cpp
  83. +7
    -7
      kugar/kudesigner/kudesigner_factory.h
  84. +3
    -3
      kugar/part/kugar_about.h
  85. +5
    -5
      kugar/part/kugar_factory.cpp
  86. +6
    -6
      kugar/part/kugar_factory.h
  87. +1
    -1
      kugar/part/kugar_part.h
  88. +3
    -3
      kword/KWAboutData.h
  89. +5
    -5
      kword/KWFactory.cpp
  90. +6
    -6
      kword/KWFactory.h
  91. +2
    -2
      kword/KWMailMergeDataBase.cpp
  92. +1
    -1
      kword/KWMailMergeDataSource.cpp
  93. +3
    -3
      kword/KWMailMergeDataSource.h
  94. +2
    -2
      kword/mailmerge/KWClassicSerialDataSource.cpp
  95. +1
    -1
      kword/mailmerge/KWClassicSerialDataSource.h
  96. +2
    -2
      kword/mailmerge/kabc/KWMailMergeKABC.cpp
  97. +1
    -1
      kword/mailmerge/kabc/KWMailMergeKABC.h
  98. +2
    -2
      kword/mailmerge/kspread/kwmailmerge_kspread.cpp
  99. +1
    -1
      kword/mailmerge/kspread/kwmailmerge_kspread.h
  100. +2
    -2
      kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp

+ 8
- 8
chalk/doc/chalk.xmi View File

@@ -1447,7 +1447,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Parameter visibility="private" xmi.id="1116" value="" type="QObject *" name="parent" />
<UML:Parameter visibility="private" xmi.id="1117" value="" type="const char *" name="name" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1118" type="KAboutData *" name="aboutData" ownerScope="classifier" />
<UML:Operation visibility="public" xmi.id="1118" type="TDEAboutData *" name="aboutData" ownerScope="classifier" />
<UML:Operation visibility="public" xmi.id="1119" type="virtual KParts :: Part *" name="createPartObject" >
<UML:Parameter visibility="private" xmi.id="1120" value="" type="QWidget *" name="parentWidget" />
<UML:Parameter visibility="private" xmi.id="1121" value="" type="const char *" name="widgetName" />
@@ -1456,12 +1456,12 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Parameter visibility="private" xmi.id="1124" value="" type="const char *" name="classname" />
<UML:Parameter visibility="private" xmi.id="1125" value="" type="const QStringList &amp;" name="args" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1126" type="KInstance *" name="global" ownerScope="classifier" />
<UML:Operation visibility="public" xmi.id="1126" type="TDEInstance *" name="global" ownerScope="classifier" />
<UML:Operation visibility="public" xmi.id="1127" type="KisPluginServer *" name="pServer" ownerScope="classifier" />
<UML:Operation visibility="public" xmi.id="1128" type="KisResourceServer *" name="rServer" ownerScope="classifier" />
<UML:Operation visibility="public" xmi.id="1129" type="" name="~KisFactory" />
<UML:Attribute visibility="private" xmi.id="1111" value="" type="KAboutData *" name="s_aboutData" />
<UML:Attribute visibility="private" xmi.id="1112" value="" type="KInstance *" name="s_global" />
<UML:Attribute visibility="private" xmi.id="1111" value="" type="TDEAboutData *" name="s_aboutData" />
<UML:Attribute visibility="private" xmi.id="1112" value="" type="TDEInstance *" name="s_global" />
<UML:Attribute visibility="private" xmi.id="1113" value="" type="KisPluginServer *" name="s_pserver" />
<UML:Attribute visibility="private" xmi.id="1114" value="" type="KisResourceServer *" name="s_rserver" />
</UML:Class>
@@ -38410,12 +38410,12 @@ in the constructor, you have to call loadAsync.
<cppcodedocumentation tag="" indentLevel="1" text="Fields" />
</header>
<textblocks>
<ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KAboutData * s_aboutData;" >
<ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAboutData * s_aboutData;" >
<header>
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header>
</ccfdeclarationcodeblock>
<ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KInstance * s_global;" >
<ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" TDEInstance * s_global;" >
<header>
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header>
@@ -38531,7 +38531,7 @@ in the constructor, you have to call loadAsync.
<header>
<cppcodedocumentation tag="" />
</header>
<ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KAboutData * s_aboutData;" >
<ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAboutData * s_aboutData;" >
<header>
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header>
@@ -38551,7 +38551,7 @@ in the constructor, you have to call loadAsync.
<header>
<cppcodedocumentation tag="" />
</header>
<ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KInstance * s_global;" >
<ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" TDEInstance * s_global;" >
<header>
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header>


+ 2
- 2
chalk/plugins/viewplugins/screenshot/main.cpp View File

@@ -11,8 +11,8 @@ static const char description[] =

int main(int argc, char **argv)
{
KAboutData aboutData( "ksnapshot", I18N_NOOP("KSnapshot"),
KSNAPVERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "ksnapshot", I18N_NOOP("KSnapshot"),
KSNAPVERSION, description, TDEAboutData::License_GPL,
"(c) 1997-2003, Richard J. Moore,\n(c) 2000, Matthias Ettrich,\n(c) 2002-2003 Aaron J. Seigo");
aboutData.addAuthor("Richard J. Moore",0, "rich@kde.org");
aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");


+ 3
- 3
chalk/ui/kis_aboutdata.h View File

@@ -25,13 +25,13 @@
#include <kofficeversion.h>
#include <config.h>

KAboutData * newChalkAboutData()
TDEAboutData * newChalkAboutData()
{
KAboutData * aboutData = new KAboutData( "chalk",
TDEAboutData * aboutData = new TDEAboutData( "chalk",
I18N_NOOP("Chalk"),
KOFFICE_VERSION_STRING,
I18N_NOOP("KOffice image manipulation application"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999-2006 The Chalk team.\n"),
"",
"http://www.koffice.org/chalk",


+ 5
- 5
chalk/ui/kis_factory.cc View File

@@ -45,8 +45,8 @@

#include "kis_factory.h"

KAboutData* KisFactory::s_aboutData = 0;
KInstance* KisFactory::s_instance = 0;
TDEAboutData* KisFactory::s_aboutData = 0;
TDEInstance* KisFactory::s_instance = 0;



@@ -95,18 +95,18 @@ KParts::Part* KisFactory::createPartObject( TQWidget *parentWidget,
}


KAboutData* KisFactory::aboutData()
TDEAboutData* KisFactory::aboutData()
{
return s_aboutData;
}

KInstance* KisFactory::instance()
TDEInstance* KisFactory::instance()
{
TQString homedir = getenv("HOME");
if ( !s_instance )
{
s_instance = new KInstance(s_aboutData);
s_instance = new TDEInstance(s_aboutData);
TQ_CHECK_PTR(s_instance);

s_instance->dirs()->addResourceType("chalk_template", KStandardDirs::kde_default("data") + "chalk/templates");


+ 6
- 6
chalk/ui/kis_factory.h View File

@@ -29,8 +29,8 @@

#include <koffice_export.h>

class KInstance;
class KAboutData;
class TDEInstance;
class TDEAboutData;

class KRITACORE_EXPORT KisFactory : public KoFactory
{
@@ -48,12 +48,12 @@ public:
const char *classname = "KoDocument",
const TQStringList &args = TQStringList() );

static KAboutData *aboutData();
static KInstance *instance();
static TDEAboutData *aboutData();
static TDEInstance *instance();

private:
static KInstance *s_instance;
static KAboutData *s_aboutData;
static TDEInstance *s_instance;
static TDEAboutData *s_aboutData;
};

#endif

+ 4
- 4
example/example_aboutdata.h View File

@@ -26,14 +26,14 @@
static const char* description=I18N_NOOP("Example KOffice Program");
static const char* version="0.1";

KAboutData * newExampleAboutData()
TDEAboutData * newExampleAboutData()
{
// Change this, of course
// The first argument of the KAboutData constructor is the instance name.
// The first argument of the TDEAboutData constructor is the instance name.
// It is very important, it's what's used for many things, like the subdir in share/apps, etc.
// It must also match the name of the application's .desktop file.
KAboutData * aboutData=new KAboutData( "example", I18N_NOOP("Example"),
version, description, KAboutData::License_GPL,
TDEAboutData * aboutData=new TDEAboutData( "example", I18N_NOOP("Example"),
version, description, TDEAboutData::License_GPL,
"(c) 1998-2000, Torben Weis");
aboutData->addAuthor("Torben Weis",0, "weis@kde.org");
return aboutData;


+ 5
- 5
example/example_factory.cc View File

@@ -27,8 +27,8 @@

K_EXPORT_COMPONENT_FACTORY( libexamplepart, ExampleFactory )

KInstance* ExampleFactory::s_global = 0L;
KAboutData* ExampleFactory::s_aboutData = 0L;
TDEInstance* ExampleFactory::s_global = 0L;
TDEAboutData* ExampleFactory::s_aboutData = 0L;

ExampleFactory::ExampleFactory( TQObject* parent, const char* name )
: KoFactory( parent, name )
@@ -59,18 +59,18 @@ KParts::Part* ExampleFactory::createPartObject( TQWidget *parentWidget, const ch
return part;
}

KAboutData* ExampleFactory::aboutData()
TDEAboutData* ExampleFactory::aboutData()
{
if ( !s_aboutData )
s_aboutData = newExampleAboutData();
return s_aboutData;
}

KInstance* ExampleFactory::global()
TDEInstance* ExampleFactory::global()
{
if ( !s_global )
{
s_global = new KInstance( aboutData() );
s_global = new TDEInstance( aboutData() );
// Add any application-specific resource directories here

// Tell the iconloader about share/apps/koffice/icons


+ 7
- 7
example/example_factory.h View File

@@ -22,8 +22,8 @@

#include <KoFactory.h>

class KInstance;
class KAboutData;
class TDEInstance;
class TDEAboutData;

class ExampleFactory : public KoFactory
{
@@ -35,14 +35,14 @@ public:

virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );

static KInstance* global();
static TDEInstance* global();

// _Creates_ a KAboutData but doesn't keep ownership
static KAboutData* aboutData();
// _Creates_ a TDEAboutData but doesn't keep ownership
static TDEAboutData* aboutData();

private:
static KInstance* s_global;
static KAboutData* s_aboutData;
static TDEInstance* s_global;
static TDEAboutData* s_aboutData;
};

#endif

+ 3
- 3
filters/karbon/xfig/xfigimport_factory.cc View File

@@ -30,14 +30,14 @@ DESCRIPTION

K_EXPORT_COMPONENT_FACTORY( libxfigimport, XFIGImportFactory )

KInstance *XFIGImportFactory::s_global = 0;
TDEInstance *XFIGImportFactory::s_global = 0;

XFIGImportFactory::XFIGImportFactory(
TQObject *parent,
const char *name) :
KLibFactory(parent, name)
{
s_global = new KInstance("xfigimport");
s_global = new TDEInstance("xfigimport");
}

XFIGImportFactory::~XFIGImportFactory()
@@ -61,7 +61,7 @@ TQObject *XFIGImportFactory::createObject(
return f;
}

KInstance *XFIGImportFactory::global()
TDEInstance *XFIGImportFactory::global()
{
return s_global;
}

+ 3
- 3
filters/karbon/xfig/xfigimport_factory.h View File

@@ -26,7 +26,7 @@ DESCRIPTION

#include <klibloader.h>

class KInstance;
class TDEInstance;

class XFIGImportFactory :
public KLibFactory
@@ -39,9 +39,9 @@ public:

virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());

static KInstance* global();
static TDEInstance* global();

private:
static KInstance* s_global;
static TDEInstance* s_global;
};
#endif

+ 1
- 1
filters/kspread/kexi/kspread_kexiimport.h View File

@@ -31,7 +31,7 @@

#include <KoFilter.h>

class KAboutData;
class TDEAboutData;

namespace KexiDB
{


+ 3
- 3
karbon/karbon_aboutdata.h View File

@@ -10,14 +10,14 @@ static const char* version=VERSION;

// This is all implemented here so that the executable and the part can share it
// without sharing an object file.
KAboutData * newKarbonAboutData()
TDEAboutData * newKarbonAboutData()
{
KAboutData * aboutData = new KAboutData(
TDEAboutData * aboutData = new TDEAboutData(
"karbon",
I18N_NOOP( "Karbon14" ),
version,
description,
KAboutData::License_GPL,
TDEAboutData::License_GPL,
I18N_NOOP( "(c) 2001-2006, The Karbon Developers" ),
I18N_NOOP( "You are invited to participate in any way." ),
"http://www.koffice.org/karbon/");


+ 5
- 5
karbon/karbon_factory.cc View File

@@ -38,8 +38,8 @@

KarbonResourceServer* KarbonFactory::s_rserver = 0;

KInstance* KarbonFactory::s_instance = 0L;
KAboutData* KarbonFactory::s_aboutData = 0L;
TDEInstance* KarbonFactory::s_instance = 0L;
TDEAboutData* KarbonFactory::s_aboutData = 0L;

KarbonFactory::KarbonFactory( TQObject* parent, const char* name )
: KoFactory( parent, name )
@@ -95,7 +95,7 @@ KarbonFactory::createPartObject( TQWidget* parentWidget, const char* widgetName,
return part;
}

KAboutData*
TDEAboutData*
KarbonFactory::aboutData()
{
if( !s_aboutData )
@@ -103,12 +103,12 @@ KarbonFactory::aboutData()
return s_aboutData;
}

KInstance*
TDEInstance*
KarbonFactory::instance()
{
if( !s_instance )
{
s_instance = new KInstance( aboutData() );
s_instance = new TDEInstance( aboutData() );
// Add any application-specific resource directories here

s_instance->dirs()->addResourceType( "kis_brushes",


+ 6
- 6
karbon/karbon_factory.h View File

@@ -22,8 +22,8 @@

#include <KoFactory.h>
#include <koffice_export.h>
class KAboutData;
class KInstance;
class TDEAboutData;
class TDEInstance;

class KarbonResourceServer;

@@ -41,14 +41,14 @@ public:
const char* widgetName = 0L, TQObject* parent = 0L, const char* name = 0L,
const char* classname = "KoDocument", const TQStringList& args = TQStringList() );

static KInstance* instance();
static KAboutData* aboutData();
static TDEInstance* instance();
static TDEAboutData* aboutData();

static KarbonResourceServer *rServer();

private:
static KInstance* s_instance;
static KAboutData* s_aboutData;
static TDEInstance* s_instance;
static TDEAboutData* s_aboutData;
static KarbonResourceServer* s_rserver;
};



+ 1
- 1
karbon/widgets/vtoolbox.cc View File

@@ -21,7 +21,7 @@
#include "vtoolbox.h"
#include "vtool.h"

VToolBox::VToolBox( KMainWindow *mainWin, const char* name, KInstance* instance ) : KoToolBox( mainWin, name, instance, 5 )
VToolBox::VToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance ) : KoToolBox( mainWin, name, instance, 5 )
{
}



+ 1
- 1
karbon/widgets/vtoolbox.h View File

@@ -31,7 +31,7 @@ class VToolBox : public KoToolBox

public:
VToolBox( KMainWindow *mainWin, const char* name, KInstance* instance );
VToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance );
virtual ~VToolBox() {}

void registerTool( VTool * );


+ 3
- 3
kchart/kchart_aboutdata.h View File

@@ -31,10 +31,10 @@ static const char* description=I18N_NOOP("KOffice Chart Generator");
static const char* version=VERSION;


KAboutData * newKChartAboutData()
TDEAboutData * newKChartAboutData()
{
KAboutData * aboutData= new KAboutData("kchart", I18N_NOOP("KChart"),
version, description, KAboutData::License_GPL,
TDEAboutData * aboutData= new TDEAboutData("kchart", I18N_NOOP("KChart"),
version, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1998-2006, Kalle Dalheimer and Klarälvdalens Datakonsult AB"),
I18N_NOOP("The drawing engine which forms the base of KChart\nis also available as a commercial product\nfrom Klarälvdalens Datakonsult AB.\nContact info@klaralvdalens-datakonsult.se\nfor more information."),
"http://www.koffice.org/kchart/");


+ 5
- 5
kchart/kchart_factory.cc View File

@@ -17,8 +17,8 @@
namespace KChart
{

KInstance *KChartFactory::s_global = 0;
KAboutData *KChartFactory::s_aboutData = 0;
TDEInstance *KChartFactory::s_global = 0;
TDEAboutData *KChartFactory::s_aboutData = 0;


KChartFactory::KChartFactory( TQObject* parent, const char* name )
@@ -56,7 +56,7 @@ KParts::Part* KChartFactory::createPartObject( TQWidget *parentWidget,
}


KAboutData* KChartFactory::aboutData()
TDEAboutData* KChartFactory::aboutData()
{
if( !s_aboutData )
s_aboutData = newKChartAboutData();
@@ -64,11 +64,11 @@ KAboutData* KChartFactory::aboutData()
}


KInstance* KChartFactory::global()
TDEInstance* KChartFactory::global()
{
if ( !s_global )
{
s_global = new KInstance(aboutData());
s_global = new TDEInstance(aboutData());
s_global->dirs()->addResourceType( "kchart_template",
KStandardDirs::kde_default("data") + "kchart/templates/");
// Tell the iconloader about share/apps/koffice/icons


+ 7
- 7
kchart/kchart_factory.h View File

@@ -11,8 +11,8 @@
#include <KoFactory.h>


class KInstance;
class KAboutData;
class TDEInstance;
class TDEAboutData;

namespace KChart
{
@@ -32,14 +32,14 @@ public:
const char* classname = "KoDocument",
const TQStringList &args = TQStringList() );

static KInstance* global();
static TDEInstance* global();

// _Creates_ a KAboutData but doesn't keep ownership
static KAboutData* aboutData();
// _Creates_ a TDEAboutData but doesn't keep ownership
static TDEAboutData* aboutData();

private:
static KInstance* s_global;
static KAboutData *s_aboutData;
static TDEInstance* s_global;
static TDEAboutData *s_aboutData;
};

} //namespace KChart


+ 2
- 2
kexi/core/kexi.cpp View File

@@ -313,9 +313,9 @@ ObjectStatus::operator KexiDB::MessageHandler*()
return msgHandler;
}

void Kexi::initCmdLineArgs(int argc, char *argv[], KAboutData* aboutData)
void Kexi::initCmdLineArgs(int argc, char *argv[], TDEAboutData* aboutData)
{
KAboutData *about = aboutData;
TDEAboutData *about = aboutData;
if (!about)
about = Kexi::createAboutData();
#ifdef CUSTOM_VERSION


+ 1
- 1
kexi/core/kexi.h View File

@@ -36,7 +36,7 @@

namespace Kexi
{
KEXICORE_EXPORT void initCmdLineArgs(int argc, char *argv[], KAboutData* aboutData = 0);
KEXICORE_EXPORT void initCmdLineArgs(int argc, char *argv[], TDEAboutData* aboutData = 0);

/*! Modes of view for the dialogs. Used mostly for parts and KexiDialogBase. */
enum ViewMode {


+ 3
- 3
kexi/core/kexiaboutdata.cpp View File

@@ -38,15 +38,15 @@ static const char *description =

using namespace Kexi;

KAboutData* Kexi::createAboutData()
TDEAboutData* Kexi::createAboutData()
{
KAboutData *aboutData=new KAboutData( "kexi", KEXI_APP_NAME,
TDEAboutData *aboutData=new TDEAboutData( "kexi", KEXI_APP_NAME,
KEXI_VERSION_STRING
#ifndef CUSTOM_VERSION
" (KOffice " KOFFICE_VERSION_STRING ")"
#endif
, description,
KAboutData::License_LGPL_V2,
TDEAboutData::License_LGPL_V2,
I18N_NOOP( "(c) 2002-2007, Kexi Team\n"
"(c) 2003-2007, OpenOffice Polska LLC\n"),
I18N_NOOP( "This software is developed by Kexi Team - an international group\n"


+ 1
- 1
kexi/core/kexiaboutdata.h View File

@@ -26,7 +26,7 @@

namespace Kexi {

KEXICORE_EXPORT KAboutData* createAboutData();
KEXICORE_EXPORT TDEAboutData* createAboutData();

}



+ 1
- 1
kexi/core/kexidialogbase.cpp View File

@@ -134,7 +134,7 @@ TQSize KexiDialogBase::sizeHint() const
}

/*
KInstance *KexiDialogBase::instance() {
TDEInstance *KexiDialogBase::instance() {
return m_instance;
}*/



+ 1
- 1
kexi/doc/dev/TODO-Kexi-js View File

@@ -175,7 +175,7 @@ TOP REQUESTED FEATURES LIST @ PL EXPO 2004:
- scripting

=== Kexi Parts TODO ===
- kexipart.h: add KexiPart::AboutData : public KAboutData
- kexipart.h: add KexiPart::AboutData : public TDEAboutData
and
#define KEXIPART_EXPORT_COMPONENT_FACTORY( libname, partClass, aboutData ) \
K_EXPORT_COMPONENT_FACTORY( libname, KGenericFactory<partClass>(aboutData) )


+ 5
- 5
kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp View File

@@ -51,7 +51,7 @@
if(actionCollection()->action( name )) \
actionCollection()->action( name )->setEnabled( enable )

KInstance *KFDFactory::m_instance = 0L;
TDEInstance *KFDFactory::m_instance = 0L;

KFDFactory::KFDFactory()
: KParts::Factory(0, "libkformdesigner_kdev_part")
@@ -77,18 +77,18 @@ KFDFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *,
return part;
}

KInstance*
TDEInstance*
KFDFactory::instance()
{
if (!m_instance)
m_instance = new KInstance(aboutData());
m_instance = new TDEInstance(aboutData());
return m_instance;
}

KAboutData*
TDEAboutData*
KFDFactory::aboutData()
{
KAboutData *about = new KAboutData("kformdesigner_kdev_part", I18N_NOOP("Form Designer Part"), "0.3");
TDEAboutData *about = new TDEAboutData("kformdesigner_kdev_part", I18N_NOOP("Form Designer Part"), "0.3");
return about;
}



+ 5
- 5
kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h View File

@@ -28,8 +28,8 @@

#include "form.h"

class KAboutData;
class KInstance;
class TDEAboutData;
class TDEInstance;
class TQWorkspace;
class TQCloseEvent;

@@ -48,11 +48,11 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *parent=0, const char *name=0,
const char *classname="KParts::Part", const TQStringList &args=TQStringList());

static KInstance *instance();
static KAboutData *aboutData();
static TDEInstance *instance();
static TDEAboutData *aboutData();

private:
static KInstance *m_instance;
static TDEInstance *m_instance;
};

class KFORMEDITOR_EXPORT KFormDesignerKDevPart : public Designer


+ 5
- 5
kexi/formeditor/test/kfd_part.cpp View File

@@ -81,7 +81,7 @@ class KFDPart_FormManager : public KFormDesigner::FormManager
KFormDesignerPart *m_part;
};

KInstance *KFDFactory::m_instance = 0L;
TDEInstance *KFDFactory::m_instance = 0L;

KFDFactory::KFDFactory()
{}
@@ -106,18 +106,18 @@ KFDFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *,
return part;
}

KInstance*
TDEInstance*
KFDFactory::instance()
{
if (!m_instance)
m_instance = new KInstance(aboutData());
m_instance = new TDEInstance(aboutData());
return m_instance;
}

KAboutData*
TDEAboutData*
KFDFactory::aboutData()
{
KAboutData *about = new KAboutData("kformdesigner_part", I18N_NOOP("Form Designer Part"), "0.3");
TDEAboutData *about = new TDEAboutData("kformdesigner_part", I18N_NOOP("Form Designer Part"), "0.3");
return about;
}



+ 5
- 5
kexi/formeditor/test/kfd_part.h View File

@@ -28,8 +28,8 @@

#include "form.h"

class KAboutData;
class KInstance;
class TDEAboutData;
class TDEInstance;
class TQWorkspace;
class TQCloseEvent;

@@ -47,11 +47,11 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *parent=0, const char *name=0,
const char *classname="KParts::Part", const TQStringList &args=TQStringList());

static KInstance *instance();
static KAboutData *aboutData();
static TDEInstance *instance();
static TDEAboutData *aboutData();

private:
static KInstance *m_instance;
static TDEInstance *m_instance;
};

class KFORMEDITOR_EXPORT KFormDesignerPart: public KParts::ReadWritePart


+ 2
- 2
kexi/formeditor/test/main.cpp View File

@@ -37,8 +37,8 @@ static KCmdLineOptions options[] =

int main(int argc, char **argv)
{
KAboutData about("kformdesigner", I18N_NOOP("KFormDesigner"), version, description,
KAboutData::License_LGPL, "(C) 2003-2005 Kexi Team", 0, 0);
TDEAboutData about("kformdesigner", I18N_NOOP("KFormDesigner"), version, description,
TDEAboutData::License_LGPL, "(C) 2003-2005 Kexi Team", 0, 0);
about.addCredit( "Lucijan Busch", "Original author", 0, "lucijan@kde.org" );
about.addAuthor( "Cedric Pasteur", 0, "cedric.pasteur@free.fr");
about.addCredit( "Jarosław Staniek", "Win32 version, some icons, many fixes, ideas and bug reports", "js@iidea.pl", 0);


+ 3
- 3
kexi/kexidb/drivermanager.cpp View File

@@ -91,9 +91,9 @@ bool DriverManagerInternal::lookupDrivers()
if (tqApp) {
connect(tqApp,TQT_SIGNAL(aboutToQuit()),this,TQT_SLOT(slotAppQuits()));
}
//TODO: for QT-only version check for KInstance wrapper
// KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without KInstance (KGlobal::instance()==0)!" << endl;
// setError("Driver Manager cannot work without KInstance (KGlobal::instance()==0)!");
//TODO: for QT-only version check for TDEInstance wrapper
// KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (KGlobal::instance()==0)!" << endl;
// setError("Driver Manager cannot work without TDEInstance (KGlobal::instance()==0)!");

lookupDriversNeeded = false;
clearError();


+ 4
- 4
kexi/kexidb/simplecommandlineapp.cpp View File

@@ -72,7 +72,7 @@ public:

KexiDB::DriverManager manager;
KCmdLineOptions *allOptions;
KInstance* instance;
TDEInstance* instance;
ConnectionData connData;
TQGuardedPtr<Connection> conn;
};
@@ -91,7 +91,7 @@ SimpleCommandLineApp::SimpleCommandLineApp(
TQFileInfo fi(argv[0]);
TQCString appName( fi.baseName().latin1() );
TDECmdLineArgs::init(argc, argv,
new KAboutData( appName, programName,
new TDEAboutData( appName, programName,
version, shortDescription, licenseType, copyrightStatement, text,
homePageAddress, bugsEmailAddress));

@@ -102,7 +102,7 @@ SimpleCommandLineApp::SimpleCommandLineApp(
for (KCmdLineOptions *optionsPtr = options; optionsPtr->name; optionsPtr++, userOptionsCount++)
;

d->instance = new KInstance(appName);
d->instance = new TDEInstance(appName);

// join the predefined options and user options
d->allOptions = new KCmdLineOptions[predefinedOptionsCount + userOptionsCount + 1];
@@ -212,7 +212,7 @@ bool SimpleCommandLineApp::closeDatabase()
return true;
}

KInstance* SimpleCommandLineApp::instance() const
TDEInstance* SimpleCommandLineApp::instance() const
{
return d->instance;
}


+ 3
- 3
kexi/kexidb/simplecommandlineapp.h View File

@@ -30,7 +30,7 @@ struct KCmdLineOptions;
namespace KexiDB
{
//! @short A skeleton for creating a simple command line database application.
/*! This class creates a KInstance object and automatically handles the following
/*! This class creates a TDEInstance object and automatically handles the following
command line options:
- --driver \<name\> (Database driver name) or -drv
- --user \<name\> (Database user name) or -u
@@ -49,14 +49,14 @@ namespace KexiDB
SimpleCommandLineApp(
int argc, char** argv, KCmdLineOptions *options, const char *programName,
const char *version, const char *shortDescription=0,
int licenseType=KAboutData::License_Unknown,
int licenseType=TDEAboutData::License_Unknown,
const char *copyrightStatement=0, const char *text=0,
const char *homePageAddress=0, const char *bugsEmailAddress="submit@bugs.kde.org");

~SimpleCommandLineApp();

//! \return program instance
KInstance* instance() const;
TDEInstance* instance() const;

/*! Opens database \a databaseName for connection data
specified via the command line. \return true in success.


+ 2
- 2
kexi/main/keximainwindowimpl.cpp View File

@@ -144,7 +144,7 @@
//-------------------------------------------------

//static
int KexiMainWindowImpl::create(int argc, char *argv[], KAboutData* aboutdata)
int KexiMainWindowImpl::create(int argc, char *argv[], TDEAboutData* aboutdata)
{
Kexi::initCmdLineArgs( argc, argv, aboutdata );

@@ -3957,7 +3957,7 @@ void KexiMainWindowImpl::slotStartFeedbackAgent()
{
#ifndef KEXI_NO_FEEDBACK_AGENT
#ifdef FEEDBACK_CLASS
const KAboutData* about = TDEApplication::kApplication()->aboutData();
const TDEAboutData* about = TDEApplication::kApplication()->aboutData();
FEEDBACK_CLASS* wizard = new FEEDBACK_CLASS( about->programName(),
about->version(), 0, 0, 0, FEEDBACK_CLASS::AllPages );



+ 1
- 1
kexi/main/keximainwindowimpl.h View File

@@ -55,7 +55,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
/*! Used by the main kexi routine. Creates a new Kexi main window and a new TDEApplication object.
kdemain() has to destroy the latter on exit.
\return result 1 on error and 0 on success (the result can be used as a result of kdemain()) */
static int create(int argc, char *argv[], KAboutData* aboutdata = 0);
static int create(int argc, char *argv[], TDEAboutData* aboutdata = 0);

//! \return KexiMainWindowImpl singleton (if it is instantiated)
static KexiMainWindowImpl* self() { return dynamic_cast<KexiMainWindowImpl*>(tqApp->mainWidget()); }


+ 1
- 1
kexi/main/startup/KexiStartupDialog.cpp View File

@@ -142,7 +142,7 @@ TQString captionForDialogType(int type)
}

/*================================================================*/
/*KexiStartupDialog::KexiStartupDialog(TQWidget *parent, const char *name, KInstance* global,
/*KexiStartupDialog::KexiStartupDialog(TQWidget *parent, const char *name, TDEInstance* global,
const TQCString &format, const TQString &nativePattern,
const TQString &nativeName, const DialogType &dialogType,
const TQCString& templateType) :


+ 3
- 3
kexi/migration/migratemanager.cpp View File

@@ -94,9 +94,9 @@ bool MigrateManagerInternal::lookupDrivers()
if (tqApp) {
connect(tqApp,TQT_SIGNAL(aboutToQuit()),this,TQT_SLOT(slotAppQuits()));
}
//TODO: for QT-only version check for KInstance wrapper
// KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without KInstance (KGlobal::instance()==0)!" << endl;
// setError("Driver Manager cannot work without KInstance (KGlobal::instance()==0)!");
//TODO: for QT-only version check for TDEInstance wrapper
// KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (KGlobal::instance()==0)!" << endl;
// setError("Driver Manager cannot work without TDEInstance (KGlobal::instance()==0)!");

lookupDriversNeeded = false;
clearError();


+ 2
- 2
kexi/plugins/macros/tests/komacrotest.cpp View File

@@ -33,11 +33,11 @@ static KCmdLineOptions options[] =
int main( int argc, char** argv )
{
try {
KAboutData about("KoMacroTester",
TDEAboutData about("KoMacroTester",
I18N_NOOP("KoMacroTester"),
version,
description,
KAboutData::License_LGPL,
TDEAboutData::License_LGPL,
"(C) 2005 Sebastian Sauer", 0, 0, "mail@dipe.org");

TDECmdLineArgs::init(argc, argv, &about);


+ 2
- 2
kexi/plugins/macros/tests/komacrotestgui.cpp View File

@@ -36,8 +36,8 @@ static const KCmdLineOptions options[] =
int main( int argc, char** argv )
{
try {
KAboutData const about("KomacroTests", I18N_NOOP("KomacroTests"), version, description,
KAboutData::License_LGPL, "(C) 2005 Tobi Krebs", 0, 0,
TDEAboutData const about("KomacroTests", I18N_NOOP("KomacroTests"), version, description,
TDEAboutData::License_LGPL, "(C) 2005 Tobi Krebs", 0, 0,
"Tobi.Krebs@gmail.com");

TDECmdLineArgs::init(argc, argv, &about);


+ 1
- 1
kexi/tests/altertable/altertable.cpp View File

@@ -690,7 +690,7 @@ int main(int argc, char *argv[])
newArgv[0] = tqstrdup(argv[0]);
newArgv[1] = tqstrdup( "--skip-startup-dialog" );

KAboutData* aboutdata = Kexi::createAboutData();
TDEAboutData* aboutdata = Kexi::createAboutData();
aboutdata->setProgramName( "Kexi Alter Table Test" );
int result = KexiMainWindowImpl::create(newArgc, newArgv, aboutdata);
if (!tqApp)


+ 1
- 1
kexi/tests/gui/finddialog/main.cpp View File

@@ -26,7 +26,7 @@

int main( int argc, char ** argv )
{
KAboutData aboutData( "test", I18N_NOOP("KFind"), "0", "", KAboutData::License_LGPL );
TDEAboutData aboutData( "test", I18N_NOOP("KFind"), "0", "", TDEAboutData::License_LGPL );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app;



+ 4
- 4
kexi/tests/newapi/main.cpp View File

@@ -52,7 +52,7 @@ KexiDB::ConnectionData conn_data;
TQGuardedPtr<KexiDB::Connection> conn;
TQGuardedPtr<KexiDB::Driver> driver;
TDEApplication *app = 0;
KInstance *instance = 0;
TDEInstance *instance = 0;

static KCmdLineOptions options[] =
{
@@ -116,8 +116,8 @@ int main(int argc, char** argv)
prgname = info.baseName().latin1();
TDECmdLineArgs::init(argc, argv,
new KAboutData( prgname, "KexiDBTest",
"0.1.2", "", KAboutData::License_GPL,
new TDEAboutData( prgname, "KexiDBTest",
"0.1.2", "", TDEAboutData::License_GPL,
"(c) 2003-2006, Kexi Team\n"
"(c) 2003-2006, OpenOffice Polska Ltd.\n",
"",
@@ -162,7 +162,7 @@ int main(int argc, char** argv)
KGlobal::iconLoader()->addAppDir("kexi");
}
else {
instance = new KInstance(prgname);
instance = new TDEInstance(prgname);
}

drv_name = args->arg(0);


+ 1
- 1
kexi/tests/newapi/mysqlcursor.cpp View File

@@ -9,7 +9,7 @@

int main(int argc, char * argv[])
{
KInstance instance("newapi");
TDEInstance instance("newapi");
KexiDB::DriverManager manager;
TQStringList names = manager.driverNames();
kdDebug() << "DRIVERS: " << endl;


+ 1
- 1
kexi/tests/parser/main.cpp View File

@@ -20,7 +20,7 @@ int main(int argc, char **argv)
kdDebug() << "main()" << endl;
TQFileInfo info=TQFileInfo(argv[0]);
prgname = info.baseName().latin1();
KInstance instance( prgname );
TDEInstance instance( prgname );
if (argc<2) {
return 1;
}


+ 3
- 3
kformula/kformula_aboutdata.h View File

@@ -29,10 +29,10 @@
static const char* description=I18N_NOOP("KOffice Formula Editor");
static const char* version=VERSION;

KAboutData * newKFormulaAboutData()
TDEAboutData * newKFormulaAboutData()
{
KAboutData * aboutData = new KAboutData( "kformula", I18N_NOOP( "KFormula" ),
version, description, KAboutData::License_GPL,
TDEAboutData * aboutData = new TDEAboutData( "kformula", I18N_NOOP( "KFormula" ),
version, description, TDEAboutData::License_GPL,
"(c) 1998-2006, The KFormula Team", 0,
"http://www.koffice.org/kformula/" );
aboutData->addAuthor( "Alfredo Beaumont",


+ 5
- 5
kformula/kformula_factory.cc View File

@@ -14,10 +14,10 @@

K_EXPORT_COMPONENT_FACTORY( libkformulapart, KFormulaFactory )

KInstance* KFormulaFactory::s_global = 0;
KAboutData* KFormulaFactory::s_aboutData = 0;
TDEInstance* KFormulaFactory::s_global = 0;
TDEAboutData* KFormulaFactory::s_aboutData = 0;

KAboutData* KFormulaFactory::aboutData()
TDEAboutData* KFormulaFactory::aboutData()
{
if( !s_aboutData )
s_aboutData=newKFormulaAboutData();
@@ -53,11 +53,11 @@ KParts::Part* KFormulaFactory::createPartObject( TQWidget *parentWidget, const c
return doc;
}

KInstance* KFormulaFactory::global()
TDEInstance* KFormulaFactory::global()
{
if ( !s_global )
{
s_global = new KInstance(aboutData());
s_global = new TDEInstance(aboutData());
s_global->dirs()->addResourceType( "toolbar",
KStandardDirs::kde_default("data") + "koffice/toolbar/");
// Tell the iconloader about share/apps/koffice/icons*/


+ 7
- 7
kformula/kformula_factory.h View File

@@ -4,9 +4,9 @@
#include <KoFactory.h>
//#include <kaboutdata.h>

class KInstance;
class KInstance;
class KAboutData;
class TDEInstance;
class TDEInstance;
class TDEAboutData;

class KFormulaFactory : public KoFactory
{
@@ -18,13 +18,13 @@ public:

virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );

static KInstance* global();
static TDEInstance* global();

static KAboutData* aboutData();
static TDEAboutData* aboutData();

private:
static KInstance* s_global;
static KAboutData* s_aboutData;
static TDEInstance* s_global;
static TDEAboutData* s_aboutData;
};

#endif

+ 3
- 3
kivio/kiviopart/kivio_aboutdata.h View File

@@ -28,10 +28,10 @@
static const char* description = I18N_NOOP("KOffice Flowchart And Diagram Tool");
static const char* version = KOFFICE_VERSION_STRING;

KAboutData * newKivioAboutData()
TDEAboutData * newKivioAboutData()
{
KAboutData * aboutData=new KAboutData( "kivio", I18N_NOOP("Kivio"),
version, description, KAboutData::License_GPL,
TDEAboutData * aboutData=new TDEAboutData( "kivio", I18N_NOOP("Kivio"),
version, description, TDEAboutData::License_GPL,
I18N_NOOP("(C) 2000-2006, The Kivio Team"), 0,
"http://www.koffice.org/kivio/");
aboutData->addAuthor("Peter Simonsson", I18N_NOOP("Maintainer"), "psn@linux.se");


+ 5
- 5
kivio/kiviopart/kivio_factory.cpp View File

@@ -26,8 +26,8 @@
#include <kiconloader.h>


KInstance* KivioFactory::s_global = 0;
KAboutData* KivioFactory::s_aboutData = 0;
TDEInstance* KivioFactory::s_global = 0;
TDEAboutData* KivioFactory::s_aboutData = 0;

KivioFactory::KivioFactory( TQObject* parent, const char* name )
: KoFactory( parent, name )
@@ -55,18 +55,18 @@ KParts::Part* KivioFactory::createPartObject( TQWidget *parentWidget, const char
return doc;
}

KAboutData* KivioFactory::aboutData()
TDEAboutData* KivioFactory::aboutData()
{
if( !s_aboutData )
s_aboutData = newKivioAboutData();
return s_aboutData;
}

KInstance* KivioFactory::global()
TDEInstance* KivioFactory::global()
{
if ( !s_global )
{
s_global = new KInstance(aboutData());
s_global = new TDEInstance(aboutData());
s_global->dirs()->addResourceType( "kivio_template", KStandardDirs::kde_default("data") + "kivio/templates/" );
s_global->dirs()->addResourceType( "toolbar", KStandardDirs::kde_default("data") + "koffice/toolbar/");
s_global->iconLoader()->addAppDir("koffice");


+ 6
- 6
kivio/kiviopart/kivio_factory.h View File

@@ -21,8 +21,8 @@

#include <KoFactory.h>
#include <koffice_export.h>
class KInstance;
class KAboutData;
class TDEInstance;
class TDEAboutData;

class KIVIO_EXPORT KivioFactory : public KoFactory
{ Q_OBJECT
@@ -33,12 +33,12 @@ public:

virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );

static KInstance* global();
static KAboutData* aboutData();
static TDEInstance* global();
static TDEAboutData* aboutData();

private:
static KInstance* s_global;
static KAboutData* s_aboutData;
static TDEInstance* s_global;
static TDEAboutData* s_aboutData;
};

#endif

+ 1
- 1
kivio/kiviopart/kivioarrowheadaction.cpp View File

@@ -116,7 +116,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
index );
else
{
KInstance *instance;
TDEInstance *instance;

if ( m_parentCollection )
instance = m_parentCollection->instance();


+ 1
- 1
kivio/kiviopart/kiviostencilsetaction.cpp View File

@@ -129,7 +129,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
index );
else
{
KInstance *instance;
TDEInstance *instance;

if ( m_parentCollection )
instance = m_parentCollection->instance();


+ 3
- 3
kivio/plugins/kivioconnectortool/plugin.cpp View File

@@ -29,12 +29,12 @@
***************************************************/
K_EXPORT_COMPONENT_FACTORY( libkivioconnectortool, ConnectorToolFactory )

KInstance* ConnectorToolFactory::s_global = 0;
TDEInstance* ConnectorToolFactory::s_global = 0;

ConnectorToolFactory::ConnectorToolFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name )
{
s_global = new KInstance("kivio");
s_global = new TDEInstance("kivio");
}

ConnectorToolFactory::~ConnectorToolFactory()
@@ -51,7 +51,7 @@ TQObject* ConnectorToolFactory::createObject( TQObject* parent, const char*, con
return obj;
}

KInstance* ConnectorToolFactory::global()
TDEInstance* ConnectorToolFactory::global()
{
return s_global;
}


+ 3
- 3
kivio/plugins/kivioconnectortool/plugin.h View File

@@ -24,7 +24,7 @@

#include <klibloader.h>

class KInstance;
class TDEInstance;

class ConnectorToolFactory : public KLibFactory
{ Q_OBJECT
@@ -36,10 +36,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );

static KInstance* global();
static TDEInstance* global();

private:
static KInstance* s_global;
static TDEInstance* s_global;
};

#endif

+ 3
- 3
kivio/plugins/kivioselecttool/plugin.cpp View File

@@ -29,12 +29,12 @@
***************************************************/
K_EXPORT_COMPONENT_FACTORY( libkivioselecttool, SelectToolFactory )

KInstance* SelectToolFactory::s_global = 0;
TDEInstance* SelectToolFactory::s_global = 0;

SelectToolFactory::SelectToolFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name )
{
s_global = new KInstance("kivio");
s_global = new TDEInstance("kivio");
}

SelectToolFactory::~SelectToolFactory()
@@ -51,7 +51,7 @@ TQObject* SelectToolFactory::createObject( TQObject* parent, const char*, const
return obj;
}

KInstance* SelectToolFactory::global()
TDEInstance* SelectToolFactory::global()
{
return s_global;
}


+ 3
- 3
kivio/plugins/kivioselecttool/plugin.h View File

@@ -24,7 +24,7 @@

#include <klibloader.h>

class KInstance;
class TDEInstance;

class SelectToolFactory : public KLibFactory
{ Q_OBJECT
@@ -36,10 +36,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );

static KInstance* global();
static TDEInstance* global();

private:
static KInstance* s_global;
static TDEInstance* s_global;
};

#endif

+ 3
- 3
kivio/plugins/kiviosmlconnector/plugin.cpp View File

@@ -29,12 +29,12 @@
***************************************************/
K_EXPORT_COMPONENT_FACTORY( libkiviosmlconnector, SMLConnectorFactory )

KInstance* SMLConnectorFactory::s_global = 0;
TDEInstance* SMLConnectorFactory::s_global = 0;

SMLConnectorFactory::SMLConnectorFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name )
{
s_global = new KInstance("kivio");
s_global = new TDEInstance("kivio");
}

SMLConnectorFactory::~SMLConnectorFactory()
@@ -51,7 +51,7 @@ TQObject* SMLConnectorFactory::createObject( TQObject* parent, const char*, cons
return obj;
}

KInstance* SMLConnectorFactory::global()
TDEInstance* SMLConnectorFactory::global()
{
return s_global;
}


+ 3
- 3
kivio/plugins/kiviosmlconnector/plugin.h View File

@@ -24,7 +24,7 @@

#include <klibloader.h>

class KInstance;
class TDEInstance;

class SMLConnectorFactory : public KLibFactory
{ Q_OBJECT
@@ -36,10 +36,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );

static KInstance* global();
static TDEInstance* global();

private:
static KInstance* s_global;
static TDEInstance* s_global;
};

#endif

+ 3
- 3
kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp View File

@@ -22,12 +22,12 @@

K_EXPORT_COMPONENT_FACTORY( libkiviotargettool, KivioTargetToolFactory )

KInstance* KivioTargetToolFactory::s_global = 0;
TDEInstance* KivioTargetToolFactory::s_global = 0;

KivioTargetToolFactory::KivioTargetToolFactory(TQObject *parent, const char *name)
: KLibFactory(parent, name)
{
s_global = new KInstance("kivio");
s_global = new TDEInstance("kivio");
}

KivioTargetToolFactory::~KivioTargetToolFactory()
@@ -44,7 +44,7 @@ TQObject* KivioTargetToolFactory::createObject( TQObject* parent, const char*, c
return obj;
}

KInstance* KivioTargetToolFactory::global()
TDEInstance* KivioTargetToolFactory::global()
{
return s_global;
}


+ 3
- 3
kivio/plugins/kiviotargettool/kiviotargettoolfactory.h View File

@@ -24,7 +24,7 @@

#include <klibloader.h>

class KInstance;
class TDEInstance;

class KivioTargetToolFactory : public KLibFactory
{
@@ -37,10 +37,10 @@ class KivioTargetToolFactory : public KLibFactory
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
static KInstance* global();
static TDEInstance* global();
private:
static KInstance* s_global;
static TDEInstance* s_global;
};

#endif

+ 3
- 3
kivio/plugins/kiviotexttool/plugin.cpp View File

@@ -29,12 +29,12 @@
***************************************************/
K_EXPORT_COMPONENT_FACTORY( libkiviotexttool, TextToolFactory )

KInstance* TextToolFactory::s_global = 0;
TDEInstance* TextToolFactory::s_global = 0;

TextToolFactory::TextToolFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name )
{
s_global = new KInstance("kivio");
s_global = new TDEInstance("kivio");
}

TextToolFactory::~TextToolFactory()
@@ -51,7 +51,7 @@ TQObject* TextToolFactory::createObject( TQObject* parent, const char*, const ch
return obj;
}

KInstance* TextToolFactory::global()
TDEInstance* TextToolFactory::global()
{
return s_global;
}


+ 3
- 3
kivio/plugins/kiviotexttool/plugin.h View File

@@ -24,7 +24,7 @@

#include <klibloader.h>

class KInstance;
class TDEInstance;

class TextToolFactory : public KLibFactory
{ Q_OBJECT
@@ -36,10 +36,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );

static KInstance* global();
static TDEInstance* global();

private:
static KInstance* s_global;
static TDEInstance* s_global;
};

#endif

+ 3
- 3
kivio/plugins/kiviozoomtool/plugin.cpp View File

@@ -29,12 +29,12 @@
***************************************************/
K_EXPORT_COMPONENT_FACTORY( libkiviozoomtool, ZoomToolFactory )

KInstance* ZoomToolFactory::s_global = 0;
TDEInstance* ZoomToolFactory::s_global = 0;

ZoomToolFactory::ZoomToolFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name )
{
s_global = new KInstance("kivio");
s_global = new TDEInstance("kivio");
}

ZoomToolFactory::~ZoomToolFactory()
@@ -51,7 +51,7 @@ TQObject* ZoomToolFactory::createObject( TQObject* parent, const char*, const ch
return obj;
}

KInstance* ZoomToolFactory::global()
TDEInstance* ZoomToolFactory::global()
{
return s_global;
}


+ 3
- 3
kivio/plugins/kiviozoomtool/plugin.h View File

@@ -24,7 +24,7 @@

#include <klibloader.h>

class KInstance;
class TDEInstance;

class ZoomToolFactory : public KLibFactory
{ Q_OBJECT
@@ -35,10 +35,10 @@ public:

virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
static KInstance* global();
static TDEInstance* global();

private:
static KInstance* s_global;
static TDEInstance* s_global;
};

#endif

+ 2
- 2
koshell/koshell_main.cc View File

@@ -69,8 +69,8 @@ int KoShellApp::newInstance()

extern "C" KOSHELL_EXPORT int kdemain( int argc, char **argv )
{
KAboutData * aboutData = new KAboutData( "koshell", I18N_NOOP("KOffice Workspace"),
version, description, KAboutData::License_GPL,
TDEAboutData * aboutData = new TDEAboutData( "koshell", I18N_NOOP("KOffice Workspace"),
version, description, TDEAboutData::License_GPL,
"(c) 1998-2006, Torben Weis\n(c) 2002-2005, David Faure\n(c) 2005, Sven Lüppken");
aboutData->addAuthor("Sven Lüppken", I18N_NOOP("Current Maintainer"), "sven@kde.org");
aboutData->addAuthor("Torben Weis", 0, "weis@kde.org");


+ 7
- 7
kounavail/kounavail.cc View File

@@ -127,8 +127,8 @@ void KoUnavailView::paintEvent( TQPaintEvent* ev )

K_EXPORT_COMPONENT_FACTORY( libkounavailpart, KoUnavailFactory )

KInstance* KoUnavailFactory::s_global = 0L;
KAboutData* KoUnavailFactory::s_aboutData = 0L;
TDEInstance* KoUnavailFactory::s_global = 0L;
TDEAboutData* KoUnavailFactory::s_aboutData = 0L;

KoUnavailFactory::KoUnavailFactory( TQObject* parent, const char* name )
: KoFactory( parent, name )
@@ -149,25 +149,25 @@ KParts::Part* KoUnavailFactory::createPartObject( TQWidget *parentWidget, const
return new KoUnavailPart( parentWidget, widgetName, parent, name );
}

KAboutData* KoUnavailFactory::aboutData()
TDEAboutData* KoUnavailFactory::aboutData()
{
if ( !s_aboutData )
{
static const char* description=I18N_NOOP("KoUnavail KOffice Program");
static const char* version="0.1";
s_aboutData=new KAboutData( "kounavail", I18N_NOOP("KoUnavail"),
version, description, KAboutData::License_LGPL,
s_aboutData=new TDEAboutData( "kounavail", I18N_NOOP("KoUnavail"),
version, description, TDEAboutData::License_LGPL,
"(c) 2001, David Faure");
s_aboutData->addAuthor("David Faure",0, "faure@kde.org");
}
return s_aboutData;
}

KInstance* KoUnavailFactory::global()
TDEInstance* KoUnavailFactory::global()
{
if ( !s_global )
{
s_global = new KInstance( aboutData() );
s_global = new TDEInstance( aboutData() );
// Tell the iconloader about share/apps/koffice/icons
//s_global->iconLoader()->addAppDir("koffice");
}


+ 7
- 7
kounavail/kounavail.h View File

@@ -85,8 +85,8 @@ protected:

#include <KoFactory.h>

class KInstance;
class KAboutData;
class TDEInstance;
class TDEAboutData;

class KoUnavailFactory : public KoFactory
{
@@ -98,14 +98,14 @@ public:

virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );

static KInstance* global();
static TDEInstance* global();

// _Creates_ a KAboutData but doesn't keep ownership
static KAboutData* aboutData();
// _Creates_ a TDEAboutData but doesn't keep ownership
static TDEAboutData* aboutData();

private:
static KInstance* s_global;
static KAboutData* s_aboutData;
static TDEInstance* s_global;
static TDEAboutData* s_aboutData;
};

#endif

+ 3
- 3
kplato/kptaboutdata.h View File

@@ -30,10 +30,10 @@ namespace KPlato
static const char* KPLATO_DESCRIPTION=I18N_NOOP("KPlato - TDE Planning Tool");
static const char* KPLATO_VERSION="0.6.3";

KAboutData * newAboutData()
TDEAboutData * newAboutData()
{
KAboutData * aboutData=new KAboutData( "kplato", I18N_NOOP("KPlato"),
KPLATO_VERSION, KPLATO_DESCRIPTION, KAboutData::License_GPL,
TDEAboutData * aboutData=new TDEAboutData( "kplato", I18N_NOOP("KPlato"),
KPLATO_VERSION, KPLATO_DESCRIPTION, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1998-2006, The KPlato Team"), 0,
"http://www.koffice.org/kplato/" );
aboutData->addAuthor("Thomas Zander", 0, 0 ); // please don't re-add, I don't like getting personal emails :)


+ 5
- 5
kplato/kptfactory.cc View File

@@ -31,8 +31,8 @@ namespace KPlato

K_EXPORT_COMPONENT_FACTORY( libkplatopart, Factory )

KInstance* Factory::s_global = 0L;
KAboutData* Factory::s_aboutData = 0L;
TDEInstance* Factory::s_global = 0L;
TDEAboutData* Factory::s_aboutData = 0L;

Factory::Factory( TQObject* parent, const char* name )
: KoFactory( parent, name )
@@ -70,18 +70,18 @@ KParts::Part *Factory::createPartObject(TQWidget *parentWidget,
return part;
}

KAboutData* Factory::aboutData()
TDEAboutData* Factory::aboutData()
{
if ( !s_aboutData )
s_aboutData = newAboutData();
return s_aboutData;
}

KInstance* Factory::global()
TDEInstance* Factory::global()
{
if ( !s_global )
{
s_global = new KInstance( aboutData() );
s_global = new TDEInstance( aboutData() );

// Add any application-specific resource directories here
s_global->dirs()->addResourceType("kplato_template",


+ 6
- 6
kplato/kptfactory.h View File

@@ -22,7 +22,7 @@

#include <KoFactory.h>

class KAboutData;
class TDEAboutData;

namespace KPlato
{
@@ -37,14 +37,14 @@ public:

virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );

static KInstance* global();
static TDEInstance* global();

// _Creates_ a KAboutData but doesn't keep ownership
static KAboutData* aboutData();
// _Creates_ a TDEAboutData but doesn't keep ownership
static TDEAboutData* aboutData();

private:
static KInstance* s_global;
static KAboutData* s_aboutData;
static TDEInstance* s_global;
static TDEAboutData* s_aboutData;
};

} // KPlato namespace


+ 3
- 3
kpresenter/KPrAboutData.h View File

@@ -27,10 +27,10 @@
static const char* description=I18N_NOOP("KOffice Presentation Tool");
static const char* version=KOFFICE_VERSION_STRING;

KAboutData * newKPresenterAboutData()
TDEAboutData * newKPresenterAboutData()
{
KAboutData * aboutData=new KAboutData( "kpresenter", I18N_NOOP("KPresenter"),
version, description, KAboutData::License_LGPL,
TDEAboutData * aboutData=new TDEAboutData( "kpresenter", I18N_NOOP("KPresenter"),
version, description, TDEAboutData::License_LGPL,
I18N_NOOP("(c) 1998-2006, The KPresenter Team"), 0,
"http://www.koffice.org/kpresenter/");
aboutData->addAuthor("Laurent Montel", I18N_NOOP("current maintainer"), "montel@kde.org");


+ 5
- 5
kpresenter/KPrFactory.cpp View File

@@ -26,8 +26,8 @@
#include <kinstance.h>


KInstance* KPrFactory::s_global = 0;
KAboutData* KPrFactory::s_aboutData = 0;
TDEInstance* KPrFactory::s_global = 0;
TDEAboutData* KPrFactory::s_aboutData = 0;

KPrFactory::KPrFactory( TQObject* parent, const char* name )
: KoFactory( parent, name )
@@ -56,18 +56,18 @@ KParts::Part* KPrFactory::createPartObject( TQWidget *parentWidget, const char *
return doc;
}

KAboutData* KPrFactory::aboutData()
TDEAboutData* KPrFactory::aboutData()
{
if( !s_aboutData )
s_aboutData=newKPresenterAboutData();
return s_aboutData;
}

KInstance* KPrFactory::global()
TDEInstance* KPrFactory::global()
{
if ( !s_global )
{
s_global = new KInstance(aboutData());
s_global = new TDEInstance(aboutData());

s_global->dirs()->addResourceType("kpresenter_template",
KStandardDirs::kde_default("data") + "kpresenter/templates/");


+ 6
- 6
kpresenter/KPrFactory.h View File

@@ -22,7 +22,7 @@
#define KPRESENTER_FACTORY_H

#include <KoFactory.h>
class KAboutData;
class TDEAboutData;

class KPrFactory : public KoFactory
{
@@ -36,14 +36,14 @@ public:
const char *name = 0, const char *classname = "KoDocument",
const TQStringList &args = TQStringList() );

static KInstance* global();
static TDEInstance* global();

// _Creates_ a KAboutData but doesn't keep ownership
static KAboutData* aboutData();
// _Creates_ a TDEAboutData but doesn't keep ownership
static TDEAboutData* aboutData();

private:
static KInstance* s_global;
static KAboutData* s_aboutData;
static TDEInstance* s_global;
static TDEAboutData* s_aboutData;
};

#endif

+ 3
- 3
kspread/kspread_aboutdata.h View File

@@ -32,10 +32,10 @@ static const char* description=I18N_NOOP("KOffice Spreadsheet Application");
// Always the same as the KOffice version
static const char* version=KOFFICE_VERSION_STRING;

KAboutData * newAboutData()
TDEAboutData * newAboutData()
{
KAboutData * aboutData = new KAboutData( "kspread", I18N_NOOP("KSpread"),
version, description, KAboutData::License_LGPL,
TDEAboutData * aboutData = new TDEAboutData( "kspread", I18N_NOOP("KSpread"),
version, description, TDEAboutData::License_LGPL,
I18N_NOOP("(c) 1998-2006, The KSpread Team"), 0,
"http://www.koffice.org/kspread/");
aboutData->addAuthor("Torben Weis", 0, "weis@kde.org");


+ 5
- 5
kspread/kspread_factory.cc View File

@@ -28,9 +28,9 @@

using namespace KSpread;

KInstance* Factory::s_global = 0;
TDEInstance* Factory::s_global = 0;
DCOPObject* Factory::s_dcopObject = 0;
KAboutData* Factory::s_aboutData = 0;
TDEAboutData* Factory::s_aboutData = 0;

Factory::Factory( TQObject* parent, const char* name )
: KoFactory( parent, name )
@@ -65,18 +65,18 @@ KParts::Part* Factory::createPartObject( TQWidget *parentWidget, const char *wid
return doc;
}

KAboutData* Factory::aboutData()
TDEAboutData* Factory::aboutData()
{
if( !s_aboutData )
s_aboutData = newAboutData();
return s_aboutData;
}

KInstance* Factory::global()
TDEInstance* Factory::global()
{
if ( !s_global )
{
s_global = new KInstance(aboutData());
s_global = new TDEInstance(aboutData());

s_global->dirs()->addResourceType( "kspread_template",
KStandardDirs::kde_default("data") + "kspread/templates/");