summaryrefslogtreecommitdiffstats
path: root/ksysguard
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
commitde7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch)
treedbb3152c372f8620f9290137d461f3d9f9eba1cb /ksysguard
parent936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff)
downloadtdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip
tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'ksysguard')
-rw-r--r--ksysguard/gui/SensorDisplayLib/CMakeLists.txt2
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessList.cc4
-rw-r--r--ksysguard/gui/Workspace.cc4
-rw-r--r--ksysguard/gui/ksgrd/SensorManager.h2
-rw-r--r--ksysguard/gui/ksgrd/StyleEngine.cc2
5 files changed, 7 insertions, 7 deletions
diff --git a/ksysguard/gui/SensorDisplayLib/CMakeLists.txt b/ksysguard/gui/SensorDisplayLib/CMakeLists.txt
index b6cfacf..0fe416a 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 86b5b17..5bb68b3 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 7271bab..123c3f2 100644
--- a/ksysguard/gui/Workspace.cc
+++ b/ksysguard/gui/Workspace.cc
@@ -26,8 +26,8 @@
#include <tqwhatsthis.h>
#include <kdebug.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
diff --git a/ksysguard/gui/ksgrd/SensorManager.h b/ksysguard/gui/ksgrd/SensorManager.h
index a362de3..1e859c6 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 <kconfig.h>
+#include <tdeconfig.h>
#include <tqdict.h>
#include <tqobject.h>
diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cc
index 8b0613c..3d4bb6c 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.cc
+++ b/ksysguard/gui/ksgrd/StyleEngine.cc
@@ -25,7 +25,7 @@
#include <tqpushbutton.h>
#include <tqspinbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include "StyleSettings.h"