From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:02:02 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- ksysguard/gui/SensorDisplayLib/CMakeLists.txt | 2 +- ksysguard/gui/SensorDisplayLib/ProcessList.cc | 4 ++-- ksysguard/gui/Workspace.cc | 4 ++-- ksysguard/gui/ksgrd/SensorManager.h | 2 +- ksysguard/gui/ksgrd/StyleEngine.cc | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'ksysguard/gui') diff --git a/ksysguard/gui/SensorDisplayLib/CMakeLists.txt b/ksysguard/gui/SensorDisplayLib/CMakeLists.txt index b6cfacf4f..0fe416a0b 100644 --- a/ksysguard/gui/SensorDisplayLib/CMakeLists.txt +++ b/ksysguard/gui/SensorDisplayLib/CMakeLists.txt @@ -36,5 +36,5 @@ tde_add_library( sensordisplays STATIC_PIC AUTOMOC ListViewSettings.cc SignalPlotter.cc ListViewSettingsWidget.ui LogFileSettings.ui MultiMeterSettingsWidget.ui SensorLoggerDlgWidget.ui SensorLoggerSettingsWidget.ui - LINK ksgrd-shared kio-shared + LINK ksgrd-shared tdeio-shared ) diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index 86b5b17ee..5bb68b394 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -186,8 +186,8 @@ ProcessList::ProcessList(TQWidget *parent, const char* name) aliases.insert("tdm", new TQString("kdeapp")); aliases.insert("khotkeys", new TQString("kdeapp")); aliases.insert("kio_file", new TQString("kdeapp")); - aliases.insert("kio_uiserver", new TQString("kdeapp")); - aliases.insert("klauncher", new TQString("kdeapp")); + aliases.insert("tdeio_uiserver", new TQString("kdeapp")); + aliases.insert("tdelauncher", new TQString("kdeapp")); aliases.insert("ksmserver", new TQString("kdeapp")); aliases.insert("kwrapper", new TQString("kdeapp")); aliases.insert("kwrited", new TQString("kdeapp")); diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc index 7271bab8e..123c3f2d4 100644 --- a/ksysguard/gui/Workspace.cc +++ b/ksysguard/gui/Workspace.cc @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/ksysguard/gui/ksgrd/SensorManager.h b/ksysguard/gui/ksgrd/SensorManager.h index a362de351..1e859c638 100644 --- a/ksysguard/gui/ksgrd/SensorManager.h +++ b/ksysguard/gui/ksgrd/SensorManager.h @@ -21,7 +21,7 @@ #ifndef KSG_SENSORMANAGER_H #define KSG_SENSORMANAGER_H -#include +#include #include #include diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cc index 8b0613cf9..3d4bb6c81 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.cc +++ b/ksysguard/gui/ksgrd/StyleEngine.cc @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include "StyleSettings.h" -- cgit v1.2.1