Do not use __unused as it may be reserved

8 files changed, 34 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 796e5f8..09c936f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2007-09-08 Jeff Garrett <jeff@jgarrett.org>
 
+	* src/downloadmanager.c:
+	* src/locationeditwindow.c:
+	* src/locationset.h:
+	* src/mainwindow.c:
+	* src/mapinfowindow.c:
+	* src/scenemanager.c:
+	* src/tooltipwindow.c: Do not use __unused as it may be reserved
+
+2007-09-08 Jeff Garrett <jeff@jgarrett.org>
+
 	* src/mainwindow.c: Update website URL to point to the cairo wiki
 
 2007-09-08 Jeff Garrett <jeff@jgarrett.org>
diff --git a/src/downloadmanager.c b/src/downloadmanager.c
index 7cd07d0..19e81c8 100644
--- a/src/downloadmanager.c
+++ b/src/downloadmanager.c
@@ -97,7 +97,7 @@ static void _downloadmanager_move_pending_to_active(downloadmanager_t* pDownload
 	}
 }
 
-// static void _downloader_gnome_vfs_close_callback(GnomeVFSAsyncHandle *_unused, GnomeVFSResult __unused, gpointer ___unused)
+// static void _downloader_gnome_vfs_close_callback(GnomeVFSAsyncHandle *_unused, GnomeVFSResult unused, gpointer ___unused)
 // {
 //     //g_print("downloader: a file has been closed\n");
 // }
