Initial migration off of HAL

1 files changed, 4 insertions, 29 deletions

diff --git a/src/hardware_cpu.cpp b/src/hardware_cpu.cpp
index 1473a6d..5847dd9 100644
--- a/src/hardware_cpu.cpp
+++ b/src/hardware_cpu.cpp
@@ -46,6 +46,8 @@ CPUInfo::CPUInfo() {
 
 	update_info_cpufreq_speed_changed = true;
 	numOfCPUs = -1;
+
+	m_hwdevices = KGlobal::hardwareDevices();
 	
 	kdDebugFuncOut(trace);
 }
@@ -60,35 +62,8 @@ CPUInfo::~CPUInfo() {
  * Returns the total count of CPUs - _not_ the last CPU ID!
  */
 int CPUInfo::getCPUNum() {
-	kdDebugFuncIn(trace);
-
-	int cpu_id=0;
-	TQDir tmp_dir;
-	TQString cpu_path = "/sys/devices/system/cpu/cpu0/";
-#ifdef FAKE_CPU
-	cpu_path.prepend("/tmp/foo");
-#endif
-
-	// let check if we support cpufreq in general
-	if (tmp_dir.exists(tmp_dir.absFilePath(cpu_path + "cpufreq/scaling_cur_freq", true))) {
-		cpuFreqHW = true;
-	} else {
-		cpuFreqHW = false;
-	}
-
-	TQString tmp_path = tmp_dir.absFilePath(cpu_path, true);
-
-	while (tmp_dir.exists(tmp_path)) {
-		int tmp = cpu_id;
-
-		cpu_id++;
-                cpu_path.replace(TQString::number(tmp), TQString::number(cpu_id));
-		tmp_path = tmp_dir.absFilePath(cpu_path, true);
-        }
-
-	kdDebug() << "getCPUNum() return: '" << cpu_id << "'" << endl;
-	kdDebugFuncOut(trace);
-	return cpu_id;
+	TDEGenericHardwareList hwlist = m_hwdevices->listByDeviceClass(TDEGenericDeviceType::CPU);
+	return hwlist.count();
 }
 
 /*!