Re-indentation of source code.

This re-indentation was done using astyle-1.24 using the following options:

  astyle --indent=spaces=4 --brackets=break --pad-oper --pad-header --suffix=none

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20343 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming
2011-02-26 14:04:34 +00:00
parent cb366864c4
commit af2630904f
8 changed files with 36 additions and 36 deletions

View File

@@ -485,15 +485,15 @@ gnc_ui_account_get_tax_info_string (const Account *account)
return NULL; return NULL;
/* tax_related && !code */ /* tax_related && !code */
else else
/* Translators: This and the following strings appear on /* Translators: This and the following strings appear on
* the account tab if the Tax Info column is displayed, * the account tab if the Tax Info column is displayed,
* i.e. if the user wants to record the tax form number * i.e. if the user wants to record the tax form number
* and location on that tax form which corresponds to this * and location on that tax form which corresponds to this
* gnucash account. For the US Income Tax support in * gnucash account. For the US Income Tax support in
* gnucash, each tax code that can be assigned to an * gnucash, each tax code that can be assigned to an
* account generally corresponds to a specific line number * account generally corresponds to a specific line number
* on a paper form and each form has a unique * on a paper form and each form has a unique
* identification (e.g., Form 1040, Schedule A). */ * identification (e.g., Form 1040, Schedule A). */
return g_strdup (_("Tax-related but has no tax code")); return g_strdup (_("Tax-related but has no tax code"));
} }
else /* with tax code */ else /* with tax code */
@@ -676,8 +676,8 @@ gnc_ui_account_get_tax_info_sub_acct_string (const Account *account)
* on a paper form and each form has a unique * on a paper form and each form has a unique
* identification (e.g., Form 1040, Schedule A). */ * identification (e.g., Form 1040, Schedule A). */
return (sub_acct_tax_number == 0) ? g_strdup ("") : return (sub_acct_tax_number == 0) ? g_strdup ("") :
g_strdup_printf (_("(Tax-related subaccounts: %d)"), g_strdup_printf (_("(Tax-related subaccounts: %d)"),
sub_acct_tax_number); sub_acct_tax_number);
} }
else else
return g_strdup (""); return g_strdup ("");

View File

@@ -2890,8 +2890,8 @@ conn_test_dbi_library( dbi_conn conn )
dbi_result_free( result ); dbi_result_free( result );
g_ascii_dtostr( doublestr, sizeof(doublestr), testdouble ); g_ascii_dtostr( doublestr, sizeof(doublestr), testdouble );
querystr = g_strdup_printf( "INSERT INTO numtest VALUES (%" G_GINT64_FORMAT querystr = g_strdup_printf( "INSERT INTO numtest VALUES (%" G_GINT64_FORMAT
", %" G_GUINT64_FORMAT ", %s)", ", %" G_GUINT64_FORMAT ", %s)",
testlonglong, testulonglong, doublestr ); testlonglong, testulonglong, doublestr );
result = dbi_conn_query( conn, querystr ); result = dbi_conn_query( conn, querystr );
g_free( querystr ); g_free( querystr );
if ( result == NULL ) if ( result == NULL )

View File

@@ -335,7 +335,7 @@ test_dbi_version_control( const gchar* driver, const gchar* url )
qof_session_ensure_all_data_loaded( sess ); qof_session_ensure_all_data_loaded( sess );
err = qof_session_pop_error( sess ); err = qof_session_pop_error( sess );
do_test( err == ERR_SQL_DB_TOO_NEW, "DB Failed to flag too new" ); do_test( err == ERR_SQL_DB_TOO_NEW, "DB Failed to flag too new" );
cleanup: cleanup:
qbe = qof_session_get_backend( sess ); qbe = qof_session_get_backend( sess );
book = qof_session_get_book( sess ); book = qof_session_get_book( sess );
qof_book_begin_edit( book ); qof_book_begin_edit( book );

View File

@@ -92,8 +92,8 @@ gnc_get_svn_version (void)
guint guint
gnc_get_long_version() gnc_get_long_version()
{ {
return GNUCASH_MAJOR_VERSION * 1000000 + return GNUCASH_MAJOR_VERSION * 1000000 +
GNUCASH_MINOR_VERSION * 10000 + GNUCASH_MINOR_VERSION * 10000 +
GNUCASH_MICRO_VERSION * 100 + GNUCASH_MICRO_VERSION * 100 +
GNUCASH_NANO_VERSION; GNUCASH_NANO_VERSION;
} }

