[glom] Slight code style change.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Slight code style change.
- Date: Wed, 28 Mar 2012 08:23:29 +0000 (UTC)
commit 2a7219ecfe99b7c4a6052d9ff3d044685be35a03
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Mar 28 09:21:12 2012 +0200
Slight code style change.
glom/frame_glom.cc | 55 +++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
---
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index a4be6ea..6703018 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -1330,40 +1330,43 @@ void Frame_Glom::on_notebook_find_criteria(const Gnome::Gda::SqlExpr& where_clau
//std::cout << "debug: " << G_STRFUNC << ": " << where_clause << std::endl;
AppWindow* pApp = dynamic_cast<AppWindow*>(get_app_window());
- if(pApp)
+ if(!pApp)
{
- bool records_found = false;
+ std::cerr << G_STRFUNC << ": get_app_window() failed." << std::endl;
+ return;
+ }
+
+ bool records_found = false;
- { //Extra scope, to control the lifetime of the busy cursor.
- BusyCursor busy_cursor(pApp);
+ { //Extra scope, to control the lifetime of the busy cursor.
+ BusyCursor busy_cursor(pApp);
- pApp->set_mode_data();
+ pApp->set_mode_data();
- //std::cout << "Frame_Glom::on_notebook_find_criteria: where_clause=" << where_clause << std::endl;
- FoundSet found_set;
- found_set.m_table_name = m_table_name;
- found_set.m_where_clause = where_clause;
- records_found = m_Notebook_Data.init_db_details(found_set);
+ //std::cout << "Frame_Glom::on_notebook_find_criteria: where_clause=" << where_clause << std::endl;
+ FoundSet found_set;
+ found_set.m_table_name = m_table_name;
+ found_set.m_where_clause = where_clause;
+ records_found = m_Notebook_Data.init_db_details(found_set);
- //std::cout << "debug: " << G_STRFUNC << ": BEFORE m_Notebook_Data.select_page_for_find_results()" << std::endl;
- m_Notebook_Data.select_page_for_find_results();
- //std::cout << "debug: " << G_STRFUNC << ": AFTER m_Notebook_Data.select_page_for_find_results()" << std::endl;
- }
+ //std::cout << "debug: " << G_STRFUNC << ": BEFORE m_Notebook_Data.select_page_for_find_results()" << std::endl;
+ m_Notebook_Data.select_page_for_find_results();
+ //std::cout << "debug: " << G_STRFUNC << ": AFTER m_Notebook_Data.select_page_for_find_results()" << std::endl;
+ }
- if(!records_found)
- {
- const bool find_again = Utils::show_warning_no_records_found(*get_app_window());
+ if(!records_found)
+ {
+ const bool find_again = Utils::show_warning_no_records_found(*get_app_window());
- if(find_again)
- pApp->set_mode_find();
- else
- on_button_find_all();
- }
+ if(find_again)
+ pApp->set_mode_find();
else
- {
- //Show how many records were found:
- update_records_count();
- }
+ on_button_find_all();
+ }
+ else
+ {
+ //Show how many records were found:
+ update_records_count();
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]