Make indentation uniform across source files

No more tabs, 4 spaces instead. And remove trailing whitespace.
author: infirit <[email protected]> 2014-12-18 00:23:57 +0100
committer: infirit <[email protected]> 2014-12-18 00:23:57 +0100
commit: 12975909c589880030db6125ad6dcbea889edcdc (patch)
tree: fc374a8a3b855b5024d09f9edb2e47ca755cb7ac /src/prettytable.cpp
parent: 0dea7ab1931fb33f35eceab66dffcd56f4550f68 (diff)
download: mate-system-monitor-12975909c589880030db6125ad6dcbea889edcdc.tar.bz2
mate-system-monitor-12975909c589880030db6125ad6dcbea889edcdc.tar.xz
1 files changed, 106 insertions, 106 deletions
diff --git a/src/prettytable.cpp b/src/prettytable.cpp
index 604ce09..5c2b571 100644
--- a/src/prettytable.cpp
+++ b/src/prettytable.cpp
@@ -24,11 +24,11 @@ namespace
 
 PrettyTable::PrettyTable()
 {
- WnckScreen* screen = wnck_screen_get_default();
- g_signal_connect(G_OBJECT(screen), "application_opened",
- G_CALLBACK(PrettyTable::on_application_opened), this);
- g_signal_connect(G_OBJECT(screen), "application_closed",
- G_CALLBACK(PrettyTable::on_application_closed), this);
+ WnckScreen* screen = wnck_screen_get_default();
+ g_signal_connect(G_OBJECT(screen), "application_opened",
+ G_CALLBACK(PrettyTable::on_application_opened), this);
+ g_signal_connect(G_OBJECT(screen), "application_closed",
+ G_CALLBACK(PrettyTable::on_application_closed), this);
 }
 
 
