replaced 0 with NULL where appropriate: shut the compiler up

git-svn-id: file:///svnroot/simple-launcher/trunk@69 3ba93dab-e023-0410-b42a-de7732cf370a

diff --git a/launchable-item.cc b/launchable-item.cc
index b8cae0a..4f0902a 100644 (file)
--- a/launchable-item.cc
+++ b/launchable-item.cc
@@ -18,7 +18,7 @@
 #include "launchable-item.h"
 
 bool LaunchableItem::activate(osso_context_t *context) {
-  return osso_application_top(context, getService().c_str(), 0) == OSSO_OK;
+  return osso_application_top(context, getService().c_str(), NULL) == OSSO_OK;
 }
 
 // vim:ts=2:sw=2:et

diff --git a/launcher-item.cc b/launcher-item.cc
index d7343d8..afc24cf 100644 (file)
--- a/launcher-item.cc
+++ b/launcher-item.cc
@@ -22,7 +22,7 @@
 
 #include "launcher-item.h"
 
-GtkIconTheme *LauncherItem::ourTheme = 0;
+GtkIconTheme *LauncherItem::ourTheme = NULL;
 
 static const char *DESKTOP_ENTRY_GROUP = "Desktop Entry",
                   *DESKTOP_ENTRY_TYPE_FIELD = "Type",
