New upstream version 3.0.2upstream/3.0.2

1 files changed, 8 insertions, 47 deletions

diff --git a/Meter.h b/Meter.h
index 56d46f2..c4d0039 100644
--- a/Meter.h
+++ b/Meter.h
@@ -1,5 +1,3 @@
-/* Do not edit this file. It was automatically generated. */
-
 #ifndef HEADER_Meter
 #define HEADER_Meter
 /*
@@ -9,16 +7,11 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
-#define METER_BUFFER_LEN 256
-
-#define GRAPH_DELAY (DEFAULT_DELAY/2)
-
-#define GRAPH_HEIGHT 4 /* Unit: rows (lines) */
-
 #include "ListItem.h"
-
 #include <sys/time.h>
 
+#define METER_BUFFER_LEN 256
+
 typedef struct Meter_ Meter;
 
 typedef void(*Meter_Init)(Meter*);
@@ -96,54 +89,22 @@ typedef struct GraphData_ {
    double values[METER_BUFFER_LEN];
 } GraphData;
 
-
-#ifndef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-#ifndef MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
-#ifndef CLAMP
-#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
-#endif
-
 extern MeterClass Meter_class;
 
-extern Meter* Meter_new(struct ProcessList_* pl, int param, MeterClass* type);
+Meter* Meter_new(struct ProcessList_* pl, int param, MeterClass* type);
 
-extern int Meter_humanUnit(char* buffer, unsigned long int value, int size);
+int Meter_humanUnit(char* buffer, unsigned long int value, int size);
 
-extern void Meter_delete(Object* cast);
+void Meter_delete(Object* cast);
 
-extern void Meter_setCaption(Meter* this, const char* caption);
+void Meter_setCaption(Meter* this, const char* caption);
 
-extern void Meter_setMode(Meter* this, int modeIndex);
+void Meter_setMode(Meter* this, int modeIndex);
 
-extern ListItem* Meter_toListItem(Meter* this, bool moving);
-
-/* ---------- TextMeterMode ---------- */
-
-/* ---------- BarMeterMode ---------- */
-
-/* ---------- GraphMeterMode ---------- */
-
-#ifdef HAVE_LIBNCURSESW
-
-#define PIXPERROW_UTF8 4
-#endif
-
-#define PIXPERROW_ASCII 2
-
-/* ---------- LEDMeterMode ---------- */
-
-#ifdef HAVE_LIBNCURSESW
-
-#endif
+ListItem* Meter_toListItem(Meter* this, bool moving);
 
 extern MeterMode* Meter_modes[];
 
-/* Blank meter */
-
 extern int BlankMeter_attributes[];
 
 extern MeterClass BlankMeter_class;