From 7574a7287e2e121c9d5c91a5f4ea38c5b3ae2a04 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 02:28:57 -0600 Subject: Additional kde to tde renaming --- ksysguard/Makefile.in.temp | 2 +- ksysguard/gui/Makefile.am | 2 +- ksysguard/gui/SensorDisplayLib/ProcessList.cc | 4 ++-- ksysguard/gui/ksgrd/CMakeLists.txt | 2 +- ksysguard/ksysguardd/Irix/ProcessList.c | 2 +- ksysguard/ksysguardd/Linux/ProcessList.c | 8 ++++---- ksysguard/ksysguardd/Makefile.am | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'ksysguard') diff --git a/ksysguard/Makefile.in.temp b/ksysguard/Makefile.in.temp index b8e021dc2..ffe57c12e 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 10c6c6dd0..0ccf4c055 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 c1a60b65e..e0198bbfc 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 5009bfcca..b1ec7c5f8 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 523d87d26..3ef86684a 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 b267c7005..1eba1f6cc 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 485700780..0e6da33ad 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) -- cgit v1.2.3