[glom/glom-1-20] Fix some simple warnings found by clang++



commit 2bb20cf4057f7febb0a4845aef743d20219f4ea3
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Mar 14 11:06:52 2012 +0100

    Fix some simple warnings found by clang++
    
    	* glom/appwindow.cc:
    	* glom/dialog_existing_or_new.cc:
    	* glom/frame_glom.cc:
    	* glom/glom_import_po_all.cc:
    	* glom/libglom/data_structure/layout/layoutitem_field.cc:
    	* glom/mode_data/db_adddel/db_adddel.cc:
    	* glom/mode_design/fields/box_db_table_definition.cc:
    	* glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:
    	* glom/utility_widgets/adddel/adddel.cc:
    	I just did export CXX=clang++ before running autogen.sh.
    
    Conflicts:
    
    	ChangeLog
    	glom/appwindow.cc
    	glom/glom_import_po_all.cc
    	glom/mode_design/layout/layout_item_dialogs/box_formatting.cc

 ChangeLog                                          |   15 ++++++++++++++-
 glom/application.cc                                |    2 +-
 glom/dialog_existing_or_new.cc                     |    2 +-
 glom/frame_glom.cc                                 |    2 +-
 .../data_structure/layout/layoutitem_field.cc      |    4 ++--
 glom/mode_data/db_adddel/db_adddel.cc              |    2 +-
 glom/mode_design/fields/box_db_table_definition.cc |    4 ++--
 .../layout/layout_item_dialogs/box_formatting.cc   |    7 ++++---
 glom/utility_widgets/adddel/adddel.cc              |    2 +-
 9 files changed, 27 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d565df1..41f47d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
-1.20.10:
+2012-03-14  Murray Cumming  <murrayc murrayc com>
+
+	Fix some simple warnings found by clang++
+
+	* glom/appwindow.cc:
+	* glom/dialog_existing_or_new.cc:
+	* glom/frame_glom.cc:
+	* glom/glom_import_po_all.cc:
+	* glom/libglom/data_structure/layout/layoutitem_field.cc:
+	* glom/mode_data/db_adddel/db_adddel.cc:
+	* glom/mode_design/fields/box_db_table_definition.cc:
+	* glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:
+	* glom/utility_widgets/adddel/adddel.cc:
+	I just did export CXX=clang++ before running autogen.sh.
 
 2012-03-05  Murray Cumming  <murrayc murrayc com>
 
