diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:13:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:13:38 -0600 |
| commit | f27c6b92859f7d7c845aae72472a63e4cc61be63 (patch) | |
| tree | 3469eafe2f7ebc5e24d0f5f0273a8e67f136973d /ksysv | |
| parent | 7b8d362cad90c47665dc2f749dd430d9cb9eccb4 (diff) | |
| download | tdeadmin-f27c6b92859f7d7c845aae72472a63e4cc61be63.tar.gz tdeadmin-f27c6b92859f7d7c845aae72472a63e4cc61be63.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'ksysv')
| -rw-r--r-- | ksysv/ksv_core.cpp | 2 | ||||
| -rw-r--r-- | ksysv/ksv_core.h | 4 | ||||
| -rw-r--r-- | ksysv/main.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
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" \ |