diff --git a/src/locationeditwindow.c b/src/locationeditwindow.c
index 538a32f..8e03a48 100644
--- a/src/locationeditwindow.c
+++ b/src/locationeditwindow.c
@@ -65,7 +65,7 @@ struct {
 static void locationeditwindow_set_title();
 //static void locationeditwindow_nameentry_insert_text(GtkEditable *pEditable, gchar *pszNewText, gint nNewTextLen, gint *pPosition, gpointer pUserData);
 static void locationeditwindow_configure_attribute_list();
-static void locationeditwindow_something_changed_callback(GtkEditable *_unused, gpointer __unused);
+static void locationeditwindow_something_changed_callback(GtkEditable *_unused, gpointer unused);
 
 void locationeditwindow_show_for_new(gint nDefaultLocationSetID);
 void locationeditwindow_show_for_edit(gint nLocationID);
@@ -277,14 +277,14 @@ static void locationeditwindow_set_title()
 
 // Widget Callbacks
 
-static void locationeditwindow_something_changed_callback(GtkEditable *_unused, gpointer __unused)
+static void locationeditwindow_something_changed_callback(GtkEditable *_unused, gpointer unused)
 {
 	// NOTE: This callback is shared by several widgets
 	g_LocationEditWindow.bModified = TRUE;
 	locationeditwindow_set_title();
 }
 
-void locationeditwindow_on_attributeexpander_activate(GtkExpander *_unused, gpointer __unused)
+void locationeditwindow_on_attributeexpander_activate(GtkExpander *_unused, gpointer unused)
 {
 	// HACK: doesn't work when called directly (gets wrong value from expander?) so call it later
 	g_idle_add(locationeditwindow_set_expander_label, NULL);
diff --git a/src/locationset.h b/src/locationset.h
index cda94f6..ca07100 100644
--- a/src/locationset.h
+++ b/src/locationset.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 // typedef struct locationsetstyle {
 //     // icon?
 //     // color?
-//     int __unused;
+//     int unused;
 // } locationsetstyle_t;
 
 // a set of locations (eg. "Coffee Shops")
diff --git a/src/mainwindow.c b/src/mainwindow.c
index f3efb21..57a2aa7 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -503,7 +503,7 @@ void mainwindow_init(GladeXML* pGladeXML)
 	mapinfowindow_update(g_MainWindow.pMap);
 }
 
-gboolean mainwindow_locationset_list_is_separator_callback(GtkTreeModel *_unused, GtkTreeIter *pIter, gpointer __unused)
+gboolean mainwindow_locationset_list_is_separator_callback(GtkTreeModel *_unused, GtkTreeIter *pIter, gpointer unused)
 {
 	gint nLocationSetID;
 	gtk_tree_model_get(GTK_TREE_MODEL(g_MainWindow.pLocationSetsListStore), pIter, LOCATIONSETLIST_COLUMN_ID, &nLocationSetID, -1);
@@ -1388,7 +1388,7 @@ static gboolean mainwindow_on_key_release(GtkWidget *widget, GdkEventKey *event,
 	return FALSE; 	// propagate further
 }
 
-static gboolean mainwindow_on_window_state_change(GtkWidget *_unused, GdkEventKey *pEvent, gpointer __unused)
+static gboolean mainwindow_on_window_state_change(GtkWidget *_unused, GdkEventKey *pEvent, gpointer unused)
 {
 	// Set the menu's check without calling the signal handler
 	g_signal_handlers_block_by_func(g_MainWindow.pViewFullscreenMenuItem, mainwindow_on_fullscreenmenuitem_activate, NULL);
@@ -1510,7 +1510,7 @@ static gint mainwindow_on_configure_event(GtkWidget *pDrawingArea, GdkEventConfi
 	return TRUE;
 }
 
-static gboolean mainwindow_on_expose_event(GtkWidget *_unused, GdkEventExpose *pEvent, gpointer __unused)
+static gboolean mainwindow_on_expose_event(GtkWidget *_unused, GdkEventExpose *pEvent, gpointer unused)
 {
     if(pEvent->count > 0) return FALSE;
 
@@ -1531,7 +1531,7 @@ static gboolean mainwindow_on_expose_event(GtkWidget *_unused, GdkEventExpose *p
 /*
 ** GPS Functions
 */
-void mainwindow_on_gps_show_position_toggled(GtkWidget* _unused, gpointer* __unused)
+void mainwindow_on_gps_show_position_toggled(GtkWidget* _unused, gpointer* unused)
 {
 	gboolean bShowPosition = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_MainWindow.GPS.pShowPositionCheckButton));
 	gtk_widget_set_sensitive(GTK_WIDGET(g_MainWindow.GPS.pKeepPositionCenteredCheckButton), bShowPosition == TRUE);
@@ -1539,22 +1539,22 @@ void mainwindow_on_gps_show_position_toggled(GtkWidget* _unused, gpointer* __unu
 	gtk_widget_set_sensitive(GTK_WIDGET(g_MainWindow.GPS.pStickToRoadsCheckButton), FALSE);	// XXX: for now.
 }
 
-void mainwindow_on_gps_keep_position_centered_toggled(GtkWidget* _unused, gpointer* __unused)
+void mainwindow_on_gps_keep_position_centered_toggled(GtkWidget* _unused, gpointer* unused)
 {
 
 }
 
-void mainwindow_on_gps_show_trail_toggled(GtkWidget* _unused, gpointer* __unused)
+void mainwindow_on_gps_show_trail_toggled(GtkWidget* _unused, gpointer* unused)
 {
 
 }
 
-void mainwindow_on_gps_stick_to_roads_toggled(GtkWidget* _unused, gpointer* __unused)
+void mainwindow_on_gps_stick_to_roads_toggled(GtkWidget* _unused, gpointer* unused)
 {
 
 }
 
-static gboolean mainwindow_on_gps_redraw_timeout(gpointer __unused)
+static gboolean mainwindow_on_gps_redraw_timeout(gpointer unused)
 {
 	// NOTE: we're setting tooltips on the image's
 	GtkWidget* pWidget = gtk_widget_get_parent(GTK_WIDGET(g_MainWindow.pStatusbarGPSIcon));
@@ -1766,14 +1766,14 @@ void mainwindow_go_to_current_history_item()
 	mainwindow_draw_map(DRAWFLAG_ALL);
 }
 
-void mainwindow_on_backbutton_clicked(GtkWidget* _unused, gpointer* __unused)
+void mainwindow_on_backbutton_clicked(GtkWidget* _unused, gpointer* unused)
 {
 	map_history_go_back(g_MainWindow.pMapHistory);
 	mainwindow_go_to_current_history_item();
 	mainwindow_update_forward_back_buttons();
 }
 
-void mainwindow_on_forwardbutton_clicked(GtkWidget* _unused, gpointer* __unused)
+void mainwindow_on_forwardbutton_clicked(GtkWidget* _unused, gpointer* unused)
 {
 	map_history_go_forward(g_MainWindow.pMapHistory);
 	mainwindow_go_to_current_history_item();
@@ -1831,7 +1831,7 @@ static void mainwindow_on_locationset_visible_checkbox_clicked(GtkCellRendererTo
 }
 
 
-void mainwindow_on_addpointmenuitem_activate(GtkWidget *_unused, gpointer* __unused)
+void mainwindow_on_addpointmenuitem_activate(GtkWidget *_unused, gpointer* unused)
 {
 	mappoint_t point;
 	map_windowpoint_to_mappoint(g_MainWindow.pMap, &g_MainWindow.ptClickLocation, &point);
diff --git a/src/mapinfowindow.c b/src/mapinfowindow.c
index 5b9ea13..7b79513 100644
--- a/src/mapinfowindow.c
+++ b/src/mapinfowindow.c
@@ -68,9 +68,9 @@ static void mapinfowindow_on_country_chosen(GtkMenuItem* pMenuItem, gint nCountr
 static void mapinfowindow_on_state_chosen(GtkMenuItem* pMenuItem, gint nStateID);
 static void mapinfowindow_on_city_chosen(GtkMenuItem* pMenuItem, gint nCityID);
 
-static void mapinfowindow_on_state_button_clicked(GtkWidget* _unused, gpointer __unused);
-static void mapinfowindow_on_city_button_clicked(GtkWidget* _unused, gpointer __unused);
-static void mapinfowindow_on_country_button_clicked(GtkWidget* _unused, gpointer __unused);
+static void mapinfowindow_on_state_button_clicked(GtkWidget* _unused, gpointer unused);
+static void mapinfowindow_on_city_button_clicked(GtkWidget* _unused, gpointer unused);
+static void mapinfowindow_on_country_button_clicked(GtkWidget* _unused, gpointer unused);
 
 static void mapinfowindow_load_countries();
 static void mapinfowindow_load_cities(gint nStateID);
@@ -281,7 +281,7 @@ void mapinfowindow_select_country(gint nCountryID, const gchar* pszCountryMarkup
 	util_gtk_widget_set_visible(GTK_WIDGET(g_MapInfoWindow.pCityButton), FALSE);
 }
 
-static void mapinfowindow_on_country_button_clicked(GtkWidget* _unused, gpointer __unused)
+static void mapinfowindow_on_country_button_clicked(GtkWidget* _unused, gpointer unused)
 {
 	// re-zoom to the current country
 	mapinfowindow_select_country(g_MapInfoWindow.nCurrentCountryID, gtk_label_get_label(g_MapInfoWindow.pCountryLabel));
@@ -316,7 +316,7 @@ void mapinfowindow_select_state(gint nStateID, const gchar* pszStateMarkup)
 	}
 }
 
-static void mapinfowindow_on_state_button_clicked(GtkWidget* _unused, gpointer __unused)
+static void mapinfowindow_on_state_button_clicked(GtkWidget* _unused, gpointer unused)
 {
 	// Just re-set selected state
 	mapinfowindow_select_state(g_MapInfoWindow.nCurrentStateID, gtk_label_get_label(g_MapInfoWindow.pStateLabel));
@@ -332,7 +332,7 @@ static void mapinfowindow_on_state_chosen(GtkMenuItem* pMenuItem, gint nStateID)
 //
 // City
 //
-static void mapinfowindow_on_city_button_clicked(GtkWidget* _unused, gpointer __unused)
+static void mapinfowindow_on_city_button_clicked(GtkWidget* _unused, gpointer unused)
 {
 	if(g_MapInfoWindow.nCurrentCityID != 0) {
 		g_debug("recentering on cityID %d", g_MapInfoWindow.nCurrentCityID);
diff --git a/src/scenemanager.c b/src/scenemanager.c
index 33140b9..5b4be63 100644
--- a/src/scenemanager.c
+++ b/src/scenemanager.c
@@ -50,7 +50,7 @@ void scenemanager_set_screen_dimensions(scenemanager_t* pSceneManager, gint nWin
 	pSceneManager->nWindowHeight = nWindowHeight;
 }
 
-gboolean scenemanager_can_draw_label_at(scenemanager_t* pSceneManager, const gchar* pszLabel, GdkPoint* __unused_pScreenLocation, gint nFlags)
+gboolean scenemanager_can_draw_label_at(scenemanager_t* pSceneManager, const gchar* pszLabel, GdkPoint* unused_pScreenLocation, gint nFlags)
 {
 #ifdef ENABLE_NO_DUPLICATE_LABELS
 	g_assert(pSceneManager != NULL);
diff --git a/src/tooltipwindow.c b/src/tooltipwindow.c
index f83704a..39435f2 100644
--- a/src/tooltipwindow.c
+++ b/src/tooltipwindow.c
@@ -86,7 +86,7 @@ void tooltip_hide(tooltip_t* pTooltip)
 	gtk_widget_hide(GTK_WIDGET(pTooltip->pWindow));
 }
 
-static gboolean tooltip_on_mouse_motion(GtkWidget* pWidget, GdkEventMotion *__unused)
+static gboolean tooltip_on_mouse_motion(GtkWidget* pWidget, GdkEventMotion *unused)
 {
 	// in case the mouse makes its way onto the tooltip, hide it.
 	gtk_widget_hide(pWidget);