- Overhaul meters implementation;

- add AllCPUsMeter;
- because of that, the new .htoprc is incompatible with previous released versions.

1 files changed, 10 insertions, 13 deletions

diff --git a/Header.h b/Header.h
index 51160bb2..96cedb68 100644
--- a/Header.h
+++ b/Header.h
@@ -1,22 +1,15 @@
-/* Do not edit this file. It was automatically genarated. */
+/* Do not edit this file. It was automatically generated. */
 
 #ifndef HEADER_Header
 #define HEADER_Header
 /*
-htop
+htop - Header.c
 (C) 2004-2006 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "CPUMeter.h"
-#include "MemoryMeter.h"
-#include "SwapMeter.h"
-#include "LoadMeter.h"
-#include "LoadAverageMeter.h"
-#include "UptimeMeter.h"
-#include "ClockMeter.h"
-#include "TasksMeter.h"
+#include "Meter.h"
 
 #include "debug.h"
 #include <assert.h>
@@ -37,21 +30,25 @@ typedef struct Header_ {
 } Header;
 
 
+#ifndef MAX
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#endif
+
 Header* Header_new(ProcessList* pl);
 
 void Header_delete(Header* this);
 
 void Header_createMeter(Header* this, char* name, HeaderSide side);
 
-void Header_setMode(Header* this, int i, MeterMode mode, HeaderSide side);
+void Header_setMode(Header* this, int i, MeterModeId mode, HeaderSide side);
 
-Meter* Header_getMeter(Header* this, int i, HeaderSide side);
+Meter* Header_addMeter(Header* this, MeterType* type, int param, HeaderSide side);
 
 int Header_size(Header* this, HeaderSide side);
 
 char* Header_readMeterName(Header* this, int i, HeaderSide side);
 
-MeterMode Header_readMeterMode(Header* this, int i, HeaderSide side);
+MeterModeId Header_readMeterMode(Header* this, int i, HeaderSide side);
 
 void Header_defaultMeters(Header* this);