From 12975909c589880030db6125ad6dcbea889edcdc Mon Sep 17 00:00:00 2001 From: infirit Date: Thu, 18 Dec 2014 00:23:57 +0100 Subject: Make indentation uniform across source files No more tabs, 4 spaces instead. And remove trailing whitespace. --- src/util.h | 142 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) (limited to 'src/util.h') diff --git a/src/util.h b/src/util.h index 1a15b4b..6e989a9 100644 --- a/src/util.h +++ b/src/util.h @@ -16,13 +16,13 @@ using std::string; template inline int procman_cmp(T x, T y) { - if (x == y) - return 0; + if (x == y) + return 0; - if (x < y) - return -1; + if (x < y) + return -1; - return 1; + return 1; } #define PROCMAN_CMP(X, Y) procman_cmp((X), (Y)) @@ -30,8 +30,8 @@ inline int procman_cmp(T x, T y) GtkWidget* procman_make_label_for_mmaps_or_ofiles(const char *format, - const char *process_name, - unsigned pid); + const char *process_name, + unsigned pid); gboolean load_symbols(const char *module, ...) G_GNUC_NULL_TERMINATED; @@ -39,20 +39,20 @@ load_symbols(const char *module, ...) G_GNUC_NULL_TERMINATED; void procman_debug_real(const char *file, int line, const char *func, - const char *format, ...) G_GNUC_PRINTF(4, 5); + const char *format, ...) G_GNUC_PRINTF(4, 5); #define procman_debug(FMT, ...) procman_debug_real(__FILE__, __LINE__, __func__, FMT, ##__VA_ARGS__) inline string make_string(char *c_str) { - if (!c_str) { - procman_debug("NULL string"); - return string(); - } - - string s(c_str); - g_free(c_str); - return s; + if (!c_str) { + procman_debug("NULL string"); + return string(); + } + + string s(c_str); + g_free(c_str); + return s; } @@ -60,91 +60,91 @@ inline string make_string(char *c_str) template class UnrefMapValues - : public std::unary_function + : public std::unary_function { public: - void operator()(const typename Map::value_type &it) const - { - if (it.second) - g_object_unref(it.second); - } + void operator()(const typename Map::value_type &it) const + { + if (it.second) + g_object_unref(it.second); + } }; template inline void unref_map_values(Map &map) { - std::for_each(map.begin(), map.end(), UnrefMapValues()); + std::for_each(map.begin(), map.end(), UnrefMapValues()); } namespace procman { - void size_cell_data_func(GtkTreeViewColumn *col, GtkCellRenderer *renderer, - GtkTreeModel *model, GtkTreeIter *iter, - gpointer user_data); + void size_cell_data_func(GtkTreeViewColumn *col, GtkCellRenderer *renderer, + GtkTreeModel *model, GtkTreeIter *iter, + gpointer user_data); - void size_na_cell_data_func(GtkTreeViewColumn *col, GtkCellRenderer *renderer, - GtkTreeModel *model, GtkTreeIter *iter, - gpointer user_data); + void size_na_cell_data_func(GtkTreeViewColumn *col, GtkCellRenderer *renderer, + GtkTreeModel *model, GtkTreeIter *iter, + gpointer user_data); - void duration_cell_data_func(GtkTreeViewColumn *col, GtkCellRenderer *renderer, - GtkTreeModel *model, GtkTreeIter *iter, - gpointer user_data); + void duration_cell_data_func(GtkTreeViewColumn *col, GtkCellRenderer *renderer, + GtkTreeModel *model, GtkTreeIter *iter, + gpointer user_data); - void time_cell_data_func(GtkTreeViewColumn *col, GtkCellRenderer *renderer, - GtkTreeModel *model, GtkTreeIter *iter, - gpointer user_data); + void time_cell_data_func(GtkTreeViewColumn *col, GtkCellRenderer *renderer, + GtkTreeModel *model, GtkTreeIter *iter, + gpointer user_data); - void status_cell_data_func(GtkTreeViewColumn *col, GtkCellRenderer *renderer, - GtkTreeModel *model, GtkTreeIter *iter, - gpointer user_data); + void status_cell_data_func(GtkTreeViewColumn *col, GtkCellRenderer *renderer, + GtkTreeModel *model, GtkTreeIter *iter, + gpointer user_data); - template - void poison(T &t, char c) - { - memset(&t, c, sizeof t); - } + template + void poison(T &t, char c) + { + memset(&t, c, sizeof t); + } - // - // Stuff to update a tree_store in a smart way - // + // + // Stuff to update a tree_store in a smart way + // - template - void tree_store_update(GtkTreeModel* model, GtkTreeIter* iter, int column, const T& new_value) - { - T current_value; + template + void tree_store_update(GtkTreeModel* model, GtkTreeIter* iter, int column, const T& new_value) + { + T current_value; - gtk_tree_model_get(model, iter, column, ¤t_value, -1); + gtk_tree_model_get(model, iter, column, ¤t_value, -1); - if (current_value != new_value) - gtk_tree_store_set(GTK_TREE_STORE(model), iter, column, new_value, -1); - } + if (current_value != new_value) + gtk_tree_store_set(GTK_TREE_STORE(model), iter, column, new_value, -1); + } - // undefined - // catch every thing about pointers - // just to make sure i'm not doing anything wrong - template - void tree_store_update(GtkTreeModel* model, GtkTreeIter* iter, int column, T* new_value); + // undefined + // catch every thing about pointers + // just to make sure i'm not doing anything wrong + template + void tree_store_update(GtkTreeModel* model, GtkTreeIter* iter, int column, T* new_value); - // specialized versions for strings - template<> - void tree_store_update(GtkTreeModel* model, GtkTreeIter* iter, int column, const char* new_value); + // specialized versions for strings + template<> + void tree_store_update(GtkTreeModel* model, GtkTreeIter* iter, int column, const char* new_value); - template<> - inline void tree_store_update(GtkTreeModel* model, GtkTreeIter* iter, int column, char* new_value) - { - tree_store_update(model, iter, column, new_value); - } + template<> + inline void tree_store_update(GtkTreeModel* model, GtkTreeIter* iter, int column, char* new_value) + { + tree_store_update(model, iter, column, new_value); + } - gchar* format_size(guint64 size, guint64 max = 0, bool want_bits = false); + gchar* format_size(guint64 size, guint64 max = 0, bool want_bits = false); - std::string format_rate(guint64 rate, guint64 max_rate = 0, bool want_bits = false); + std::string format_rate(guint64 rate, guint64 max_rate = 0, bool want_bits = false); - std::string format_network(guint64 rate, guint64 max_rate = 0); - std::string format_network_rate(guint64 rate, guint64 max_rate = 0); + std::string format_network(guint64 rate, guint64 max_rate = 0); + std::string format_network_rate(guint64 rate, guint64 max_rate = 0); } -- cgit v1.2.1