From 89823a27a72cdab0da4623b8b010873a9ab85b82 Mon Sep 17 00:00:00 2001 From: rbuj Date: Wed, 27 Oct 2021 18:13:18 +0200 Subject: Use a blank line at most --- src/callbacks.h | 5 ----- src/gsm_color_button.c | 7 ------- src/load-graph.h | 8 -------- src/prettytable.h | 4 ---- src/procdialogs.h | 3 --- src/procman.h | 12 ------------ src/proctable.h | 1 - src/settings-keys.h | 2 -- src/smooth_refresh.h | 4 ---- src/util.h | 5 ----- 10 files changed, 51 deletions(-) diff --git a/src/callbacks.h b/src/callbacks.h index 5f7a7f0..15c53d4 100644 --- a/src/callbacks.h +++ b/src/callbacks.h @@ -18,7 +18,6 @@ * */ - #ifndef _PROCMAN_CALLBACKS_H_ #define _PROCMAN_CALLBACKS_H_ @@ -26,7 +25,6 @@ #include "procman.h" #include "gsm_color_button.h" - void cb_show_memory_maps (GtkAction *action, gpointer data); void cb_show_open_files (GtkAction *action, gpointer data); void cb_show_process_properties (GtkAction *action, gpointer data); @@ -59,7 +57,6 @@ gboolean cb_tree_popup_menu (GtkWidget *widget, gpointer data); gboolean cb_tree_button_pressed (GtkWidget *widget, GdkEventButton *event, gpointer data); - void cb_change_current_page (GtkNotebook *nb, gint num, gpointer data); void cb_switch_page (GtkNotebook *nb, GtkWidget *page, @@ -73,8 +70,6 @@ void cb_radio_processes(GtkAction *action, GtkRadioAction *current, gpointer data); - - void cb_kill_sigstop(GtkAction *action, gpointer data); diff --git a/src/gsm_color_button.c b/src/gsm_color_button.c index 6c6883c..27aee1c 100644 --- a/src/gsm_color_button.c +++ b/src/gsm_color_button.c @@ -119,7 +119,6 @@ static void gsm_color_button_drag_data_received (GtkWidget * widget, GSMColorButton * color_button); - static guint color_button_signals[LAST_SIGNAL] = { 0 }; static const GtkTargetEntry drop_types[] = { {"application/x-color", 0, 0} }; @@ -194,7 +193,6 @@ gsm_color_button_class_init (GSMColorButtonClass * klass) } - static cairo_surface_t * fill_image_buffer_from_file (cairo_t *cr, const char *filePath) { @@ -223,7 +221,6 @@ fill_image_buffer_from_file (cairo_t *cr, const char *filePath) return tmp_surface; } - static void render (GtkWidget * widget) { @@ -506,7 +503,6 @@ gsm_color_button_drag_data_received (GtkWidget * widget, return; } - dropped = (guint16 *) gtk_selection_data_get_data (selection_data); priv->color.red = dropped[0]; @@ -522,7 +518,6 @@ gsm_color_button_drag_data_received (GtkWidget * widget, g_object_thaw_notify (G_OBJECT (color_button)); } - static void set_color_icon (GdkDragContext * context, GdkRGBA * color) { @@ -574,7 +569,6 @@ gsm_color_button_drag_data_get (GtkWidget * widget, 16, (guchar *) dropped, 8); } - static void gsm_color_button_init (GSMColorButton * color_button) { @@ -751,7 +745,6 @@ gsm_color_button_released (GtkWidget * widget, GdkEventButton * event) return 0; } - static gboolean gsm_color_button_enter_notify (GtkWidget * widget, GdkEventCrossing * event) { diff --git a/src/load-graph.h b/src/load-graph.h index 95e841b..60eff23 100644 --- a/src/load-graph.h +++ b/src/load-graph.h @@ -11,14 +11,12 @@ enum LOAD_GRAPH_NET }; - enum { CPU_TOTAL, CPU_USED, N_CPU_STATES }; - struct LoadGraphLabels { GtkWidget *cpu[GLIBTOP_NCPU]; @@ -30,8 +28,6 @@ struct LoadGraphLabels GtkWidget *net_out_total; }; - - struct LoadGraph { static const unsigned NUM_POINTS = 60 + 2; @@ -98,8 +94,6 @@ struct LoadGraph { /* }; */ }; - - /* Force a drawing update */ void load_graph_queue_draw (LoadGraph *g); @@ -120,7 +114,6 @@ load_graph_change_speed (LoadGraph *g, LoadGraphLabels* load_graph_get_labels (LoadGraph *g) G_GNUC_CONST; - GtkWidget* load_graph_get_widget (LoadGraph *g) G_GNUC_CONST; @@ -130,5 +123,4 @@ load_graph_get_mem_color_picker(LoadGraph *g) G_GNUC_CONST; GtkWidget* load_graph_get_swap_color_picker(LoadGraph *g) G_GNUC_CONST; - #endif /* _PROCMAN_LOAD_GRAPH_H_ */ diff --git a/src/prettytable.h b/src/prettytable.h index fccca98..b41918f 100644 --- a/src/prettytable.h +++ b/src/prettytable.h @@ -25,8 +25,6 @@ class ProcInfo; using std::string; - - class PrettyTable { public: @@ -61,7 +59,6 @@ private: Gio::FileMonitorEvent); void init_gio_app_cache (); - typedef std::map > IconCache; typedef std::map > IconsForPID; typedef std::map > AppCache; @@ -74,5 +71,4 @@ private: procman::IconThemeWrapper theme; }; - #endif /* _PROCMAN_PRETTYTABLE_H_ */ diff --git a/src/procdialogs.h b/src/procdialogs.h index c02cb4b..1e3aef0 100644 --- a/src/procdialogs.h +++ b/src/procdialogs.h @@ -20,7 +20,6 @@ #ifndef _PROCDIALOGS_H_ #define _PROCDIALOGS_H_ - #include #include "procman.h" @@ -35,14 +34,12 @@ #define RENICE_VAL_MAX 20 #endif - typedef enum { PROCMAN_ACTION_RENICE, PROCMAN_ACTION_KILL } ProcmanActionType; - void procdialog_create_kill_dialog (ProcData *data, int signal); void procdialog_create_renice_dialog (ProcData *data); gboolean procdialog_create_root_password_dialog (ProcmanActionType type, diff --git a/src/procman.h b/src/procman.h index 3c9b82e..f721708 100644 --- a/src/procman.h +++ b/src/procman.h @@ -20,7 +20,6 @@ #ifndef _PROCMAN_PROCMAN_H_ #define _PROCMAN_PROCMAN_H_ - #include #include #include @@ -64,7 +63,6 @@ enum static const unsigned MIN_UPDATE_INTERVAL = 1 * 1000; static const unsigned MAX_UPDATE_INTERVAL = 100 * 1000; - enum ProcmanTab { PROCMAN_TAB_SYSINFO, @@ -73,7 +71,6 @@ enum ProcmanTab PROCMAN_TAB_DISKS }; - struct ProcConfig { gint width; @@ -101,8 +98,6 @@ struct ProcConfig bool network_in_bits; }; - - struct MutableProcInfo { MutableProcInfo() @@ -150,7 +145,6 @@ MutableProcInfo() std::string owner; }; - class ProcInfo : public MutableProcInfo { @@ -176,7 +170,6 @@ class ProcInfo static Iterator begin() { return ProcInfo::all.begin(); } static Iterator end() { return ProcInfo::all.end(); } - ProcInfo(pid_t pid); ~ProcInfo(); // adds one more ref to icon @@ -255,17 +248,12 @@ void procman_save_config (ProcData *data); void procman_save_tree_state (GSettings *settings, GtkWidget *tree, const gchar *prefix); gboolean procman_get_tree_state (GSettings *settings, GtkWidget *tree, const gchar *prefix); - - - - struct ReniceArgs { ProcData *procdata; int nice_value; }; - struct KillArgs { ProcData *procdata; diff --git a/src/proctable.h b/src/proctable.h index 3ecc2d4..30da3cf 100644 --- a/src/proctable.h +++ b/src/proctable.h @@ -60,7 +60,6 @@ enum NUM_COLUMNS }; - GtkWidget* proctable_new (ProcData *data); void proctable_update_table (ProcData *data); void proctable_update (ProcData *data); diff --git a/src/settings-keys.h b/src/settings-keys.h index d01a33a..4c48db5 100644 --- a/src/settings-keys.h +++ b/src/settings-keys.h @@ -3,7 +3,6 @@ #include - namespace procman { namespace settings @@ -15,5 +14,4 @@ namespace procman } } - #endif // H_PROCMAN_SETTINGS_KEYS_1177430397 diff --git a/src/smooth_refresh.h b/src/smooth_refresh.h index 92039e0..4e057d8 100644 --- a/src/smooth_refresh.h +++ b/src/smooth_refresh.h @@ -7,8 +7,6 @@ using std::string; - - class SmoothRefresh { public: @@ -45,7 +43,6 @@ class SmoothRefresh */ bool get(guint &new_interval); - static const string KEY; static const bool KEY_DEFAULT_VALUE; @@ -99,5 +96,4 @@ class SmoothRefresh guint64 last_cpu_time; }; - #endif /* _PROCMAN_SMOOTH_REFRESH */ diff --git a/src/util.h b/src/util.h index 75975d7..36c0a89 100644 --- a/src/util.h +++ b/src/util.h @@ -45,7 +45,6 @@ inline string make_string(char *c_str) return s; } - namespace procman { gchar* format_duration_for_display(unsigned centiseconds); @@ -89,15 +88,12 @@ namespace procman gint number_compare_func(GtkTreeModel* model, GtkTreeIter* first, GtkTreeIter* second, gpointer user_data); - template void poison(T &t, char c) { memset(&t, c, sizeof t); } - - // // Stuff to update a tree_store in a smart way // @@ -132,5 +128,4 @@ namespace procman gchar* get_nice_level (gint nice); } - #endif /* H_MATE_SYSTEM_MONITOR_UTIL_1123178725 */ -- cgit v1.2.1