@@ -40,35 +40,35 @@ PrettyTable::~PrettyTable()
 void
 PrettyTable::on_application_opened(WnckScreen* screen, WnckApplication* app, gpointer data)
 {
- PrettyTable * const that = static_cast<PrettyTable*>(data);
- FILE *f;
+ PrettyTable * const that = static_cast<PrettyTable*>(data);
+ FILE *f;
 
- pid_t pid = wnck_application_get_pid(app);
+ pid_t pid = wnck_application_get_pid(app);
 
- if (pid == 0)
- return;
+ if (pid == 0)
+ return;
 
- const char* icon_name = wnck_application_get_icon_name(app);
+ const char* icon_name = wnck_application_get_icon_name(app);
 
 
- Glib::RefPtr<Gdk::Pixbuf> icon;
- 
- // Make sure that icon_name is a valid symlink before loading.
- f = fopen (icon_name, "r");
- if (f != NULL) {
- fclose (f);
- icon = that->theme->load_icon(icon_name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
- }
+ Glib::RefPtr<Gdk::Pixbuf> icon;
 
- if (not icon) {
- icon = Glib::wrap(wnck_application_get_icon(app), /* take_copy */ true);
- icon = icon->scale_simple(APP_ICON_SIZE, APP_ICON_SIZE, Gdk::INTERP_HYPER);
- }
+ // Make sure that icon_name is a valid symlink before loading.
+ f = fopen (icon_name, "r");
+ if (f != NULL) {
+ fclose (f);
+ icon = that->theme->load_icon(icon_name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
+ }
+
+ if (not icon) {
+ icon = Glib::wrap(wnck_application_get_icon(app), /* take_copy */ true);
+ icon = icon->scale_simple(APP_ICON_SIZE, APP_ICON_SIZE, Gdk::INTERP_HYPER);
+ }
 
- if (not icon)
- return;
+ if (not icon)
+ return;
 
- that->register_application(pid, icon);
+ that->register_application(pid, icon);
 }
 
 
@@ -92,12 +92,12 @@ PrettyTable::register_application(pid_t pid, Glib::RefPtr<Gdk::Pixbuf> icon)
 void
 PrettyTable::on_application_closed(WnckScreen* screen, WnckApplication* app, gpointer data)
 {
- pid_t pid = wnck_application_get_pid(app);
+ pid_t pid = wnck_application_get_pid(app);
 
- if (pid == 0)
- return;
+ if (pid == 0)
+ return;
 
- static_cast<PrettyTable*>(data)->unregister_application(pid);
+ static_cast<PrettyTable*>(data)->unregister_application(pid);
 }
 
 
@@ -105,10 +105,10 @@ PrettyTable::on_application_closed(WnckScreen* screen, WnckApplication* app, gpo
 void
 PrettyTable::unregister_application(pid_t pid)
 {
- IconsForPID::iterator it(this->apps.find(pid));
+ IconsForPID::iterator it(this->apps.find(pid));
 
- if (it != this->apps.end())
- this->apps.erase(it);
+ if (it != this->apps.end())
+ this->apps.erase(it);
 }
 
 
@@ -116,20 +116,20 @@ PrettyTable::unregister_application(pid_t pid)
 Glib::RefPtr<Gdk::Pixbuf>
 PrettyTable::get_icon_from_theme(const ProcInfo &info)
 {
- return this->theme->load_icon(info.name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
+ return this->theme->load_icon(info.name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
 }
 
 
 bool PrettyTable::get_default_icon_name(const string &cmd, string &name)
 {
- for (size_t i = 0; i != G_N_ELEMENTS(default_table); ++i) {
- if (default_table[i].command->match(cmd)) {
- name = default_table[i].icon;
- return true;
+ for (size_t i = 0; i != G_N_ELEMENTS(default_table); ++i) {
+ if (default_table[i].command->match(cmd)) {
+ name = default_table[i].icon;
+ return true;
+ }
 }
- }
 
- return false;
+ return false;
 }
 
 /*
@@ -142,21 +142,21 @@ bool PrettyTable::get_default_icon_name(const string &cmd, string &name)
 Glib::RefPtr<Gdk::Pixbuf>
 PrettyTable::get_icon_from_default(const ProcInfo &info)
 {
- Glib::RefPtr<Gdk::Pixbuf> pix;
- string name;
-
- if (this->get_default_icon_name(info.name, name)) {
- IconCache::iterator it(this->defaults.find(name));
-
- if (it == this->defaults.end()) {
- pix = this->theme->load_icon(name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
- if (pix)
- this->defaults[name] = pix;
- } else
- pix = it->second;
- }
+ Glib::RefPtr<Gdk::Pixbuf> pix;
+ string name;
+
+ if (this->get_default_icon_name(info.name, name)) {
+ IconCache::iterator it(this->defaults.find(name));
+
+ if (it == this->defaults.end()) {
+ pix = this->theme->load_icon(name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
+ if (pix)
+ this->defaults[name] = pix;
+ } else
+ pix = it->second;
+ }
 
- return pix;
+ return pix;
 }
 
 
@@ -164,14 +164,14 @@ PrettyTable::get_icon_from_default(const ProcInfo &info)
 Glib::RefPtr<Gdk::Pixbuf>
 PrettyTable::get_icon_from_wnck(const ProcInfo &info)
 {
- Glib::RefPtr<Gdk::Pixbuf> icon;
+ Glib::RefPtr<Gdk::Pixbuf> icon;
 
- IconsForPID::iterator it(this->apps.find(info.pid));
+ IconsForPID::iterator it(this->apps.find(info.pid));
 
- if (it != this->apps.end())
- icon = it->second;
+ if (it != this->apps.end())
+ icon = it->second;
 
- return icon;
+ return icon;
 }
 
 
@@ -179,42 +179,42 @@ PrettyTable::get_icon_from_wnck(const ProcInfo &info)
 Glib::RefPtr<Gdk::Pixbuf>
 PrettyTable::get_icon_from_name(const ProcInfo &info)
 {
- return this->theme->load_icon(info.name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
+ return this->theme->load_icon(info.name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
 }
 
 
 Glib::RefPtr<Gdk::Pixbuf>
 PrettyTable::get_icon_dummy(const ProcInfo &)
 {
- return this->theme->load_icon("application-x-executable", APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
+ return this->theme->load_icon("application-x-executable", APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
 }
 
 
 namespace
 {
- bool has_kthreadd()
- {
- glibtop_proc_state buf;
- glibtop_get_proc_state(&buf, 2);
-
- return buf.cmd == string("kthreadd");
- }
-
- // @pre: has_kthreadd
- bool is_kthread(const ProcInfo &info)
- {
- return info.pid == 2 or info.ppid == 2;
- }
+ bool has_kthreadd()
+ {
+ glibtop_proc_state buf;
+ glibtop_get_proc_state(&buf, 2);
+
+ return buf.cmd == string("kthreadd");
+ }
+
+ // @pre: has_kthreadd
+ bool is_kthread(const ProcInfo &info)
+ {
+ return info.pid == 2 or info.ppid == 2;
+ }
 }
 
 
 Glib::RefPtr<Gdk::Pixbuf>
 PrettyTable::get_icon_for_kernel(const ProcInfo &info)
 {
- if (is_kthread(info))
- return this->theme->load_icon("applications-system", APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
+ if (is_kthread(info))
+ return this->theme->load_icon("applications-system", APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
 
- return Glib::RefPtr<Gdk::Pixbuf>();
+ return Glib::RefPtr<Gdk::Pixbuf>();
 }
 
 
@@ -222,41 +222,41 @@ PrettyTable::get_icon_for_kernel(const ProcInfo &info)
 void
 PrettyTable::set_icon(ProcInfo &info)
 {
- typedef Glib::RefPtr<Gdk::Pixbuf>
- (PrettyTable::*Getter)(const ProcInfo &);
+ typedef Glib::RefPtr<Gdk::Pixbuf>
+ (PrettyTable::*Getter)(const ProcInfo &);
 
- static std::vector<Getter> getters;
+ static std::vector<Getter> getters;
 
- if (getters.empty())
+ if (getters.empty())
 {
- getters.push_back(&PrettyTable::get_icon_from_wnck);
- getters.push_back(&PrettyTable::get_icon_from_theme);
- getters.push_back(&PrettyTable::get_icon_from_default);
- getters.push_back(&PrettyTable::get_icon_from_name);
- if (has_kthreadd())
- {
- procman_debug("kthreadd is running with PID 2");
- getters.push_back(&PrettyTable::get_icon_for_kernel);
- }
- getters.push_back(&PrettyTable::get_icon_dummy);
+ getters.push_back(&PrettyTable::get_icon_from_wnck);
+ getters.push_back(&PrettyTable::get_icon_from_theme);
+ getters.push_back(&PrettyTable::get_icon_from_default);
+ getters.push_back(&PrettyTable::get_icon_from_name);
+ if (has_kthreadd())
+ {
+ procman_debug("kthreadd is running with PID 2");
+ getters.push_back(&PrettyTable::get_icon_for_kernel);
+ }
+ getters.push_back(&PrettyTable::get_icon_dummy);
 }
 
- Glib::RefPtr<Gdk::Pixbuf> icon;
-
- for (size_t i = 0; not icon and i < getters.size(); ++i) {
- try {
- icon = (this->*getters[i])(info);
- }
- catch (std::exception& e) {
- g_warning("Failed to load icon for %s(%u) : %s", info.name, info.pid, e.what());
- continue;
- }
- catch (Glib::Exception& e) {
- g_warning("Failed to load icon for %s(%u) : %s", info.name, info.pid, e.what().c_str());
- continue;
+ Glib::RefPtr<Gdk::Pixbuf> icon;
+
+ for (size_t i = 0; not icon and i < getters.size(); ++i) {
+ try {
+ icon = (this->*getters[i])(info);
+ }
+ catch (std::exception& e) {
+ g_warning("Failed to load icon for %s(%u) : %s", info.name, info.pid, e.what());
+ continue;
+ }
+ catch (Glib::Exception& e) {
+ g_warning("Failed to load icon for %s(%u) : %s", info.name, info.pid, e.what().c_str());
+ continue;
+ }
 }
- }
 
- info.set_icon(icon);
+ info.set_icon(icon);
 }
author	infirit <[email protected]>	2014-12-18 00:23:57 +0100
committer	infirit <[email protected]>	2014-12-18 00:23:57 +0100
commit	12975909c589880030db6125ad6dcbea889edcdc (patch)
tree	fc374a8a3b855b5024d09f9edb2e47ca755cb7ac /src/prettytable.cpp
parent	0dea7ab1931fb33f35eceab66dffcd56f4550f68 (diff)
download	mate-system-monitor-12975909c589880030db6125ad6dcbea889edcdc.tar.bz2 mate-system-monitor-12975909c589880030db6125ad6dcbea889edcdc.tar.xz