New upstream version 3.1.0upstream/3.1.0

1 files changed, 10 insertions, 12 deletions

diff --git a/Header.h b/Header.h
index 870fbd8..060ad02 100644
--- a/Header.h
+++ b/Header.h
@@ -7,44 +7,42 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "HeaderLayout.h"
 #include "Meter.h"
 #include "ProcessList.h"
 #include "Settings.h"
 #include "Vector.h"
 
+
 typedef struct Header_ {
    Vector** columns;
    Settings* settings;
    ProcessList* pl;
-   int nrColumns;
+   HeaderLayout headerLayout;
    int pad;
    int height;
 } Header;
 
-#define Header_forEachColumn(this_, i_) for (int (i_)=0; (i_) < (this_)->nrColumns; ++(i_))
+#define Header_forEachColumn(this_, i_) for (size_t (i_)=0, H_fEC_numColumns_ = HeaderLayout_getColumns((this_)->headerLayout); (i_) < H_fEC_numColumns_; ++(i_))
 
-Header* Header_new(ProcessList* pl, Settings* settings, int nrColumns);
+Header* Header_new(ProcessList* pl, Settings* settings, HeaderLayout hLayout);
 
 void Header_delete(Header* this);
 
+void Header_setLayout(Header* this, HeaderLayout hLayout);
+
 void Header_populateFromSettings(Header* this);
 
 void Header_writeBackToSettings(const Header* this);
 
-MeterModeId Header_addMeterByName(Header* this, char* name, int column);
-
-void Header_setMode(Header* this, int i, MeterModeId mode, int column);
-
-Meter* Header_addMeterByClass(Header* this, const MeterClass* type, int param, int column);
-
-int Header_size(Header* this, int column);
-
-MeterModeId Header_readMeterMode(Header* this, int i, int column);
+Meter* Header_addMeterByClass(Header* this, const MeterClass* type, unsigned int param, unsigned int column);
 
 void Header_reinit(Header* this);
 
 void Header_draw(const Header* this);
 
+void Header_updateData(Header* this);
+
 int Header_calculateHeight(Header* this);
 
 #endif