Rename KInstance and KAboutData to avoid conflicts with KDE4

remotes/gitea/gg-tdeadmin-kcron
Timothy Pearson 12 years ago
parent 7b8d362cad
commit f27c6b9285

@ -19,8 +19,8 @@ int main(int argc, char* argv[])
{
static const char description[] = I18N_NOOP("TDE Task Scheduler");
KAboutData aboutData("kcron", I18N_NOOP("KCron"),
VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData("kcron", I18N_NOOP("KCron"),
VERSION, description, TDEAboutData::License_GPL,
"(c) 1999-2000, Gary Meyer");
aboutData.addAuthor("Gary Meyer", 0, "gary@meyer.net");

@ -45,8 +45,8 @@ void error_handler(int err_sig);
int main( int argc, char** argv )
{
KAboutData aboutData( "kdat", I18N_NOOP("KDat"),
KDAT_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kdat", I18N_NOOP("KDat"),
KDAT_VERSION, description, TDEAboutData::License_GPL,
"(c) 1999-2000, Sean Vyain; 2001-2002 Lawrence Widman");
/* 2002-01-28 LEW: so we can dump core if we want to */

@ -79,10 +79,10 @@ TQString KNetworkConfModule::rootOnlyMsg() const
return "Changing the network configuration requires root access";
}
KAboutData* KNetworkConfModule::aboutData() const
TDEAboutData* KNetworkConfModule::aboutData() const
{
/*KAboutData* data = new KAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"),
VERSION, description, KAboutData::License_GPL,
/*TDEAboutData* data = new TDEAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"),
VERSION, description, TDEAboutData::License_GPL,
"(c) 2003, Juan Luis Baptiste", 0, "http://www.merlinux.org/knetworkconf/", "jbaptiste@merlinux.org");
data->addAuthor("Juan Luis Baptiste",I18N_NOOP("Lead Developer"),
"jbaptiste@merlinux.org");
@ -91,8 +91,8 @@ KAboutData* KNetworkConfModule::aboutData() const
return data; // Memory leak, oh well...*/
KAboutData *aboutData = new KAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"),
VERSION, description, KAboutData::License_GPL,
TDEAboutData *aboutData = new TDEAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"),
VERSION, description, TDEAboutData::License_GPL,
"(c) 2003 - 2005, Juan Luis Baptiste", 0, "http://www.merlinux.org/knetworkconf/", "juan.baptiste@kdemail.net");
aboutData->addAuthor("Juan Luis Baptiste",I18N_NOOP("Lead Developer"),
"juan.baptiste@kdemail.net");

@ -37,7 +37,7 @@ public:
bool useRootOnlyMsg() const;
TQString rootOnlyMsg() const;
KAboutData* aboutData() const;
TDEAboutData* aboutData() const;
TQString quickHelp() const;
private slots:

@ -80,8 +80,8 @@ pkgInterface *kpinterface[kpinterfaceN];
int main(int argc, char **argv)
{
KAboutData aboutData( "kpackage", I18N_NOOP("KPackage"),
VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kpackage", I18N_NOOP("KPackage"),
VERSION, description, TDEAboutData::License_GPL,
// VERSION, description, 0,
"(c) 1999-2001, Toivo Pedaste");
TDECmdLineArgs::init( argc, argv, &aboutData );

@ -27,7 +27,7 @@
#include "ksv_core.h"
const int ksv::runlevelNumber = 7;
KAboutData* ksv::about = 0L;
TDEAboutData* ksv::about = 0L;
bool ksv::getServiceDescription (const TQString& path, TQString& res)
{

@ -17,7 +17,7 @@
class TQPushButton;
class TQStyleSheet;
class KAboutData;
class TDEAboutData;
class KCompletion;
class KSVItem;
@ -44,7 +44,7 @@ namespace ksv
KCompletion* numberCompletion ();
extern const int runlevelNumber;
extern KAboutData* about;
extern TDEAboutData* about;
enum Messages {
RunlevelsReadOnly = 0,

@ -55,9 +55,9 @@ int main( int argc, char **argv ) {
// install own message handler that ignores debug-msg when DEBUG is not defined
tqInstallMsgHandler(myMessageOutput);
KAboutData about("ksysv", I18N_NOOP("SysV-Init Editor"), KSYSV_VERSION_STRING,
TDEAboutData about("ksysv", I18N_NOOP("SysV-Init Editor"), KSYSV_VERSION_STRING,
I18N_NOOP ("Editor for Sys-V like init configurations"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"Copyright (c) 1997-2000, Peter Putzer.",
I18N_NOOP ("Similar to Red Hat's" \
"\"tksysv\", but SysV-Init Editor allows\n" \

@ -40,8 +40,8 @@ KUserGlobals *kug = 0;
int main(int argc, char **argv)
{
KAboutData aboutData("kuser", I18N_NOOP("KUser"),
_KU_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData("kuser", I18N_NOOP("KUser"),
_KU_VERSION, description, TDEAboutData::License_GPL,
"(c) 1997-2000, Denis Perchine\n(c) 2004, Szombathelyi György");
aboutData.addAuthor("Denis Perchine", I18N_NOOP("kuser author"),
"dyp@perchine.com", "http://www.perchine.com/dyp/");

@ -45,8 +45,8 @@ KControl::KControl(TQWidget *parent, const char *name)
if (getuid() != 0) {
m->makeReadOnly();
}
KAboutData *about = new KAboutData(I18N_NOOP("kcmlilo"), I18N_NOOP("LILO Configuration"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmlilo"), I18N_NOOP("LILO Configuration"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2000, Bernhard Rosenkraenzer"));
about->addAuthor("Bernhard \"Bero\" Rosenkraenzer", 0, "bero@redhat.com");
setAboutData(about);

@ -34,7 +34,7 @@
#include <kcmodule.h>
#include "mainwidget.h"
class KAboutData;
class TDEAboutData;
class KControl: public KCModule {
Q_OBJECT

Loading…
Cancel
Save