diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:00:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:00:43 -0600 |
| commit | 2c4a290ae270924340991931a9e0ca793f8e9443 (patch) | |
| tree | 7aa3b953d70dbdd6a5de525cdd7a5f4319ee1dd5 /ksysv | |
| parent | 567923f30f7c0700cb526f26c20b5577bfe2a802 (diff) | |
| download | tdeadmin-2c4a290ae270924340991931a9e0ca793f8e9443.tar.gz tdeadmin-2c4a290ae270924340991931a9e0ca793f8e9443.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'ksysv')
| -rw-r--r-- | ksysv/AUTHORS | 2 | ||||
| -rw-r--r-- | ksysv/TopWidget.cpp | 2 | ||||
| -rw-r--r-- | ksysv/ksv_conf.cpp | 2 | ||||
| -rw-r--r-- | ksysv/ksvconfigwizard.cpp | 2 | ||||
| -rw-r--r-- | ksysv/ksvpathconfig.cpp | 2 | ||||
| -rw-r--r-- | ksysv/leveldb.c | 2 | ||||
| -rw-r--r-- | ksysv/leveldb.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/ksysv/AUTHORS b/ksysv/AUTHORS index a2a59a9..dad4d1f 100644 --- a/ksysv/AUTHORS +++ b/ksysv/AUTHORS @@ -4,7 +4,7 @@ Current Code Main developer: Peter Putzer <putzer@kde.org> -leveldb.{h,c} (from chkconfig): +leveldb.{h,c} (from chtdeconfig): Red Hat Software http://www.redhat.com Previous Versions diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp index 26bea71..4724eb7 100644 --- a/ksysv/TopWidget.cpp +++ b/ksysv/TopWidget.cpp @@ -67,7 +67,7 @@ #include <kstdaccel.h> #include <kedittoolbar.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kaboutdata.h> #include <kcursor.h> diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp index 0b63438..37a24ee 100644 --- a/ksysv/ksv_conf.cpp +++ b/ksysv/ksv_conf.cpp @@ -17,7 +17,7 @@ #include <kglobal.h> #include <kglobalsettings.h> #include <kmainwindow.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "ksv_core.h" #include "ksv_conf.h" diff --git a/ksysv/ksvconfigwizard.cpp b/ksysv/ksvconfigwizard.cpp index a869d46..54450fa 100644 --- a/ksysv/ksvconfigwizard.cpp +++ b/ksysv/ksvconfigwizard.cpp @@ -28,7 +28,7 @@ #include <tqlayout.h> #include <kdialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klineedit.h> #include <tqpushbutton.h> diff --git a/ksysv/ksvpathconfig.cpp b/ksysv/ksvpathconfig.cpp index 5f1193a..8c713d8 100644 --- a/ksysv/ksvpathconfig.cpp +++ b/ksysv/ksvpathconfig.cpp @@ -26,7 +26,7 @@ #include "ksvpathconfig.h" #include <klineedit.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> /* * Constructs a KSVPathConfig which is a child of 'parent', with the diff --git a/ksysv/leveldb.c b/ksysv/leveldb.c index 149cb3b..030e941 100644 --- a/ksysv/leveldb.c +++ b/ksysv/leveldb.c @@ -111,7 +111,7 @@ int readServiceInfo(const char* RUNLEVELS, const char * name, struct service * s while (isspace(*start) && start < end) start++; if (start == end) continue; - if (!strncmp(start, "chkconfig:", 10)) { + if (!strncmp(start, "chtdeconfig:", 10)) { start += 10; while (isspace(*start) && start < end) start++; if (start == end) { diff --git a/ksysv/leveldb.h b/ksysv/leveldb.h index e18d202..ef6dea9 100644 --- a/ksysv/leveldb.h +++ b/ksysv/leveldb.h @@ -34,7 +34,7 @@ struct service { int parseLevels(const char * str, int emptyOk); -/* returns 0 on success, 1 if the service is not chkconfig-able, -1 if an +/* returns 0 on success, 1 if the service is not chtdeconfig-able, -1 if an I/O error occurs (in which case errno can be checked) */ int readServiceInfo(const char* RUNLEVELS, const char* name, struct service * service); int currentRunlevel(void); |