diff --git a/glom/application.cc b/glom/application.cc
index 3a9c04d..98ab090 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -76,7 +76,7 @@ Application::Application(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builde
   m_pBoxTop(0),
   m_pFrame(0),
   m_bAboutShown(false),
-  m_pAbout(false),
+  m_pAbout(0),
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   m_window_translations(0),
 #endif // !GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/dialog_existing_or_new.cc b/glom/dialog_existing_or_new.cc
index a34bf28..dc8e43d 100644
--- a/glom/dialog_existing_or_new.cc
+++ b/glom/dialog_existing_or_new.cc
@@ -277,7 +277,7 @@ bool Dialog_ExistingOrNew::list_examples_at_path(const std::string& path)
   {
     Glib::RefPtr<Gio::FileEnumerator> examples = examples_dir->enumerate_children(G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE","G_FILE_ATTRIBUTE_STANDARD_NAME);
     bool example_found = false;
-    while(info = examples->next_file())
+    while( (info = examples->next_file()) )
     {
       const Glib::ustring title = get_title_from_example(info, examples_dir);
       if(!title.empty())
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index 1b40475..2b2e8f2 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -1402,7 +1402,7 @@ void Frame_Glom::update_table_in_document_from_database()
   //Get the fields information from the database:
   DbUtils::type_vec_fields fieldsDatabase = DbUtils::get_fields_for_table_from_database(m_table_name);
 
-  Document* pDoc = dynamic_cast<const Document*>(get_document());
+  Document* pDoc = dynamic_cast<Document*>(get_document());
   if(pDoc)
   {
     bool document_must_be_updated = false;
diff --git a/glom/libglom/data_structure/layout/layoutitem_field.cc b/glom/libglom/data_structure/layout/layoutitem_field.cc
index 3cd9b35..8c53906 100644
--- a/glom/libglom/data_structure/layout/layoutitem_field.cc
+++ b/glom/libglom/data_structure/layout/layoutitem_field.cc
@@ -69,12 +69,12 @@ bool LayoutItem_Field::operator==(const LayoutItem_Field& src) const
     (m_field_cache_valid == src.m_field_cache_valid);
 
   if(m_field && src.m_field)
-    result == result && (*m_field == *(src.m_field));
+    result = result && (*m_field == *(src.m_field));
   else
     result = result && (m_field == src.m_field);
 
   if(m_title_custom && src.m_title_custom)
-    result == result && (*m_title_custom == *(src.m_title_custom));
+    result = result && (*m_title_custom == *(src.m_title_custom));
   else
     result = result && (m_title_custom == src.m_title_custom);
 
diff --git a/glom/mode_data/db_adddel/db_adddel.cc b/glom/mode_data/db_adddel/db_adddel.cc
index 53876d1..b3602d5 100644
--- a/glom/mode_data/db_adddel/db_adddel.cc
+++ b/glom/mode_data/db_adddel/db_adddel.cc
@@ -1232,7 +1232,7 @@ DbAddDel::InnerIgnore::~InnerIgnore()
     m_pOuter->set_ignore_treeview_signals(m_bIgnoreTreeViewSignals);
   }
 
-  m_pOuter = false;
+  m_pOuter = 0;
 }
 
 Gnome::Gda::Value DbAddDel::treeview_get_key(const Gtk::TreeModel::iterator& row) const
diff --git a/glom/mode_design/fields/box_db_table_definition.cc b/glom/mode_design/fields/box_db_table_definition.cc
index b770832..2d472e0 100644
--- a/glom/mode_design/fields/box_db_table_definition.cc
+++ b/glom/mode_design/fields/box_db_table_definition.cc
@@ -143,8 +143,8 @@ bool Box_DB_Table_Definition::fill_from_database()
       const sharedptr<const Field>& field = *iter;
 
       //Name:
-      Gtk::TreeModel::iterator iter= m_AddDel.add_item(field->get_name());
-      fill_field_row(iter, field);
+      Gtk::TreeModel::iterator tree_iter= m_AddDel.add_item(field->get_name());
+      fill_field_row(tree_iter, field);
     }
 
     result = true;
diff --git a/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc b/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
index c49be46..b34d5b5 100644
--- a/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
@@ -299,9 +299,10 @@ void Box_Formatting::set_formatting_for_non_field(const FieldFormatting& format,
     for(FieldFormatting::type_list_values::const_iterator iter = list_choice_values.begin(); iter != list_choice_values.end(); ++iter)
     {
       //Display the value in the choices list as it would be displayed in the format:
-      const Glib::ustring value_text = Conversions::get_text_for_gda_value(m_field->get_glom_type(), *iter, format.m_numeric_format);
-      Gtk::TreeModel::iterator iter = m_adddel_choices_custom->add_item(value_text);
-      m_adddel_choices_custom->set_value(iter, m_col_index_custom_choices, value_text);
+      const Gnome::Gda::Value value = *iter;
+      const Glib::ustring value_text = Conversions::get_text_for_gda_value(m_field->get_glom_type(), value, format.m_numeric_format);
+      Gtk::TreeModel::iterator tree_iter = m_adddel_choices_custom->add_item(value_text);
+      m_adddel_choices_custom->set_value(tree_iter, m_col_index_custom_choices, value_text);
     }
 
     m_radiobutton_choices_custom->set_active(format.get_has_custom_choices());
diff --git a/glom/utility_widgets/adddel/adddel.cc b/glom/utility_widgets/adddel/adddel.cc
index ca18b4a..685d4bd 100644
--- a/glom/utility_widgets/adddel/adddel.cc
+++ b/glom/utility_widgets/adddel/adddel.cc
@@ -1070,7 +1070,7 @@ AddDel::InnerIgnore::~InnerIgnore()
     m_pOuter->set_ignore_treeview_signals(m_bIgnoreSheetSignals);
   }
 
-  m_pOuter = false;
+  m_pOuter = 0;
 }
 
 Glib::ustring AddDel::treeview_get_key(const Gtk::TreeModel::iterator& row)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]