1.1 --- a/Hardware/CPU/IntelCPU.cs	Sun Feb 07 19:48:32 2010 +0000
     1.2 +++ b/Hardware/CPU/IntelCPU.cs	Sun Feb 07 19:53:51 2010 +0000
     1.3 @@ -43,7 +43,7 @@
     1.4  using System.Text;
     1.5  
     1.6  namespace OpenHardwareMonitor.Hardware.CPU {
     1.7 -  public class IntelCPU : IHardware {
     1.8 +  public class IntelCPU : Hardware, IHardware {
     1.9  
    1.10      private string name;
    1.11      private Image icon;
    1.12 @@ -52,8 +52,6 @@
    1.13      private Sensor totalLoad;
    1.14      private Sensor[] coreLoads;
    1.15  
    1.16 -    private List<ISensor> active = new List<ISensor>();
    1.17 -
    1.18      private float tjMax = 0;
    1.19      private uint logicalProcessors;
    1.20      private uint logicalProcessorsPerCore;
    1.21 @@ -165,10 +163,6 @@
    1.22        get { return icon; }
    1.23      }
    1.24  
    1.25 -    public ISensor[] Sensors {
    1.26 -      get { return active.ToArray(); }
    1.27 -    }
    1.28 -
    1.29      public string GetReport() {
    1.30        StringBuilder r = new StringBuilder();
    1.31  
    1.32 @@ -210,25 +204,6 @@
    1.33            coreLoads[i].Value = cpuLoad.GetCoreLoad(i);
    1.34          totalLoad.Value = cpuLoad.GetTotalLoad();
    1.35        }
    1.36 -    }
    1.37 -
    1.38 -    private void ActivateSensor(Sensor sensor) {
    1.39 -      if (!active.Contains(sensor)) {
    1.40 -        active.Add(sensor);
    1.41 -        if (SensorAdded != null)
    1.42 -          SensorAdded(sensor);
    1.43 -      }
    1.44 -    }
    1.45 -
    1.46 -    private void DeactivateSensor(Sensor sensor) {
    1.47 -      if (active.Contains(sensor)) {
    1.48 -        active.Remove(sensor);
    1.49 -        if (SensorRemoved != null)
    1.50 -          SensorRemoved(sensor);
    1.51 -      }
    1.52 -    }
    1.53 -
    1.54 -    public event SensorEventHandler SensorAdded;
    1.55 -    public event SensorEventHandler SensorRemoved;
    1.56 +    }  
    1.57    }
    1.58  }