summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:13:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:13:38 -0600
commitf27c6b92859f7d7c845aae72472a63e4cc61be63 (patch)
tree3469eafe2f7ebc5e24d0f5f0273a8e67f136973d
parent7b8d362cad90c47665dc2f749dd430d9cb9eccb4 (diff)
downloadtdeadmin-f27c6b92859f7d7c845aae72472a63e4cc61be63.tar.gz
tdeadmin-f27c6b92859f7d7c845aae72472a63e4cc61be63.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
-rw-r--r--kcron/main.cpp4
-rw-r--r--kdat/main.cpp4
-rw-r--r--knetworkconf/knetworkconf/knetworkconfmodule.cpp10
-rw-r--r--knetworkconf/knetworkconf/knetworkconfmodule.h2
-rw-r--r--kpackage/main.cpp4
-rw-r--r--ksysv/ksv_core.cpp2
-rw-r--r--ksysv/ksv_core.h4
-rw-r--r--ksysv/main.cpp4
-rw-r--r--kuser/main.cpp4
-rw-r--r--lilo-config/kde/kcontrol.cpp4
-rw-r--r--lilo-config/kde/kcontrol.h2
11 files changed, 22 insertions, 22 deletions
diff --git a/kcron/main.cpp b/kcron/main.cpp
index 627271c..f642710 100644
--- a/kcron/main.cpp
+++ b/kcron/main.cpp
@@ -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");
diff --git a/kdat/main.cpp b/kdat/main.cpp
index 9d4c27a..4b8820b 100644
--- a/kdat/main.cpp
+++ b/kdat/main.cpp
@@ -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 */
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
index 3f67b0c..6fe99f9 100644
--- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
@@ -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");
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.h b/knetworkconf/knetworkconf/knetworkconfmodule.h
index 458abf8..c1f9e49 100644
--- a/knetworkconf/knetworkconf/knetworkconfmodule.h
+++ b/knetworkconf/knetworkconf/knetworkconfmodule.h
@@ -37,7 +37,7 @@ public:
bool useRootOnlyMsg() const;
TQString rootOnlyMsg() const;
- KAboutData* aboutData() const;
+ TDEAboutData* aboutData() const;
TQString quickHelp() const;
private slots:
diff --git a/kpackage/main.cpp b/kpackage/main.cpp
index b5a63ec..d82dcbf 100644
--- a/kpackage/main.cpp
+++ b/kpackage/main.cpp
@@ -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 );
diff --git a/ksysv/ksv_core.cpp b/ksysv/ksv_core.cpp
index b71ab78..bc9c2d8 100644
--- a/ksysv/ksv_core.cpp
+++ b/ksysv/ksv_core.cpp
@@ -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)
{
diff --git a/ksysv/ksv_core.h b/ksysv/ksv_core.h
index d0b9563..8472fcc 100644
--- a/ksysv/ksv_core.h
+++ b/ksysv/ksv_core.h
@@ -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,
diff --git a/ksysv/main.cpp b/ksysv/main.cpp
index f42ee15..f268265 100644
--- a/ksysv/main.cpp
+++ b/ksysv/main.cpp
@@ -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" \
diff --git a/kuser/main.cpp b/kuser/main.cpp
index 316967a..f22e8b4 100644
--- a/kuser/main.cpp
+++ b/kuser/main.cpp
@@ -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/");
diff --git a/lilo-config/kde/kcontrol.cpp b/lilo-config/kde/kcontrol.cpp
index 846edc8..0c38f47 100644
--- a/lilo-config/kde/kcontrol.cpp
+++ b/lilo-config/kde/kcontrol.cpp
@@ -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);
diff --git a/lilo-config/kde/kcontrol.h b/lilo-config/kde/kcontrol.h
index 7a75905..b9c1073 100644
--- a/lilo-config/kde/kcontrol.h
+++ b/lilo-config/kde/kcontrol.h
@@ -34,7 +34,7 @@
#include <kcmodule.h>
#include "mainwidget.h"
-class KAboutData;
+class TDEAboutData;
class KControl: public KCModule {
Q_OBJECT