summaryrefslogtreecommitdiffstats
path: root/kword
diff options
context:
space:
mode:
Diffstat (limited to 'kword')
-rw-r--r--kword/KWAboutData.h6
-rw-r--r--kword/KWFactory.cpp10
-rw-r--r--kword/KWFactory.h12
-rw-r--r--kword/KWMailMergeDataBase.cpp4
-rw-r--r--kword/KWMailMergeDataSource.cpp2
-rw-r--r--kword/KWMailMergeDataSource.h6
-rw-r--r--kword/mailmerge/KWClassicSerialDataSource.cpp4
-rw-r--r--kword/mailmerge/KWClassicSerialDataSource.h2
-rw-r--r--kword/mailmerge/kabc/KWMailMergeKABC.cpp4
-rw-r--r--kword/mailmerge/kabc/KWMailMergeKABC.h2
-rw-r--r--kword/mailmerge/kspread/kwmailmerge_kspread.cpp4
-rw-r--r--kword/mailmerge/kspread/kwmailmerge_kspread.h2
-rw-r--r--kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp4
-rw-r--r--kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h2
-rw-r--r--kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp4
-rw-r--r--kword/mailmerge/sql/KWQtSqlSerialDataSource.h2
-rw-r--r--kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp2
-rw-r--r--kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h2
18 files changed, 37 insertions, 37 deletions
diff --git a/kword/KWAboutData.h b/kword/KWAboutData.h
index 42456598..849aecf4 100644
--- a/kword/KWAboutData.h
+++ b/kword/KWAboutData.h
@@ -32,10 +32,10 @@ static const char* KWORD_DESCRIPTION=I18N_NOOP("KOffice Word Processor");
// From then on: always the same as the KOffice version
static const char* KWORD_VERSION=KOFFICE_VERSION_STRING;
-KAboutData * newKWordAboutData()
+TDEAboutData * newKWordAboutData()
{
- KAboutData * aboutData=new KAboutData( "kword", I18N_NOOP("KWord"),
- KWORD_VERSION, KWORD_DESCRIPTION, KAboutData::License_LGPL,
+ TDEAboutData * aboutData=new TDEAboutData( "kword", I18N_NOOP("KWord"),
+ KWORD_VERSION, KWORD_DESCRIPTION, TDEAboutData::License_LGPL,
I18N_NOOP("(c) 1998-2006, The KWord Team"), 0,
"http://www.koffice.org/kword/" );
aboutData->addAuthor("David Faure", 0, "faure@kde.org");
diff --git a/kword/KWFactory.cpp b/kword/KWFactory.cpp
index 50648519..4c2009f1 100644
--- a/kword/KWFactory.cpp
+++ b/kword/KWFactory.cpp
@@ -25,8 +25,8 @@
#include <kiconloader.h>
-KInstance* KWFactory::s_instance = 0;
-KAboutData* KWFactory::s_aboutData = 0;
+TDEInstance* KWFactory::s_instance = 0;
+TDEAboutData* KWFactory::s_aboutData = 0;
KWFactory::KWFactory( TQObject* parent, const char* name )
: KoFactory( parent, name )
@@ -56,7 +56,7 @@ KParts::Part* KWFactory::createPartObject( TQWidget *parentWidget, const char *w
return doc;
}
-KAboutData* KWFactory::aboutData()
+TDEAboutData* KWFactory::aboutData()
{
if(!s_aboutData) {
s_aboutData = newKWordAboutData();
@@ -64,11 +64,11 @@ KAboutData* KWFactory::aboutData()
return s_aboutData;
}
-KInstance* KWFactory::instance()
+TDEInstance* KWFactory::instance()
{
if ( !s_instance )
{
- s_instance = new KInstance( aboutData() );
+ s_instance = new TDEInstance( aboutData() );
s_instance->dirs()->addResourceType( "kword_template",
KStandardDirs::kde_default("data") + "kword/templates/");
diff --git a/kword/KWFactory.h b/kword/KWFactory.h
index 30d69cf9..028756db 100644
--- a/kword/KWFactory.h
+++ b/kword/KWFactory.h
@@ -22,7 +22,7 @@
#include <KoFactory.h>
-class KAboutData;
+class TDEAboutData;
class KWFactory : public KoFactory
{
@@ -34,14 +34,14 @@ public:
virtual KParts::Part* createPartObject( TQWidget * = 0, const char * = 0, TQObject* parent = 0, const char* name = 0, const char* classname = "KoDocument", const TQStringList &args = TQStringList() );
- static KInstance* instance();
+ static TDEInstance* instance();
- // _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_instance;
- static KAboutData* s_aboutData;
+ static TDEInstance* s_instance;
+ static TDEAboutData* s_aboutData;
};
#endif
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index 90606ce1..7303f1db 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -168,8 +168,8 @@ KWMailMergeDataSource *KWMailMergeDataBase::loadPlugin(const TQString& name)
if (create)
{
// create the module
- KWMailMergeDataSource * (*func)(KInstance*,TQObject*);
- func = (KWMailMergeDataSource* (*)(KInstance*,TQObject*)) create;
+ KWMailMergeDataSource * (*func)(TDEInstance*,TQObject*);
+ func = (KWMailMergeDataSource* (*)(TDEInstance*,TQObject*)) create;
KWMailMergeDataSource *tmpsource =func(KWFactory::instance(),this);
if (tmpsource)
{
diff --git a/kword/KWMailMergeDataSource.cpp b/kword/KWMailMergeDataSource.cpp
index d21c4bd0..924c665d 100644
--- a/kword/KWMailMergeDataSource.cpp
+++ b/kword/KWMailMergeDataSource.cpp
@@ -1,7 +1,7 @@
#include "KWMailMergeDataSource.h"
#include "KWMailMergeDataSource.moc"
-KWMailMergeDataSource::KWMailMergeDataSource(KInstance* inst,TQObject *parent): TQObject(parent),
+KWMailMergeDataSource::KWMailMergeDataSource(TDEInstance* inst,TQObject *parent): TQObject(parent),
DCOPObject(TQCString(parent->name())+".plugin_loading"),m_instance(inst)
{
}
diff --git a/kword/KWMailMergeDataSource.h b/kword/KWMailMergeDataSource.h
index 4d5a2508..3cf5eea1 100644
--- a/kword/KWMailMergeDataSource.h
+++ b/kword/KWMailMergeDataSource.h
@@ -49,13 +49,13 @@ class KWORD_EXPORT KWMailMergeDataSource: public TQObject, public DCOPObject
//
K_DCOP
public:
- KWMailMergeDataSource(KInstance* inst,TQObject *parent);
+ KWMailMergeDataSource(TDEInstance* inst,TQObject *parent);
virtual ~KWMailMergeDataSource(){;}
virtual class TQString getValue( const class TQString &name, int record = -1 ) const=0;
const TQMap< TQString, TQString > &getRecordEntries() const;
- KInstance *KWInstance(){return m_instance;}
+ TDEInstance *KWInstance(){return m_instance;}
virtual bool showConfigDialog(class TQWidget*,int) =0;
virtual void save(TQDomDocument&, TQDomElement&)=0;
@@ -66,7 +66,7 @@ class KWORD_EXPORT KWMailMergeDataSource: public TQObject, public DCOPObject
protected:
DbRecord sampleRecord;
private:
- KInstance *m_instance;
+ TDEInstance *m_instance;
k_dcop:
virtual int getNumRecords() const =0;
};
diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index f54e529c..ef76bea0 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -46,7 +46,7 @@
*
******************************************************************/
-KWClassicSerialDataSource::KWClassicSerialDataSource(KInstance *inst,TQObject *parent)
+KWClassicSerialDataSource::KWClassicSerialDataSource(TDEInstance *inst,TQObject *parent)
: KWMailMergeDataSource(inst,parent)
// : doc( doc_ )
{
@@ -561,7 +561,7 @@ void KWClassicMailMergeEditor::removeRecord()
}
extern "C" {
- KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_classic(KInstance *inst,TQObject *parent)
+ KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_classic(TDEInstance *inst,TQObject *parent)
{
return new KWClassicSerialDataSource(inst,parent);
}
diff --git a/kword/mailmerge/KWClassicSerialDataSource.h b/kword/mailmerge/KWClassicSerialDataSource.h
index 6f6133e2..9863ffe0 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.h
+++ b/kword/mailmerge/KWClassicSerialDataSource.h
@@ -48,7 +48,7 @@ class KWClassicSerialDataSource: public KWMailMergeDataSource
Q_OBJECT
public:
- KWClassicSerialDataSource(KInstance *inst,TQObject *parent);
+ KWClassicSerialDataSource(TDEInstance *inst,TQObject *parent);
~KWClassicSerialDataSource();
virtual void save( TQDomDocument &doc,TQDomElement&);
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index 1886207c..74fc211c 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
@@ -33,7 +33,7 @@
#include "KWMailMergeKABC.h"
#include "KWMailMergeKABCConfig.h"
-KWMailMergeKABC::KWMailMergeKABC( KInstance *inst, TQObject *parent )
+KWMailMergeKABC::KWMailMergeKABC( TDEInstance *inst, TQObject *parent )
: KWMailMergeDataSource( inst, parent )
{
_addressBook = KABC::StdAddressBook::self();
@@ -537,7 +537,7 @@ TQStringList KWMailMergeKABC::singleRecords() const
extern "C"
{
- KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( KInstance *inst, TQObject *parent )
+ KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( TDEInstance *inst, TQObject *parent )
{
return new KWMailMergeKABC( inst, parent );
}
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.h b/kword/mailmerge/kabc/KWMailMergeKABC.h
index 818a06e8..32a078a6 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.h
@@ -36,7 +36,7 @@ class KWMailMergeKABC: public KWMailMergeDataSource
public:
- KWMailMergeKABC( KInstance *inst, TQObject *parent );
+ KWMailMergeKABC( TDEInstance *inst, TQObject *parent );
~KWMailMergeKABC();
/**
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index 025e9a4e..63a02876 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
@@ -29,7 +29,7 @@
using namespace KSpread;
-KWMailMergeKSpread::KWMailMergeKSpread( KInstance *instance, TQObject *parent )
+KWMailMergeKSpread::KWMailMergeKSpread( TDEInstance *instance, TQObject *parent )
: KWMailMergeDataSource( instance, parent ), _spreadSheetNumber( 1 )
{
}
@@ -202,7 +202,7 @@ TQString KWMailMergeKSpread::cellText( const Cell *cell ) const
extern "C"
{
- KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( KInstance *instance, TQObject *parent )
+ KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( TDEInstance *instance, TQObject *parent )
{
return new KWMailMergeKSpread( instance, parent );
}
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.h b/kword/mailmerge/kspread/kwmailmerge_kspread.h
index c093cb71..8f2a4f97 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.h
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.h
@@ -35,7 +35,7 @@ class KWMailMergeKSpread: public KWMailMergeDataSource
public:
- KWMailMergeKSpread( KInstance *inst, TQObject *parent );
+ KWMailMergeKSpread( TDEInstance *inst, TQObject *parent );
~KWMailMergeKSpread();
/**
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index 466ac182..a30340ad 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -41,7 +41,7 @@
*
******************************************************************/
-KWQtSqlPowerSerialDataSource::KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *parent)
+KWQtSqlPowerSerialDataSource::KWQtSqlPowerSerialDataSource(TDEInstance *inst,TQObject *parent)
: KWQtSqlSerialDataSourceBase(inst,parent),myquery(0)
{
port=i18n("default");
@@ -249,7 +249,7 @@ KWQtSqlPowerMailMergeEditor::~KWQtSqlPowerMailMergeEditor(){;}
extern "C" {
- KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb_power(KInstance *inst,TQObject *parent)
+ KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb_power(TDEInstance *inst,TQObject *parent)
{
return new KWQtSqlPowerSerialDataSource(inst,parent);
}
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
index 4df94a07..c9b24ac3 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
@@ -47,7 +47,7 @@ class KWQtSqlPowerSerialDataSource: public KWQtSqlSerialDataSourceBase
Q_OBJECT
//
public:
- KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *parent);
+ KWQtSqlPowerSerialDataSource(TDEInstance *inst,TQObject *parent);
~KWQtSqlPowerSerialDataSource();
virtual void save( TQDomDocument &doc,TQDomElement&);
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 14c3640e..2b3f711d 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -38,7 +38,7 @@
*
******************************************************************/
-KWQtSqlSerialDataSource::KWQtSqlSerialDataSource(KInstance *inst,TQObject *parent)
+KWQtSqlSerialDataSource::KWQtSqlSerialDataSource(TDEInstance *inst,TQObject *parent)
: KWQtSqlSerialDataSourceBase(inst,parent)
{
myquery=0;
@@ -211,7 +211,7 @@ void KWQtSqlDataSourceEditor::editFilter()
}
extern "C" {
- KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(KInstance *inst,TQObject *parent)
+ KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(TDEInstance *inst,TQObject *parent)
{
return new KWQtSqlSerialDataSource(inst,parent);
}
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
index 16a9051f..704ae05e 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
@@ -36,7 +36,7 @@
class KWQtSqlSerialDataSource: public KWQtSqlSerialDataSourceBase
{
public:
- KWQtSqlSerialDataSource(KInstance *inst,TQObject *parent);
+ KWQtSqlSerialDataSource(TDEInstance *inst,TQObject *parent);
~KWQtSqlSerialDataSource();
virtual void save( TQDomDocument &doc,TQDomElement&);
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
index 9a333a8d..41e971be 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
@@ -46,7 +46,7 @@
int KWQtSqlSerialDataSourceBase::connectionId=0;
-KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent)
+KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(TDEInstance *inst,TQObject *parent)
: KWMailMergeDataSource(inst,parent)
{
DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").arg(connectionId++);
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
index 388e9751..120ce209 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
@@ -41,7 +41,7 @@ class KWQtSqlSerialDataSourceBase: public KWMailMergeDataSource
//
K_DCOP
public:
- KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent);
+ KWQtSqlSerialDataSourceBase(TDEInstance *inst,TQObject *parent);
~KWQtSqlSerialDataSourceBase();
virtual bool showConfigDialog(TQWidget *par,int action);
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-07 20:24:22 +0000