summaryrefslogtreecommitdiffstats
path: root/ksysguard
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:28:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:28:57 -0600
commit7574a7287e2e121c9d5c91a5f4ea38c5b3ae2a04 (patch)
treeb7c6396f4f7fe78dcd49424bff707e977541de18 /ksysguard
parent66c0fa70796c1989a9f3adb0c5c0ad799ade48ca (diff)
downloadtdebase-7574a7287e2e121c9d5c91a5f4ea38c5b3ae2a04.tar.gz
tdebase-7574a7287e2e121c9d5c91a5f4ea38c5b3ae2a04.zip
Additional kde to tde renaming
Diffstat (limited to 'ksysguard')
-rw-r--r--ksysguard/Makefile.in.temp2
-rw-r--r--ksysguard/gui/Makefile.am2
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessList.cc4
-rw-r--r--ksysguard/gui/ksgrd/CMakeLists.txt2
-rw-r--r--ksysguard/ksysguardd/Irix/ProcessList.c2
-rw-r--r--ksysguard/ksysguardd/Linux/ProcessList.c8
-rw-r--r--ksysguard/ksysguardd/Makefile.am2
7 files changed, 11 insertions, 11 deletions
diff --git a/ksysguard/Makefile.in.temp b/ksysguard/Makefile.in.temp
index b8e021dc..ffe57c12 100644
--- a/ksysguard/Makefile.in.temp
+++ b/ksysguard/Makefile.in.temp
@@ -39,7 +39,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
APPSDIR = $(kde_appsdir)/Utilities
INCLUDES = $(all_includes)
TARGET = khexdit
-LIBS = -lkfm -lkdeui -lkdecore -lqt -lX11 -lXext $(LIBSOCKET)
+LIBS = -lkfm -ltdeui -ltdecore -lqt -lX11 -lXext $(LIBSOCKET)
LDFLAGS += $(all_libraries)
# rules to make .o files
diff --git a/ksysguard/gui/Makefile.am b/ksysguard/gui/Makefile.am
index 10c6c6dd..0ccf4c05 100644
--- a/ksysguard/gui/Makefile.am
+++ b/ksysguard/gui/Makefile.am
@@ -32,7 +32,7 @@ ksysguard_LDADD = \
ksgrd/libksgrd.la \
SensorDisplayLib/libsensordisplays.la \
$(LIB_KDEUI) $(LIB_KIO) $(LIB_KDNSSD)
-ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kpm_SOURCES = kpm.c
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
index c1a60b65..e0198bbf 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
@@ -180,9 +180,9 @@ ProcessList::ProcessList(TQWidget *parent, const char* name)
aliases.insert("kcookiejar", new TQString("kdeapp"));
aliases.insert("kde", new TQString("kdeapp"));
aliases.insert("kded", new TQString("kdeapp"));
- aliases.insert("kdeinit", new TQString("kdeapp"));
+ aliases.insert("tdeinit", new TQString("kdeapp"));
aliases.insert("kdesktop", new TQString("kdeapp"));
- aliases.insert("kdesud", new TQString("kdeapp"));
+ aliases.insert("tdesud", new TQString("kdeapp"));
aliases.insert("kdm", new TQString("kdeapp"));
aliases.insert("khotkeys", new TQString("kdeapp"));
aliases.insert("kio_file", new TQString("kdeapp"));
diff --git a/ksysguard/gui/ksgrd/CMakeLists.txt b/ksysguard/gui/ksgrd/CMakeLists.txt
index 5009bfcc..b1ec7c5f 100644
--- a/ksysguard/gui/ksgrd/CMakeLists.txt
+++ b/ksysguard/gui/ksgrd/CMakeLists.txt
@@ -38,6 +38,6 @@ tde_add_library( ksgrd SHARED AUTOMOC
SensorShellAgent.cc SensorSocketAgent.cc StyleEngine.cc
StyleSettings.cc TimerSettings.cc
VERSION 1.2.0
- LINK kdeui-shared
+ LINK tdeui-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/ksysguard/ksysguardd/Irix/ProcessList.c b/ksysguard/ksysguardd/Irix/ProcessList.c
index 523d87d2..3ef86684 100644
--- a/ksysguard/ksysguardd/Irix/ProcessList.c
+++ b/ksysguard/ksysguardd/Irix/ProcessList.c
@@ -44,7 +44,7 @@
#include "ProcessList.h"
#define BUFSIZE 1024
-#define KDEINITLEN strlen("kdeinit: ")
+#define KDEINITLEN strlen("tdeinit: ")
typedef struct {
int alive; /* for "garbage collection" */
diff --git a/ksysguard/ksysguardd/Linux/ProcessList.c b/ksysguard/ksysguardd/Linux/ProcessList.c
index b267c700..1eba1f6c 100644
--- a/ksysguard/ksysguardd/Linux/ProcessList.c
+++ b/ksysguard/ksysguardd/Linux/ProcessList.c
@@ -40,7 +40,7 @@
#define BUFSIZE 1024
#define TAGSIZE 32
-#define KDEINITLEN strlen( "kdeinit: " )
+#define KDEINITLEN strlen( "tdeinit: " )
static CONTAINER ProcessList = 0;
@@ -287,9 +287,9 @@ static int updateProcess( int pid )
if ( fclose( fd ) )
return -1;
- /* Ugly hack to "fix" program name for kdeinit launched programs. */
- if ( strcmp( ps->name, "kdeinit" ) == 0 &&
- strncmp( ps->cmdline, "kdeinit: ", KDEINITLEN ) == 0 &&
+ /* Ugly hack to "fix" program name for tdeinit launched programs. */
+ if ( strcmp( ps->name, "tdeinit" ) == 0 &&
+ strncmp( ps->cmdline, "tdeinit: ", KDEINITLEN ) == 0 &&
strcmp( ps->cmdline + KDEINITLEN, "Running..." ) != 0 ) {
size_t len;
char* end = strchr( ps->cmdline + KDEINITLEN, ' ' );
diff --git a/ksysguard/ksysguardd/Makefile.am b/ksysguard/ksysguardd/Makefile.am
index 48570078..0e6da33a 100644
--- a/ksysguard/ksysguardd/Makefile.am
+++ b/ksysguard/ksysguardd/Makefile.am
@@ -32,4 +32,4 @@ bin_PROGRAMS = ksysguardd
ksysguardd_SOURCES = Command.c conf.c ksysguardd.c PWUIDCache.c
ksysguardd_LDFLAGS = $(all_libraries)
-ksysguardd_LDADD = $(top_builddir)/ksysguard/ksysguardd/$(UNAME)/libksysguardd.a ../CContLib/libccont.a -lkdefakes_nonpic $(LIBHOSTS) $(LIB_DNSSD) $(LIB_KINFO)
+ksysguardd_LDADD = $(top_builddir)/ksysguard/ksysguardd/$(UNAME)/libksysguardd.a ../CContLib/libccont.a -ltdefakes_nonpic $(LIBHOSTS) $(LIB_DNSSD) $(LIB_KINFO)