Changeset 8271 for trunk

Timestamp:

01/12/11 11:25:08 (6 months ago)

Author:

westram

Message:

• fixed global shadow warnings (dont know exactly what was shadowed here.. maybe some global type?)

Location:

trunk/WINDOW

Files:

• AW_button.cxx (modified) (7 diffs)
• AW_window.cxx (modified) (9 diffs)

trunk/WINDOW/AW_button.cxx

@@ -934 +934 @@
     AW_cb_struct  *cbs;
     VarUpdateInfo *vui;
-    char          *String;
+    char          *str; 
     int            x_correcting_for_label = 0;
 
@@ -940 +940 @@
 
     AW_awar *vs = root->awar(var_name);
-    String      = root->awar(var_name)->read_as_string();
+    str         = root->awar(var_name)->read_as_string();
 
     int width_of_input_label, height_of_input_label;
@@ -985 +985 @@
                                             XmNwidth, (int)width_of_input,
                                             XmNrows, 1,
-                                            XmNvalue, String,
+                                            XmNvalue, str,
                                             XmNfontList, p_global->fontlist,
                                             XmNbackground, _at->background_color,
@@ -994 +994 @@
     }
 
-    free(String);
+    free(str);
 
     // user-own callback
@@ -1055 +1055 @@
 
 void AW_window::create_text_field(const char *var_name, int columns, int rows) {
-    Widget scrolledWindowText;
-    Widget scrolledText;
-    Widget tmp_label = 0;
-    AW_cb_struct *cbs;
+    Widget         scrolledWindowText;
+    Widget         scrolledText;
+    Widget         tmp_label              = 0;
+    AW_cb_struct  *cbs;
     VarUpdateInfo *vui;
-    char *String = NULL;
-    short width_of_last_widget = 0;
-    short height_of_last_widget = 0;
-    int width_of_text = 0;
-    int height_of_text = 0;
-    int x_correcting_for_label = 0;
+    char          *str                    = NULL;
+    short          width_of_last_widget   = 0;
+    short          height_of_last_widget  = 0;
+    int            width_of_text          = 0;
+    int            height_of_text         = 0;
+    int            x_correcting_for_label = 0;
 
     AW_awar *vs = root->awar(var_name);
-    String      = root->awar(var_name)->read_string();
+    str         = root->awar(var_name)->read_string();
 
     int width_of_text_label, height_of_text_label;
@@ -1131 +1131 @@
                                            scrolledWindowText,
                                            XmNeditMode, XmMULTI_LINE_EDIT,
-                                           XmNvalue, String,
+                                           XmNvalue, str,
                                            XmNscrollLeftSide, false,
                                            XmNwidth, (int)width_of_text,
@@ -1138 +1138 @@
                                            XmNbackground, _at->background_color,
                                            NULL);
-    free(String);
+    free(str);
 
     if (!_at->to_position_exists) {

trunk/WINDOW/AW_window.cxx

@@ -2573 +2573 @@
 }
 
-int AW_window::create_mode(const char *pixmap, const char *helpText, AW_active Mask, void (*f)(AW_window*, AW_CL, AW_CL), AW_CL cd1, AW_CL cd2) {
-    aw_assert(legal_mask(Mask));
+int AW_window::create_mode(const char *pixmap, const char *helpText, AW_active mask, void (*f)(AW_window*, AW_CL, AW_CL), AW_CL cd1, AW_CL cd2) {
+    aw_assert(legal_mask(mask));
     Widget button;
 
@@ -2609 +2609 @@
     }
 
-    root->make_sensitive(button, Mask);
+    root->make_sensitive(button, mask);
     p_w->number_of_modes++;
 
@@ -2821 +2821 @@
 // --------------------------------------------------------------------------------
 
-void AW_window::create_menu(AW_label name, const char *mnemonic, AW_active Mask) {
-    aw_assert(legal_mask(Mask));
+void AW_window::create_menu(AW_label name, const char *mnemonic, AW_active mask) {
+    aw_assert(legal_mask(mask));
     p_w->menu_deep = 0;
 #ifdef DEBUG
@@ -2830 +2830 @@
     dumpCloseAllSubMenus();
 #endif // DUMP_MENU_LIST
-    insert_sub_menu(name, mnemonic, Mask);
+    insert_sub_menu(name, mnemonic, mask);
 }
 
@@ -2845 +2845 @@
 }
 
-void AW_window::insert_sub_menu(AW_label name, const char *mnemonic, AW_active Mask) {
-    aw_assert(legal_mask(Mask));
+void AW_window::insert_sub_menu(AW_label name, const char *mnemonic, AW_active mask) {
+    aw_assert(legal_mask(mask));
     Widget shell, Label;
 
@@ -2899 +2899 @@
     if (p_w->menu_deep < AW_MAX_MENU_DEEP-1) p_w->menu_deep++;
 
-    root->make_sensitive(Label, Mask);
+    root->make_sensitive(Label, mask);
 }
 
@@ -2914 +2914 @@
 
 void AW_window::insert_menu_topic(const char *topic_id, AW_label name,
-                                  const char *mnemonic, const char *helpText, AW_active Mask,
+                                  const char *mnemonic, const char *helpText, AW_active mask,
                                   void (*f)(AW_window*, AW_CL, AW_CL), AW_CL cd1, AW_CL cd2)
 {
-    aw_assert(legal_mask(Mask));
+    aw_assert(legal_mask(mask));
     Widget button;
 
@@ -2955 +2955 @@
     cbs->id = strdup(topic_id);
     root->define_remote_command(cbs);
-    root->make_sensitive(button, Mask);
-}
-
-void AW_window::insert_help_topic(AW_label name, const char *mnemonic, const char *helpText, AW_active Mask,
+    root->make_sensitive(button, mask);
+}
+
+void AW_window::insert_help_topic(AW_label name, const char *mnemonic, const char *helpText, AW_active mask,
                                   void (*f)(AW_window*, AW_CL,  AW_CL), AW_CL cd1, AW_CL cd2)
 {
-    aw_assert(legal_mask(Mask));
+    aw_assert(legal_mask(mask));
     Widget button;
 
@@ -2973 +2973 @@
     (XtPointer) new AW_cb_struct(this, f, cd1, cd2, helpText));
 
-    root->make_sensitive(button, Mask);
+    root->make_sensitive(button, mask);
 }