@@ -38,16 +38,16 @@ public:
   }
 
  ~GKeyFileWrapper() {
-    if (myKeyFile != 0) {
+    if (myKeyFile != NULL) {
       g_key_file_free(myKeyFile);
     }
   }
 
   bool load(const std::string& name) {
-    GError *error = 0;
+    GError *error = NULL;
     bool result = g_key_file_load_from_file(myKeyFile, name.c_str(), G_KEY_FILE_NONE, &error);
 
-    if (error != 0) {
+    if (error != NULL) {
       g_error_free(error);
     }
 
@@ -55,10 +55,10 @@ public:
   }
 
   std::string getString(const gchar *group, const gchar *itemName) {
-    gchar *tempo = g_key_file_get_string(myKeyFile, group, itemName, 0);
+    gchar *tempo = g_key_file_get_string(myKeyFile, group, itemName, NULL);
     std::string result;
 
-    if (tempo != 0) {
+    if (tempo != NULL) {
       result.assign(tempo);
 
       g_free(tempo);
@@ -68,10 +68,10 @@ public:
   }
 
   std::string getLocaleString(const gchar *group, const gchar *itemName) {
-    gchar *tempo = g_key_file_get_locale_string(myKeyFile, group, itemName, 0, 0);
+    gchar *tempo = g_key_file_get_locale_string(myKeyFile, group, itemName, NULL, NULL);
     std::string result;
 
-    if (tempo != 0) {
+    if (tempo != NULL) {
       result.assign(tempo);
 
       g_free(tempo);
@@ -114,18 +114,18 @@ bool LauncherItem::load(const std::string& filename) {
 }
 
 GdkPixbuf *LauncherItem::getIcon(int icon_size) const {
-  GdkPixbuf *pixbuf = 0;
+  GdkPixbuf *pixbuf = NULL;
 
   if (!myIcon.empty()) {
-    if (ourTheme == 0) {
+    if (ourTheme == NULL) {
       ourTheme = gtk_icon_theme_get_default();
     }
 
-    GError *error = 0;
+    GError *error = NULL;
 
     pixbuf = gtk_icon_theme_load_icon(ourTheme, myIcon.c_str(), icon_size, GTK_ICON_LOOKUP_NO_SVG, &error);
 
-    if (error != 0) {
+    if (error != NULL) {
       g_error_free(error);
       error = NULL;
     }

diff --git a/simple-launcher.cc b/simple-launcher.cc
index 82eacac..005b26c 100644 (file)
--- a/simple-launcher.cc
+++ b/simple-launcher.cc
@@ -71,12 +71,12 @@ private:
 void *hildon_home_applet_lib_initialize(void *state_data, int *state_size, GtkWidget **widget) {
   SimpleLauncherApplet *applet = new SimpleLauncherApplet();
 
-  if (applet != 0) {
+  if (applet != NULL) {
     if (applet->doInit(state_data, state_size)) {
       *widget = applet->getWidget();
     } else {
       delete applet;
-      applet = 0;
+      applet = NULL;
     }
   }
 
@@ -114,19 +114,19 @@ char *SimpleLauncherApplet::ourFiles[] = {
   "/usr/share/applications/hildon/filemanager.desktop",
   "/usr/share/applications/hildon/osso-application-installer.desktop",
   "/usr/share/applications/hildon/hildon-control-panel.desktop",
-  0
+  NULL
 };
 
-SimpleLauncherApplet::SimpleLauncherApplet(): myContext(0), myWidget(0), myParent(0) {
+SimpleLauncherApplet::SimpleLauncherApplet(): myContext(NULL), myWidget(NULL), myParent(NULL) {
 }
 
 bool SimpleLauncherApplet::doInit(void *state_data, int *state_size) {
-  if ((myContext = osso_initialize(SL_APPLET_DBUS_NAME, SL_APPLET_VERSION, FALSE, 0)) == 0) {
+  if ((myContext = osso_initialize(SL_APPLET_DBUS_NAME, SL_APPLET_VERSION, FALSE, NULL)) == NULL) {
     g_debug("sla-applet: failed to initialize the osso layer");
     return false;
   }
 
-  for (int i = 0 ; ourFiles[i] != 0 ; ++i) {
+  for (int i = 0 ; ourFiles[i] != NULL ; ++i) {
     LaunchableItem *item = new LaunchableItem();
 
     if (item->load(ourFiles[i])) {
@@ -147,22 +147,22 @@ bool SimpleLauncherApplet::doInit(void *state_data, int *state_size) {
 
 SimpleLauncherApplet::~SimpleLauncherApplet() {
   for (LauncherItems::iterator it = myItems.begin(); it != myItems.end(); ++it) {
-    if (it->second != 0) {
+    if (it->second != NULL) {
       delete it->second;
-      it->second = 0;
+      it->second = NULL;
     }
   }
 
   myItems.resize(0);
 
-  if (myWidget != 0) {
+  if (myWidget != NULL) {
     gtk_widget_destroy(myWidget);
-    myWidget = 0;
+    myWidget = NULL;
   }
 
-  if (myContext != 0) {
+  if (myContext != NULL) {
     osso_deinitialize(myContext);
-    myContext = 0;
+    myContext = NULL;
   }
 }
 
@@ -172,7 +172,7 @@ bool SimpleLauncherApplet::initWidget() {
   GtkToolbar *toolbar = GTK_TOOLBAR(gtk_toolbar_new());
 
   for (LauncherItems::const_iterator it = myItems.begin(); it != myItems.end(); ++it) {
-    GtkToolItem *button = gtk_tool_button_new(gtk_image_new_from_pixbuf(it->second->getIcon(SL_APPLET_ICON_SIZE)), 0);
+    GtkToolItem *button = gtk_tool_button_new(gtk_image_new_from_pixbuf(it->second->getIcon(SL_APPLET_ICON_SIZE)), NULL);
 
     gtk_object_set_user_data(GTK_OBJECT(button), it->second);
     g_signal_connect(button, "clicked", G_CALLBACK(_button_clicked), this);
@@ -183,7 +183,7 @@ bool SimpleLauncherApplet::initWidget() {
   }
 
   if (button_no) {
-    myWidget = gtk_frame_new(0);
+    myWidget = gtk_frame_new(NULL);
     gtk_frame_set_shadow_type(GTK_FRAME(myWidget), GTK_SHADOW_ETCHED_IN);
     gtk_widget_set_size_request(myWidget, button_no*(SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE), SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE);
     gtk_container_add(GTK_CONTAINER(myWidget), GTK_WIDGET(toolbar));
@@ -191,7 +191,7 @@ bool SimpleLauncherApplet::initWidget() {
     gtk_widget_destroy(GTK_WIDGET(toolbar));
   }
 
-  return myWidget != 0;
+  return myWidget != NULL;
 }
 
 void SimpleLauncherApplet::_button_clicked(GtkToolButton *button, void *self) {
@@ -199,22 +199,22 @@ void SimpleLauncherApplet::_button_clicked(GtkToolButton *button, void *self) {
 }
 
 void SimpleLauncherApplet::buttonClicked(GtkToolButton *button) {
-  if (button != 0) {
+  if (button != NULL) {
     LaunchableItem *item = (LaunchableItem *)gtk_object_get_user_data(GTK_OBJECT(button));
 
-    if (item != 0) {
+    if (item != NULL) {
       item->activate(myContext);
     }
   }
 }
 
 int SimpleLauncherApplet::saveState(void **state_data, int *state_size) {
-  if (state_data != 0) {
-    *state_data = 0;
+  if (state_data != NULL) {
+    *state_data = NULL;
   }
 
-  if (state_size != 0) {
-    *state_size = 0;
+  if (state_size != NULL) {
+    *state_size = NULL;
   }
 
   return 1;
@@ -241,7 +241,7 @@ void SimpleLauncherApplet::_run_dialog(GtkMenuItem *, void *self) {
 void SimpleLauncherApplet::runDialog() {
   SLAList list(SL_APPLET_ICON_SIZE, myItems);
 
-  GtkDialog *dialog = GTK_DIALOG(gtk_dialog_new_with_buttons("Launcher Settings", myParent, (GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT), "OK", GTK_RESPONSE_OK, "Cancel", GTK_RESPONSE_CANCEL, 0));
+  GtkDialog *dialog = GTK_DIALOG(gtk_dialog_new_with_buttons("Launcher Settings", myParent, (GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT), "OK", GTK_RESPONSE_OK, "Cancel", GTK_RESPONSE_CANCEL, NULL));
 
   gtk_container_add(GTK_CONTAINER(dialog->vbox), list.getWidget());
 

diff --git a/sla-list.cc b/sla-list.cc
index c9b91e0..419be6d 100644 (file)
--- a/sla-list.cc
+++ b/sla-list.cc
@@ -36,7 +36,7 @@ static GtkWidget *gtk_button_new_stock_image_only(const gchar *stock_id) {
   return button;
 }
 
-SLAList::SLAList(int icon_size, LauncherItems& items): myWidget(0), myStore(0), myView(0), mySelection(0), myItems(items) {
+SLAList::SLAList(int icon_size, LauncherItems& items): myWidget(NULL), myStore(NULL), myView(NULL), mySelection(NULL), myItems(items) {
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
 
@@ -50,32 +50,32 @@ SLAList::SLAList(int icon_size, LauncherItems& items): myWidget(0), myStore(0),
   gtk_tree_selection_set_mode(mySelection, GTK_SELECTION_SINGLE);
 
   renderer = gtk_cell_renderer_pixbuf_new();
-  g_object_set(renderer, "yalign", 0.0, 0);
+  g_object_set(renderer, "yalign", 0.0, NULL);
   gtk_cell_renderer_set_fixed_size(renderer, icon_size+4, -1);
-  column = GTK_TREE_VIEW_COLUMN(gtk_tree_view_column_new_with_attributes("", renderer, "pixbuf", 0, 0));
+  column = GTK_TREE_VIEW_COLUMN(gtk_tree_view_column_new_with_attributes("", renderer, "pixbuf", 0, NULL));
 
   gtk_tree_view_insert_column(myView, column, -1);
 
   renderer = gtk_cell_renderer_text_new();
-  g_object_set(renderer, "yalign", 0.0, 0);
+  g_object_set(renderer, "yalign", 0.0, NULL);
   column = gtk_tree_view_column_new();
   gtk_tree_view_column_pack_start(column, renderer, TRUE);
-  gtk_tree_view_column_set_cell_data_func(column, renderer, _renderText, this, 0);
+  gtk_tree_view_column_set_cell_data_func(column, renderer, _renderText, this, NULL);
   gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
   gtk_tree_view_column_set_expand(column, TRUE);
 
   gtk_tree_view_insert_column(myView, column, -1);
 
   renderer = gtk_cell_renderer_toggle_new();
-  g_object_set(renderer, "activatable", TRUE, 0);
+  g_object_set(renderer, "activatable", TRUE, NULL);
   g_signal_connect(renderer, "toggled", G_CALLBACK(_toggleBool), this);
   column = gtk_tree_view_column_new();
   gtk_tree_view_column_pack_start(column, renderer, TRUE);
-  gtk_tree_view_column_set_cell_data_func(column, renderer, _renderBool, this, 0);
+  gtk_tree_view_column_set_cell_data_func(column, renderer, _renderBool, this, NULL);
 
   gtk_tree_view_insert_column(myView, column, -1);
 
-  GtkWidget *swindow = gtk_scrolled_window_new(0, 0);
+  GtkWidget *swindow = gtk_scrolled_window_new(NULL, NULL);
 
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
   gtk_container_add(GTK_CONTAINER(swindow), GTK_WIDGET(myView));
@@ -136,11 +136,11 @@ void SLAList::renderText(GtkTreeViewColumn *, GtkCellRenderer *cell, GtkTreeMode
 #if 1
   if (gtk_tree_selection_iter_is_selected(mySelection, iter)) {
     gchar *text = g_markup_printf_escaped("%s\n<small>%s</small>", myItems[index].second->getName().c_str(), myItems[index].second->getComment().c_str());
-    g_object_set(cell, "markup", text, 0);
+    g_object_set(cell, "markup", text, NULL);
     g_free(text);
   } else {
 #endif
-    g_object_set(cell, "text", myItems[index].second->getName().c_str(), 0);
+    g_object_set(cell, "text", myItems[index].second->getName().c_str(), NULL);
 #if 1
   }
 #endif
@@ -151,7 +151,7 @@ void SLAList::renderBool(GtkTreeViewColumn *, GtkCellRenderer *cell, GtkTreeMode
 
   gtk_tree_model_get(GTK_TREE_MODEL(myStore), iter, 1, &index, -1);
 
-  g_object_set(cell, "active", myItems[index].second->isEnabled(), 0);
+  g_object_set(cell, "active", myItems[index].second->isEnabled(), NULL);
 }
 
 void SLAList::toggleBool(GtkCellRendererToggle *renderer, const gchar *spath) {