From c167a2c4c514ffb1feb3b087060e0c0ee36578d1 Mon Sep 17 00:00:00 2001 From: Explorer09 Date: Thu, 18 Apr 2024 22:07:39 +0800 Subject: New header "MeterMode.h" for MeterModeId definitions This is a prerequisite to using MeterModeId type in more headers, to avoid header dependency hell. --- Makefile.am | 1 + Meter.h | 10 +--------- MeterMode.h | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 MeterMode.h diff --git a/Makefile.am b/Makefile.am index ca2f90ba..2580252b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -134,6 +134,7 @@ myhtopheaders = \ MemoryMeter.h \ MemorySwapMeter.h \ Meter.h \ + MeterMode.h \ MetersPanel.h \ NetworkIOMeter.h \ Object.h \ diff --git a/Meter.h b/Meter.h index 1a16d19a..ff402ae3 100644 --- a/Meter.h +++ b/Meter.h @@ -14,6 +14,7 @@ in the source distribution for its full text. #include "ListItem.h" #include "Machine.h" +#include "MeterMode.h" #include "Object.h" @@ -117,15 +118,6 @@ struct Meter_ { void* meterData; }; -typedef enum { - /* Meter mode 0 is reserved */ - BAR_METERMODE = 1, - TEXT_METERMODE, - GRAPH_METERMODE, - LED_METERMODE, - LAST_METERMODE -} MeterModeId; - typedef enum { RATESTATUS_DATA, RATESTATUS_INIT, diff --git a/MeterMode.h b/MeterMode.h new file mode 100644 index 00000000..98e6921e --- /dev/null +++ b/MeterMode.h @@ -0,0 +1,20 @@ +#ifndef HEADER_MeterMode +#define HEADER_MeterMode +/* +htop - MeterMode.h +(C) 2024 htop dev team +Released under the GNU GPLv2+, see the COPYING file +in the source distribution for its full text. +*/ + + +typedef enum { + /* Meter mode 0 is reserved */ + BAR_METERMODE = 1, + TEXT_METERMODE, + GRAPH_METERMODE, + LED_METERMODE, + LAST_METERMODE +} MeterModeId; + +#endif -- cgit v1.2.3