View File

@@ -1921,7 +1921,7 @@ main_window_update_page_name (GncPluginPage *page,
main_window_find_tab_event(window, page, &event_box); main_window_find_tab_event(window, page, &event_box);
if (old_page_long_name && old_page_name if (old_page_long_name && old_page_name
&& g_strrstr(old_page_long_name, old_page_name) != NULL) && g_strrstr(old_page_long_name, old_page_name) != NULL)
{ {
gchar *new_page_long_name; gchar *new_page_long_name;
gint string_position; gint string_position;

View File

@@ -295,7 +295,7 @@ gnc_GWEN_Gui_log_init(void)
{ {
log_gwen_gui = log_gwen_gui =
#ifdef USING_GWENHYWFAR_GTK2_GUI #ifdef USING_GWENHYWFAR_GTK2_GUI
Gtk2_Gui_new() Gtk2_Gui_new()
#else #else
GWEN_Gui_new() GWEN_Gui_new()
#endif #endif

View File

@@ -1114,8 +1114,8 @@ qof_session_begin (QofSession *session, const char * book_id,
/* Check to see if this session is already open */ /* Check to see if this session is already open */
if (session->book_id) if (session->book_id)
{ {
if (ERR_BACKEND_NO_ERR != qof_session_get_error(session)) if (ERR_BACKEND_NO_ERR != qof_session_get_error(session))
qof_session_push_error (session, ERR_BACKEND_LOCKED, NULL); qof_session_push_error (session, ERR_BACKEND_LOCKED, NULL);
LEAVE("push error book is already open "); LEAVE("push error book is already open ");
return; return;
} }
@@ -1123,8 +1123,8 @@ qof_session_begin (QofSession *session, const char * book_id,
/* seriously invalid */ /* seriously invalid */
if (!book_id) if (!book_id)
{ {
if (ERR_BACKEND_NO_ERR != qof_session_get_error(session)) if (ERR_BACKEND_NO_ERR != qof_session_get_error(session))
qof_session_push_error (session, ERR_BACKEND_BAD_URL, NULL); qof_session_push_error (session, ERR_BACKEND_BAD_URL, NULL);
LEAVE("push error missing book_id"); LEAVE("push error missing book_id");
return; return;
} }
@@ -1152,7 +1152,7 @@ qof_session_begin (QofSession *session, const char * book_id,
g_free(session->book_id); g_free(session->book_id);
session->book_id = NULL; session->book_id = NULL;
if (ERR_BACKEND_NO_ERR == qof_session_get_error(session)) if (ERR_BACKEND_NO_ERR == qof_session_get_error(session))
qof_session_push_error (session, ERR_BACKEND_BAD_URL, NULL); qof_session_push_error (session, ERR_BACKEND_BAD_URL, NULL);
LEAVE (" BAD: no backend: sess=%p book-id=%s", LEAVE (" BAD: no backend: sess=%p book-id=%s",
session, book_id ? book_id : "(null)"); session, book_id ? book_id : "(null)");
return; return;
@@ -1404,11 +1404,11 @@ qof_session_save (QofSession *session,
} }
if (!session->backend) if (!session->backend)
{ {
if (ERR_BACKEND_NO_ERR != qof_session_get_error(session)) if (ERR_BACKEND_NO_ERR != qof_session_get_error(session))
{ {
msg = g_strdup_printf("failed to load backend"); msg = g_strdup_printf("failed to load backend");
qof_session_push_error(session, ERR_BACKEND_NO_HANDLER, msg); qof_session_push_error(session, ERR_BACKEND_NO_HANDLER, msg);
} }
goto leave; goto leave;
} }
} }
@@ -1446,11 +1446,11 @@ qof_session_save (QofSession *session,
} }
else else
{ {
if (ERR_BACKEND_NO_ERR != qof_session_get_error(session)) if (ERR_BACKEND_NO_ERR != qof_session_get_error(session))
{ {
msg = g_strdup_printf("failed to load backend"); msg = g_strdup_printf("failed to load backend");
qof_session_push_error(session, ERR_BACKEND_NO_HANDLER, msg); qof_session_push_error(session, ERR_BACKEND_NO_HANDLER, msg);
} }
} }
LEAVE("error -- No backend!"); LEAVE("error -- No backend!");
leave: leave: