gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/1141e9a9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/3363a2c5 (commit)
	from  https://github.com/Gnucash/gnucash/commit/1df569e9 (commit)



commit 1141e9a9b8b3a45d622e6182c890e40dcb09f396
Merge: 1df569e 3363a2c
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Sep 5 12:06:16 2014 -0700

    Merge branch 'maint'

commit 3363a2c5722840b688caf889183205f7095480d6
Author: lmat <dartme18 at gmail.com>
Date:   Tue Aug 12 13:56:53 2014 -0400

    Replace C++ reserved words for future compatibility with C++



Summary of changes:
 src/app-utils/gnc-component-manager.h              |   2 +-
 src/app-utils/test/test-option-util.c              |   2 +-
 src/backend/xml/io-gncxml-v1.c                     |  12 +-
 src/backend/xml/io-gncxml-v2.c                     |   6 +-
 src/backend/xml/io-gncxml-v2.h                     |   2 +-
 src/backend/xml/sixtp-dom-generators.c             |   8 +-
 src/business/business-gnome/search-owner.c         |  12 +-
 src/business/business-ledger/gncEntryLedger.c      |   6 +-
 src/business/business-ledger/gncEntryLedgerP.h     |   2 +-
 src/engine/gnc-commodity.c                         | 152 ++++++++++-----------
 src/engine/test-core/test-engine-stuff.c           |   6 +-
 src/engine/test/utest-Account.c                    |  22 +--
 src/engine/test/utest-Transaction.c                |  94 ++++++-------
 src/gnome-search/dialog-search.c                   |  12 +-
 src/gnome-search/gnc-general-search.c              |   2 +-
 src/gnome-search/search-account.c                  |  12 +-
 src/gnome-search/search-boolean.c                  |  12 +-
 src/gnome-search/search-core-type.c                |   2 +-
 src/gnome-search/search-date.c                     |  12 +-
 src/gnome-search/search-double.c                   |  12 +-
 src/gnome-search/search-int64.c                    |  12 +-
 src/gnome-search/search-numeric.c                  |  12 +-
 src/gnome-search/search-reconciled.c               |  12 +-
 src/gnome-search/search-string.c                   |  18 +--
 src/gnome-utils/assistant-xml-encoding.c           |  10 +-
 src/gnome-utils/dialog-commodity.c                 |  96 ++++++-------
 src/gnome-utils/dialog-commodity.h                 |   4 +-
 src/gnome-utils/dialog-preferences.c               |   4 +-
 src/gnome-utils/dialog-reset-warnings.c            |   4 +-
 src/gnome-utils/dialog-totd.c                      |  14 +-
 src/gnome-utils/gnc-amount-edit.c                  |   2 +-
 src/gnome-utils/gnc-cell-renderer-date.c           |  12 +-
 src/gnome-utils/gnc-cell-renderer-popup-entry.c    |   2 +-
 src/gnome-utils/gnc-cell-renderer-popup.c          |  16 +--
 src/gnome-utils/gnc-combott.c                      |  14 +-
 src/gnome-utils/gnc-currency-edit.c                |   2 +-
 src/gnome-utils/gnc-date-delta.c                   |   2 +-
 src/gnome-utils/gnc-date-format.c                  |   2 +-
 src/gnome-utils/gnc-dense-cal.c                    |   2 +-
 src/gnome-utils/gnc-general-select.c               |   2 +-
 src/gnome-utils/gnc-period-select.c                |   2 +-
 src/gnome-utils/gnc-plugin.c                       |  32 ++---
 src/gnome-utils/gnc-tree-model-commodity.c         |  92 ++++++-------
 src/gnome-utils/gnc-tree-model-commodity.h         |   2 +-
 src/gnome-utils/gnc-tree-model-price.c             | 102 +++++++-------
 src/gnome-utils/gnc-tree-model-price.h             |   2 +-
 src/gnome-utils/gnc-tree-view-commodity.c          |   6 +-
 src/gnome-utils/gnc-tree-view-price.c              |   6 +-
 src/gnome-utils/search-param.c                     |   2 +-
 src/gnome/dialog-commodities.c                     |  18 +--
 src/gnome/dialog-fincalc.c                         |   2 +-
 src/gnome/dialog-price-edit-db.c                   |   8 +-
 src/gnome/dialog-price-editor.c                    |  54 ++++----
 src/gnome/gnc-split-reg.c                          |  48 +++----
 src/import-export/qif-imp/assistant-qif-import.c   |  40 +++---
 src/register/ledger-core/gnc-ledger-display.c      |  14 +-
 src/register/ledger-core/gnc-ledger-display2.c     |  14 +-
 src/register/ledger-core/split-register-p.h        |   3 -
 src/register/register-gnome/gnucash-cursor.c       |   8 +-
 src/register/register-gnome/gnucash-grid.c         |   8 +-
 .../register-gnome/gnucash-scrolled-window.c       |   8 +-
 src/register/register-gnome/gnucash-sheet.c        |  20 +--
 62 files changed, 560 insertions(+), 563 deletions(-)