Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/2/head
Timothy Pearson 12 years ago
parent 8ebd99fc2d
commit 28879aa783

@ -30,7 +30,7 @@ void *init_libmalconduit()
// A number of static variables // A number of static variables
KAboutData *MALConduitFactory::fAbout = 0L; TDEAboutData *MALConduitFactory::fAbout = 0L;
const char *MALConduitFactory::fGroup = "MAL-conduit"; const char *MALConduitFactory::fGroup = "MAL-conduit";
const char *MALConduitFactory::fLastSync = "Last MAL Sync"; const char *MALConduitFactory::fLastSync = "Last MAL Sync";
const char *MALConduitFactory::fSyncTime = "Sync Frequency"; const char *MALConduitFactory::fSyncTime = "Sync Frequency";
@ -45,12 +45,12 @@ MALConduitFactory::MALConduitFactory(TQObject *p, const char *n) :
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
fInstance = new KInstance("MALconduit"); fInstance = new TDEInstance("MALconduit");
fAbout = new KAboutData("MALconduit", fAbout = new TDEAboutData("MALconduit",
I18N_NOOP("MAL Synchronization Conduit for KPilot"), I18N_NOOP("MAL Synchronization Conduit for KPilot"),
KPILOT_VERSION, KPILOT_VERSION,
I18N_NOOP("Synchronizes the content from MAL Servers like AvantGo to the Handheld"), I18N_NOOP("Synchronizes the content from MAL Servers like AvantGo to the Handheld"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(C) 2002, Reinhold Kainhofer"); "(C) 2002, Reinhold Kainhofer");
fAbout->addAuthor("Reinhold Kainhofer", fAbout->addAuthor("Reinhold Kainhofer",
I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/"); I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");

@ -9,8 +9,8 @@
#include <klibloader.h> #include <klibloader.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class MALConduitFactory : public KLibFactory class MALConduitFactory : public KLibFactory
{ {
@ -20,7 +20,7 @@ public:
MALConduitFactory(TQObject * = 0L,const char * = 0L); MALConduitFactory(TQObject * = 0L,const char * = 0L);
virtual ~MALConduitFactory(); virtual ~MALConduitFactory();
static KAboutData *about() { return fAbout; } ; static TDEAboutData *about() { return fAbout; } ;
static const char *lastSync() { return fLastSync; }; static const char *lastSync() { return fLastSync; };
static const char *syncTime() {return fSyncTime;}; static const char *syncTime() {return fSyncTime;};
static const char *proxyType() {return fProxyType;}; static const char *proxyType() {return fProxyType;};
@ -39,8 +39,8 @@ protected:
const char* classname = "TQObject", const char* classname = "TQObject",
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
private: private:
KInstance *fInstance; TDEInstance *fInstance;
static KAboutData *fAbout; static TDEAboutData *fAbout;
// KConfig entry keys. // KConfig entry keys.
static const char *fGroup; static const char *fGroup;
static const char *fLastSync, *fSyncTime, static const char *fLastSync, *fSyncTime,

@ -42,13 +42,13 @@
static KAboutData *createAbout() static TDEAboutData *createAbout()
{ {
KAboutData *fAbout = new KAboutData("abbrowserconduit", TDEAboutData *fAbout = new TDEAboutData("abbrowserconduit",
I18N_NOOP("Abbrowser Conduit for KPilot"), I18N_NOOP("Abbrowser Conduit for KPilot"),
KPILOT_VERSION, KPILOT_VERSION,
I18N_NOOP("Configures the Abbrowser Conduit for KPilot"), I18N_NOOP("Configures the Abbrowser Conduit for KPilot"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(C) 2001, Dan Pilone\n(C) 2002-2003, Reinhold Kainhofer"); "(C) 2001, Dan Pilone\n(C) 2002-2003, Reinhold Kainhofer");
fAbout->addAuthor("Greg Stern", fAbout->addAuthor("Greg Stern",
I18N_NOOP("Primary Author")); I18N_NOOP("Primary Author"));

@ -33,7 +33,7 @@
#include "plugin.h" #include "plugin.h"
class AbbrowserWidget; class AbbrowserWidget;
class KAboutData; class TDEAboutData;
class AbbrowserWidgetSetup : public ConduitConfigBase class AbbrowserWidgetSetup : public ConduitConfigBase
{ {
@ -45,7 +45,7 @@ public:
static ConduitConfigBase *create(TQWidget *,const char *); static ConduitConfigBase *create(TQWidget *,const char *);
private: private:
AbbrowserWidget *fConfigWidget; AbbrowserWidget *fConfigWidget;
KAboutData *fAbout; TDEAboutData *fAbout;
} ; } ;
#endif #endif

@ -47,7 +47,7 @@ extern "C" {
// A number of static variables // A number of static variables
KAboutData * DOCConduitFactory::fAbout = 0L; TDEAboutData * DOCConduitFactory::fAbout = 0L;
const char *DOCConduitFactory::dbDOCtype = "TEXt"; const char *DOCConduitFactory::dbDOCtype = "TEXt";
const char *DOCConduitFactory::dbDOCcreator = "REAd"; const char *DOCConduitFactory::dbDOCcreator = "REAd";
@ -58,11 +58,11 @@ DOCConduitFactory::DOCConduitFactory(TQObject * p, const char *n):
KLibFactory(p, n) KLibFactory(p, n)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
fInstance = new KInstance("docconduit"); fInstance = new TDEInstance("docconduit");
fAbout =new KAboutData("docconduit", fAbout =new TDEAboutData("docconduit",
I18N_NOOP("Palm DOC Conduit for KPilot"), KPILOT_VERSION, I18N_NOOP("Palm DOC Conduit for KPilot"), KPILOT_VERSION,
I18N_NOOP("Configures the DOC Conduit for KPilot"), I18N_NOOP("Configures the DOC Conduit for KPilot"),
KAboutData::License_GPL, "(C) 2002, Reinhold Kainhofer"); TDEAboutData::License_GPL, "(C) 2002, Reinhold Kainhofer");
fAbout->addAuthor("Reinhold Kainhofer", fAbout->addAuthor("Reinhold Kainhofer",
I18N_NOOP("Maintainer"), "reinhold@kainhofer.com", I18N_NOOP("Maintainer"), "reinhold@kainhofer.com",

@ -31,8 +31,8 @@
#include <klibloader.h> #include <klibloader.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class DOCConduitFactory:public KLibFactory class DOCConduitFactory:public KLibFactory
@ -44,7 +44,7 @@ public:
DOCConduitFactory(TQObject * = 0L, const char * = 0L); DOCConduitFactory(TQObject * = 0L, const char * = 0L);
virtual ~ DOCConduitFactory(); virtual ~ DOCConduitFactory();
static KAboutData *about() { static TDEAboutData *about() {
return fAbout; return fAbout;
}; };
@ -61,8 +61,8 @@ protected:
const TQStringList & args = TQStringList()); const TQStringList & args = TQStringList());
private: private:
KInstance * fInstance; TDEInstance * fInstance;
static KAboutData *fAbout; static TDEAboutData *fAbout;
}; };

@ -39,9 +39,9 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1", TDEAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1",
"KPalmDOC - KDE Converter for PalmDOC texts.\n\n", "KPalmDOC - KDE Converter for PalmDOC texts.\n\n",
KAboutData::License_GPL, "(c) 2003, Reinhold Kainhofer"); TDEAboutData::License_GPL, "(c) 2003, Reinhold Kainhofer");
about.addAuthor("Reinhold Kainhofer", I18N_NOOP("Main Developer"), about.addAuthor("Reinhold Kainhofer", I18N_NOOP("Main Developer"),
"reinhold@kainhofer.com", "http://reinhold.kainhofer.com/Linux/"); "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/Linux/");
about.addCredit("Adriaan de Groot", I18N_NOOP("Maintainer of KPilot"), about.addCredit("Adriaan de Groot", I18N_NOOP("Maintainer of KPilot"),

@ -55,19 +55,19 @@ void *init_conduit_knotes()
} }
/* static */ KAboutData *KNotesConduitFactory::fAbout = 0L; /* static */ TDEAboutData *KNotesConduitFactory::fAbout = 0L;
KNotesConduitFactory::KNotesConduitFactory(TQObject *p, const char *n) : KNotesConduitFactory::KNotesConduitFactory(TQObject *p, const char *n) :
KLibFactory(p,n) KLibFactory(p,n)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
fInstance = new KInstance("knotesconduit"); fInstance = new TDEInstance("knotesconduit");
fAbout = new KAboutData("knotesconduit", fAbout = new TDEAboutData("knotesconduit",
I18N_NOOP("KNotes Conduit for KPilot"), I18N_NOOP("KNotes Conduit for KPilot"),
KPILOT_VERSION, KPILOT_VERSION,
I18N_NOOP("Configures the KNotes Conduit for KPilot"), I18N_NOOP("Configures the KNotes Conduit for KPilot"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(C) 2001, Adriaan de Groot"); "(C) 2001, Adriaan de Groot");
fAbout->addAuthor("Adriaan de Groot", fAbout->addAuthor("Adriaan de Groot",
I18N_NOOP("Primary Author"), I18N_NOOP("Primary Author"),

@ -31,8 +31,8 @@
#include <klibloader.h> #include <klibloader.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class KNotesConduitFactory : public KLibFactory class KNotesConduitFactory : public KLibFactory
{ {
@ -43,7 +43,7 @@ public:
KNotesConduitFactory(TQObject * = 0L,const char * = 0L); KNotesConduitFactory(TQObject * = 0L,const char * = 0L);
virtual ~KNotesConduitFactory(); virtual ~KNotesConduitFactory();
static KAboutData *about() { return fAbout; } ; static TDEAboutData *about() { return fAbout; } ;
// The KNotes instance, unlike previous conduits (alphabetically) // The KNotes instance, unlike previous conduits (alphabetically)
// has const char * const members. The extra const prevents people // has const char * const members. The extra const prevents people
@ -56,8 +56,8 @@ protected:
const char* classname = TQOBJECT_OBJECT_NAME_STRING, const char* classname = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
private: private:
KInstance *fInstance; TDEInstance *fInstance;
static KAboutData *fAbout; static TDEAboutData *fAbout;
} ; } ;
extern "C" extern "C"

@ -58,19 +58,19 @@ unsigned long version_conduit_mal = Pilot::PLUGIN_API;
// A number of static variables // A number of static variables
// //
KAboutData *MALConduitFactory::fAbout = 0L; TDEAboutData *MALConduitFactory::fAbout = 0L;
MALConduitFactory::MALConduitFactory(TQObject *p, const char *n) : MALConduitFactory::MALConduitFactory(TQObject *p, const char *n) :
KLibFactory(p,n) KLibFactory(p,n)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
fInstance = new KInstance("MALconduit"); fInstance = new TDEInstance("MALconduit");
fAbout = new KAboutData("MALconduit", fAbout = new TDEAboutData("MALconduit",
I18N_NOOP("MAL Synchronization Conduit for KPilot"), I18N_NOOP("MAL Synchronization Conduit for KPilot"),
KPILOT_VERSION, KPILOT_VERSION,
I18N_NOOP("Synchronizes the content from MAL Servers like AvantGo to the Handheld"), I18N_NOOP("Synchronizes the content from MAL Servers like AvantGo to the Handheld"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(C) 2002, Reinhold Kainhofer"); "(C) 2002, Reinhold Kainhofer");
fAbout->addAuthor("Reinhold Kainhofer", fAbout->addAuthor("Reinhold Kainhofer",
I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/"); I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");

@ -34,8 +34,8 @@
#include <klibloader.h> #include <klibloader.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class MALConduitFactory : public KLibFactory class MALConduitFactory : public KLibFactory
{ {
@ -46,7 +46,7 @@ public:
MALConduitFactory(TQObject * = 0L,const char * = 0L); MALConduitFactory(TQObject * = 0L,const char * = 0L);
virtual ~MALConduitFactory(); virtual ~MALConduitFactory();
static KAboutData *about() { return fAbout; } ; static TDEAboutData *about() { return fAbout; } ;
protected: protected:
virtual TQObject* createObject( TQObject* parent = 0, virtual TQObject* createObject( TQObject* parent = 0,
@ -54,8 +54,8 @@ protected:
const char* classname = TQOBJECT_OBJECT_NAME_STRING, const char* classname = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
private: private:
KInstance *fInstance; TDEInstance *fInstance;
static KAboutData *fAbout; static TDEAboutData *fAbout;
} ; } ;
extern "C" extern "C"

@ -59,11 +59,11 @@ MemofileConduitConfig::MemofileConduitConfig(TQWidget *p, const char *n) :
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
fConduitName = i18n("Memofile"); fConduitName = i18n("Memofile");
KAboutData *about = new KAboutData("MemofileConduit", TDEAboutData *about = new TDEAboutData("MemofileConduit",
I18N_NOOP("Memofile Conduit for KPilot"), I18N_NOOP("Memofile Conduit for KPilot"),
KPILOT_VERSION, KPILOT_VERSION,
I18N_NOOP("Configures the Memofile Conduit for KPilot"), I18N_NOOP("Configures the Memofile Conduit for KPilot"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(C) 2004, Jason 'vanRijn' Kasper"); "(C) 2004, Jason 'vanRijn' Kasper");
about->addAuthor("Jason 'vanRijn' Kasper", about->addAuthor("Jason 'vanRijn' Kasper",
I18N_NOOP("Primary Author"), I18N_NOOP("Primary Author"),

@ -59,15 +59,15 @@ protected:
NotepadWidget *fConfigWidget; NotepadWidget *fConfigWidget;
} ; } ;
static KAboutData *createAbout() static TDEAboutData *createAbout()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
KAboutData *fAbout = new KAboutData("NotepadConduit", TDEAboutData *fAbout = new TDEAboutData("NotepadConduit",
I18N_NOOP("Saves notepads to png files"), I18N_NOOP("Saves notepads to png files"),
KPILOT_VERSION, KPILOT_VERSION,
I18N_NOOP("Configures the Notepad Conduit for KPilot"), I18N_NOOP("Configures the Notepad Conduit for KPilot"),
KAboutData::License_LGPL, TDEAboutData::License_LGPL,
"(C) 2004, Joern Ahrens"); "(C) 2004, Joern Ahrens");
fAbout->addAuthor("Joern Ahrens", fAbout->addAuthor("Joern Ahrens",
I18N_NOOP("Primary Author"), I18N_NOOP("Primary Author"),

@ -52,7 +52,7 @@ public:
virtual void load(); virtual void load();
protected: protected:
NullWidget *fConfigWidget; NullWidget *fConfigWidget;
KAboutData *fAbout; TDEAboutData *fAbout;
} ; } ;
NullConduitConfig::NullConduitConfig(TQWidget *p, const char *n) : NullConduitConfig::NullConduitConfig(TQWidget *p, const char *n) :
@ -61,11 +61,11 @@ NullConduitConfig::NullConduitConfig(TQWidget *p, const char *n) :
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
fConduitName = i18n("Null"); fConduitName = i18n("Null");
fAbout = new KAboutData("nullConduit", fAbout = new TDEAboutData("nullConduit",
I18N_NOOP("Null Conduit for KPilot"), I18N_NOOP("Null Conduit for KPilot"),
KPILOT_VERSION, KPILOT_VERSION,
I18N_NOOP("Configures the Null Conduit for KPilot"), I18N_NOOP("Configures the Null Conduit for KPilot"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(C) 2001, Adriaan de Groot"); "(C) 2001, Adriaan de Groot");
fAbout->addAuthor("Adriaan de Groot", fAbout->addAuthor("Adriaan de Groot",
I18N_NOOP("Primary Author"), I18N_NOOP("Primary Author"),

@ -64,11 +64,11 @@ PopMailWidgetConfig::PopMailWidgetConfig(TQWidget *p,const char *n) :
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
fConduitName = i18n("KMail"); fConduitName = i18n("KMail");
KAboutData *fAbout = new KAboutData("popmailConduit", TDEAboutData *fAbout = new TDEAboutData("popmailConduit",
I18N_NOOP("Mail Conduit for KPilot"), I18N_NOOP("Mail Conduit for KPilot"),
KPILOT_VERSION, KPILOT_VERSION,
I18N_NOOP("Configures the Mail Conduit for KPilot"), I18N_NOOP("Configures the Mail Conduit for KPilot"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(C) 2001, Dan Pilone, Michael Kropfberger, Adriaan de Groot"); "(C) 2001, Dan Pilone, Michael Kropfberger, Adriaan de Groot");
fAbout->addAuthor("Adriaan de Groot", fAbout->addAuthor("Adriaan de Groot",
I18N_NOOP("Maintainer"), I18N_NOOP("Maintainer"),

@ -53,7 +53,7 @@ public:
virtual void load(); virtual void load();
protected: protected:
RecordWidget *fConfigWidget; RecordWidget *fConfigWidget;
KAboutData *fAbout; TDEAboutData *fAbout;
} ; } ;
ConduitConfig::ConduitConfig(TQWidget *p, const char *n) : ConduitConfig::ConduitConfig(TQWidget *p, const char *n) :
@ -62,11 +62,11 @@ ConduitConfig::ConduitConfig(TQWidget *p, const char *n) :
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
fConduitName = i18n("Record Conduit"); fConduitName = i18n("Record Conduit");
fAbout = new KAboutData("recordConduit", fAbout = new TDEAboutData("recordConduit",
I18N_NOOP("Record Conduit for KPilot"), I18N_NOOP("Record Conduit for KPilot"),
KPILOT_VERSION, KPILOT_VERSION,
I18N_NOOP("Configures the Record Conduit for KPilot"), I18N_NOOP("Configures the Record Conduit for KPilot"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(C) 2005, Adriaan de Groot"); "(C) 2005, Adriaan de Groot");
fAbout->addAuthor("Adriaan de Groot", fAbout->addAuthor("Adriaan de Groot",
I18N_NOOP("Primary Author"), I18N_NOOP("Primary Author"),

@ -91,11 +91,11 @@ SysInfoWidgetConfig::SysInfoWidgetConfig(TQWidget *w, const char *n) :
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
KAboutData *fAbout = new KAboutData("SysInfoConduit", TDEAboutData *fAbout = new TDEAboutData("SysInfoConduit",
I18N_NOOP("KPilot System Information conduit"), I18N_NOOP("KPilot System Information conduit"),
KPILOT_VERSION, KPILOT_VERSION,
I18N_NOOP("Retrieves System, Hardware, and User Info from the Handheld and stores them to a file."), I18N_NOOP("Retrieves System, Hardware, and User Info from the Handheld and stores them to a file."),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(C) 2003, Reinhold Kainhofer"); "(C) 2003, Reinhold Kainhofer");
fAbout->addAuthor("Reinhold Kainhofer", fAbout->addAuthor("Reinhold Kainhofer",
I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/"); I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");

@ -42,13 +42,13 @@
static KAboutData *createAbout() static TDEAboutData *createAbout()
{ {
KAboutData *fAbout = new KAboutData("Timeconduit", TDEAboutData *fAbout = new TDEAboutData("Timeconduit",
I18N_NOOP("Time Synchronization Conduit for KPilot"), I18N_NOOP("Time Synchronization Conduit for KPilot"),
KPILOT_VERSION, KPILOT_VERSION,
I18N_NOOP("Synchronizes the Time on the Handheld and the PC"), I18N_NOOP("Synchronizes the Time on the Handheld and the PC"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(C) 2002, Reinhold Kainhofer"); "(C) 2002, Reinhold Kainhofer");
fAbout->addAuthor("Reinhold Kainhofer", fAbout->addAuthor("Reinhold Kainhofer",
I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/"); I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");

@ -32,7 +32,7 @@
#include "plugin.h" #include "plugin.h"
class TimeWidget; class TimeWidget;
class KAboutData; class TDEAboutData;
class TimeWidgetConfig : public ConduitConfigBase class TimeWidgetConfig : public ConduitConfigBase
{ {
@ -45,7 +45,7 @@ public:
static ConduitConfigBase *create(TQWidget *,const char *); static ConduitConfigBase *create(TQWidget *,const char *);
protected: protected:
TimeWidget *fConfigWidget; TimeWidget *fConfigWidget;
KAboutData *fAbout; TDEAboutData *fAbout;
} ; } ;
#endif #endif

@ -43,11 +43,11 @@ ToDoWidgetSetup::ToDoWidgetSetup(TQWidget *w, const char *n) :
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
fConduitName = i18n("To-do"); fConduitName = i18n("To-do");
KAboutData *fAbout = new KAboutData("todoConduit", TDEAboutData *fAbout = new TDEAboutData("todoConduit",
I18N_NOOP("To-do Conduit for KPilot"), I18N_NOOP("To-do Conduit for KPilot"),
KPILOT_VERSION, KPILOT_VERSION,
I18N_NOOP("Configures the To-do Conduit for KPilot"), I18N_NOOP("Configures the To-do Conduit for KPilot"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(C) 2001, Adriaan de Groot\n(C) 2002-2003, Reinhold Kainhofer"); "(C) 2001, Adriaan de Groot\n(C) 2002-2003, Reinhold Kainhofer");
fAbout->addAuthor("Dan Pilone", fAbout->addAuthor("Dan Pilone",
I18N_NOOP("Original Author")); I18N_NOOP("Original Author"));

@ -40,11 +40,11 @@
VCalWidgetSetup::VCalWidgetSetup(TQWidget *w, const char *n) : VCalWidgetSetup::VCalWidgetSetup(TQWidget *w, const char *n) :
VCalWidgetSetupBase(w,n) VCalWidgetSetupBase(w,n)
{ {
KAboutData *fAbout = new KAboutData("vcalConduit", TDEAboutData *fAbout = new TDEAboutData("vcalConduit",
I18N_NOOP("VCal Conduit for KPilot"), I18N_NOOP("VCal Conduit for KPilot"),
KPILOT_VERSION, KPILOT_VERSION,
I18N_NOOP("Configures the VCal Conduit for KPilot"), I18N_NOOP("Configures the VCal Conduit for KPilot"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(C) 2001, Adriaan de Groot\n(C) 2002-2003, Reinhold Kainhofer"); "(C) 2001, Adriaan de Groot\n(C) 2002-2003, Reinhold Kainhofer");
fAbout->addAuthor("Adriaan de Groot", fAbout->addAuthor("Adriaan de Groot",
I18N_NOOP("Maintainer"), I18N_NOOP("Maintainer"),

@ -1012,10 +1012,10 @@ int main(int argc, char **argv)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
KAboutData about("kpilot", I18N_NOOP("KPilot"), TDEAboutData about("kpilot", I18N_NOOP("KPilot"),
KPILOT_VERSION, KPILOT_VERSION,
"KPilot - HotSync software for TDE\n\n", "KPilot - HotSync software for TDE\n\n",
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(c) 1998-2000,2001, Dan Pilone (c) 2000-2006, Adriaan de Groot", "(c) 1998-2000,2001, Dan Pilone (c) 2000-2006, Adriaan de Groot",
0L, 0L,
"http://www.kpilot.org/" "http://www.kpilot.org/"

@ -343,11 +343,11 @@ int main(int argc, char **argv)
debug_level = 1; debug_level = 1;
#endif #endif
FUNCTIONSETUP; FUNCTIONSETUP;
KAboutData about("kpilotTest", TDEAboutData about("kpilotTest",
I18N_NOOP("KPilotTest"), I18N_NOOP("KPilotTest"),
KPILOT_VERSION, KPILOT_VERSION,
"KPilot Tester", "KPilot Tester",
KAboutData::License_GPL, "(C) 2001-2004, Adriaan de Groot"); TDEAboutData::License_GPL, "(C) 2001-2004, Adriaan de Groot");
about.addAuthor("Adriaan de Groot", about.addAuthor("Adriaan de Groot",
I18N_NOOP("KPilot Maintainer"), I18N_NOOP("KPilot Maintainer"),
"groot@kde.org", "http://www.kpilot.org/"); "groot@kde.org", "http://www.kpilot.org/");

@ -75,7 +75,7 @@
#include "pilotDaemon.moc" #include "pilotDaemon.moc"
static KAboutData *aboutData = 0L; static TDEAboutData *aboutData = 0L;
PilotDaemonTray::PilotDaemonTray(PilotDaemon * p) : PilotDaemonTray::PilotDaemonTray(PilotDaemon * p) :
KSystemTray(0, "pilotDaemon"), KSystemTray(0, "pilotDaemon"),
@ -1307,11 +1307,11 @@ int main(int argc, char **argv)
KLocale::setMainCatalogue("kpilot"); KLocale::setMainCatalogue("kpilot");
KAboutData about("kpilotDaemon", TDEAboutData about("kpilotDaemon",
I18N_NOOP("KPilot Daemon"), I18N_NOOP("KPilot Daemon"),
KPILOT_VERSION, KPILOT_VERSION,
"KPilot - HotSync software for TDE\n\n", "KPilot - HotSync software for TDE\n\n",
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(c) 1998-2000,2001, Dan Pilone (c) 2000-2004, Adriaan de Groot", "(c) 1998-2000,2001, Dan Pilone (c) 2000-2004, Adriaan de Groot",
0L, 0L,
"http://www.kpilot.org/" "http://www.kpilot.org/"

@ -108,7 +108,7 @@ ConduitConfigBase::~ConduitConfigBase()
return true; return true;
} }
TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, TDEAboutData *ad)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
@ -117,7 +117,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
TQString s; TQString s;
TQLabel *text; TQLabel *text;
KIconLoader *l = KGlobal::iconLoader(); KIconLoader *l = KGlobal::iconLoader();
const KAboutData *p = ad ? ad : KGlobal::instance()->aboutData(); const TDEAboutData *p = ad ? ad : KGlobal::instance()->aboutData();
TQGridLayout *grid = new TQGridLayout(w, 5, 4, SPACING); TQGridLayout *grid = new TQGridLayout(w, 5, 4, SPACING);
@ -251,7 +251,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
} }
/* static */ void ConduitConfigBase::addAboutPage(TQTabWidget *tw, /* static */ void ConduitConfigBase::addAboutPage(TQTabWidget *tw,
KAboutData *ad) TDEAboutData *ad)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;

@ -43,7 +43,7 @@
class TQTabWidget; class TQTabWidget;
class KAboutData; class TDEAboutData;
class KLibrary; class KLibrary;
class PilotDatabase; class PilotDatabase;
@ -137,11 +137,11 @@ public:
* "About". * "About".
* *
* @param w The tab widget to which the about page is added. * @param w The tab widget to which the about page is added.
* @param data The KAboutData that is used. * @param data The TDEAboutData that is used.
* *
*/ */
static void addAboutPage(TQTabWidget *w, static void addAboutPage(TQTabWidget *w,
KAboutData *data=0L); TDEAboutData *data=0L);
/** /**
* This creates the actual about widget. Again, public & static so * This creates the actual about widget. Again, public & static so
@ -153,9 +153,9 @@ public:
* anywhere. Copied from KAboutDialog, mostly. * anywhere. Copied from KAboutDialog, mostly.
* *
* @param parent The widget that holds the about widget. * @param parent The widget that holds the about widget.
* @param data The KAboutData that is used to populate the widget. * @param data The TDEAboutData that is used to populate the widget.
*/ */
static TQWidget *aboutPage(TQWidget *parent, KAboutData *data=0L); static TQWidget *aboutPage(TQWidget *parent, TDEAboutData *data=0L);
protected: protected:
/** /**
@ -433,7 +433,7 @@ namespace PluginUtility
* *
* *
* <pre> * <pre>
* static KAboutData *about() { return fAbout; } ; * static TDEAboutData *about() { return fAbout; } ;
* </pre> * </pre>
* *
* *
@ -454,8 +454,8 @@ namespace PluginUtility
* by about() above. * by about() above.
* *
* <pre> * <pre>
* KInstance *fInstance; * TDEInstance *fInstance;
* static KAboutData *fAbout; * static TDEAboutData *fAbout;
* } ; * } ;
* </pre> * </pre>
* *

@ -47,7 +47,7 @@ template <class Widget, class Action> class ConduitFactory : public KLibFactory
public: public:
ConduitFactory(TQObject *parent = 0, const char *name = 0) : ConduitFactory(TQObject *parent = 0, const char *name = 0) :
KLibFactory(parent,name) KLibFactory(parent,name)
{ fInstance = new KInstance(name); } ; { fInstance = new TDEInstance(name); } ;
virtual ~ConduitFactory() virtual ~ConduitFactory()
{ delete fInstance; } ; { delete fInstance; } ;
@ -91,7 +91,7 @@ protected:
return 0L; return 0L;
} }
KInstance *fInstance; TDEInstance *fInstance;
} ; } ;
#endif #endif

@ -60,7 +60,7 @@ int main(int argc, char **argv)
TDEApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KAboutData aboutData("exportdatebook","Emport Date Book","0.1"); TDEAboutData aboutData("exportdatebook","Emport Date Book","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -55,7 +55,7 @@ static const KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData aboutData("importaddresses","Import Address Book","0.1"); TDEAboutData aboutData("importaddresses","Import Address Book","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -57,7 +57,7 @@ int main(int argc, char **argv)
{ {
TDEApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KAboutData aboutData("importdatebook","Import Date Book","0.1"); TDEAboutData aboutData("importdatebook","Import Date Book","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -53,7 +53,7 @@ int main(int argc, char **argv)
TDEApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KAboutData aboutData("mergecalendars","Merge libkcal Calendars","0.1"); TDEAboutData aboutData("mergecalendars","Merge libkcal Calendars","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -51,7 +51,7 @@ int main(int argc, char **argv)
{ {
TDEApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KAboutData aboutData("testaddress","Test Addresses","0.1"); TDEAboutData aboutData("testaddress","Test Addresses","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -156,7 +156,7 @@ int main(int argc, char **argv)
{ {
TDEApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KAboutData aboutData("testcategories","Test Categories","0.1"); TDEAboutData aboutData("testcategories","Test Categories","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -255,7 +255,7 @@ int main(int argc, char **argv)
{ {
TDEApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KAboutData aboutData("testdatabase","Test Databases","0.1"); TDEAboutData aboutData("testdatabase","Test Databases","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -51,7 +51,7 @@ int main(int argc, char **argv)
{ {
TDEApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KAboutData aboutData("testdatebook","Test Date Book","0.1"); TDEAboutData aboutData("testdatebook","Test Date Book","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -287,7 +287,7 @@ bool test7()
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
TDEApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KAboutData aboutData("testidmapper","Test IDMapper","0.1"); TDEAboutData aboutData("testidmapper","Test IDMapper","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
TDEApplication app( false, false ); TDEApplication app( false, false );

Loading…
Cancel
Save