diff -r 420adf504011 -r c4d1fb76a9e1 Hardware/CPU/IntelCPU.cs --- a/Hardware/CPU/IntelCPU.cs Sun Feb 07 19:48:32 2010 +0000 +++ b/Hardware/CPU/IntelCPU.cs Sun Feb 07 19:53:51 2010 +0000 @@ -43,7 +43,7 @@ using System.Text; namespace OpenHardwareMonitor.Hardware.CPU { - public class IntelCPU : IHardware { + public class IntelCPU : Hardware, IHardware { private string name; private Image icon; @@ -52,8 +52,6 @@ private Sensor totalLoad; private Sensor[] coreLoads; - private List active = new List(); - private float tjMax = 0; private uint logicalProcessors; private uint logicalProcessorsPerCore; @@ -165,10 +163,6 @@ get { return icon; } } - public ISensor[] Sensors { - get { return active.ToArray(); } - } - public string GetReport() { StringBuilder r = new StringBuilder(); @@ -210,25 +204,6 @@ coreLoads[i].Value = cpuLoad.GetCoreLoad(i); totalLoad.Value = cpuLoad.GetTotalLoad(); } - } - - private void ActivateSensor(Sensor sensor) { - if (!active.Contains(sensor)) { - active.Add(sensor); - if (SensorAdded != null) - SensorAdded(sensor); - } - } - - private void DeactivateSensor(Sensor sensor) { - if (active.Contains(sensor)) { - active.Remove(sensor); - if (SensorRemoved != null) - SensorRemoved(sensor); - } - } - - public event SensorEventHandler SensorAdded; - public event SensorEventHandler SensorRemoved; + } } }