diff --git a/ChangeLog b/ChangeLog index 8a6be4ee09..23cc56b04c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2001-07-02 Dave Peticolas + * many header files: apply Ben Stanley's script to + convert __HEADER_H__ to HEADER_H. All names starting + with '_' are reserved. + * src/gnome/gnc-dateedit.c: sync with datecell-gnome.c * src/register/gnome/datecell-gnome.c: use GDate to do diff --git a/src/AccWindow.h b/src/AccWindow.h index 7992189887..22bb1177d4 100644 --- a/src/AccWindow.h +++ b/src/AccWindow.h @@ -23,8 +23,8 @@ * Huntington Beach, CA 92648-4632 * \********************************************************************/ -#ifndef __ACC_WINDOW_H__ -#define __ACC_WINDOW_H__ +#ifndef ACC_WINDOW_H +#define ACC_WINDOW_H #include "config.h" @@ -45,4 +45,4 @@ Account * gnc_ui_new_accounts_from_name_window (const char *name); void gnc_ui_set_default_new_account_currency (const char *currency); -#endif /* __ACC_WINDOW_H__ */ +#endif /* ACC_WINDOW_H */ diff --git a/src/EuroUtils.h b/src/EuroUtils.h index 7edcf8840b..771ab98ffa 100644 --- a/src/EuroUtils.h +++ b/src/EuroUtils.h @@ -19,8 +19,8 @@ * * \********************************************************************/ -#ifndef __EURO_UTILS_H__ -#define __EURO_UTILS_H__ +#ifndef EURO_UTILS_H +#define EURO_UTILS_H #include @@ -36,6 +36,6 @@ gnc_numeric gnc_euro_currency_get_rate (const gnc_commodity *currency); gnc_commodity * gnc_get_euro (void); -#endif /* __EURO_UTILS_H__ */ +#endif /* EURO_UTILS_H */ /************************** END OF FILE *************************/ diff --git a/src/FileBox.h b/src/FileBox.h index a7f6e4a3a8..4b7da6f2d5 100644 --- a/src/FileBox.h +++ b/src/FileBox.h @@ -22,8 +22,8 @@ * Huntington Beach, CA 92648-4632 * \********************************************************************/ -#ifndef __FILEBOX_H__ -#define __FILEBOX_H__ +#ifndef FILEBOX_H +#define FILEBOX_H #include "config.h" diff --git a/src/FileDialog.h b/src/FileDialog.h index 76d53f8a52..cbe8a88272 100644 --- a/src/FileDialog.h +++ b/src/FileDialog.h @@ -116,8 +116,8 @@ * Derived from Rob Clark's original MainWindow.c code, Dec 1998 */ -#ifndef __GNC_FILE_DIALOG_H__ -#define __GNC_FILE_DIALOG_H__ +#ifndef GNC_FILE_DIALOG_H +#define GNC_FILE_DIALOG_H #include "config.h" @@ -142,4 +142,4 @@ Account *gncGetTemplateAccount(void); GNCBook *gncGetCurrentBook (void); -#endif /* __GNC_FILE_DIALOG_H__ */ +#endif /* GNC_FILE_DIALOG_H */ diff --git a/src/MultiLedger.h b/src/MultiLedger.h index be52978d3d..51f4694f75 100644 --- a/src/MultiLedger.h +++ b/src/MultiLedger.h @@ -21,8 +21,8 @@ * * \********************************************************************/ -#ifndef __MULTI_LEDGER_H__ -#define __MULTI_LEDGER_H__ +#ifndef MULTI_LEDGER_H +#define MULTI_LEDGER_H #include "config.h" @@ -121,6 +121,6 @@ void xaccLedgerDisplayClose (xaccLedgerDisplay * ledger_display); /* close all ledger windows containing this account. */ void xaccDestroyLedgerDisplay (Account *account); -#endif /* __MULTI_LEDGER_H__ */ +#endif /* MULTI_LEDGER_H */ /************************** END OF FILE *************************/ diff --git a/src/RecnWindow.h b/src/RecnWindow.h index c246bb5fda..9794a6f66f 100644 --- a/src/RecnWindow.h +++ b/src/RecnWindow.h @@ -23,8 +23,8 @@ * Huntington Beach, CA 92648-4632 * \********************************************************************/ -#ifndef __RECONCILE_H__ -#define __RECONCILE_H__ +#ifndef RECONCILE_H +#define RECONCILE_H #include "config.h" diff --git a/src/RegWindow.h b/src/RegWindow.h index 4de6948e41..cf97700b8f 100644 --- a/src/RegWindow.h +++ b/src/RegWindow.h @@ -23,8 +23,8 @@ * Huntington Beach, CA 92648-4632 * \********************************************************************/ -#ifndef __REGWINDOW_H__ -#define __REGWINDOW_H__ +#ifndef REGWINDOW_H +#define REGWINDOW_H #include "config.h" diff --git a/src/SplitLedger.h b/src/SplitLedger.h index 386a5207d0..35466ca1c3 100644 --- a/src/SplitLedger.h +++ b/src/SplitLedger.h @@ -21,8 +21,8 @@ * * \********************************************************************/ -#ifndef __XACC_SPLIT_LEDGER_H__ -#define __XACC_SPLIT_LEDGER_H__ +#ifndef XACC_SPLIT_LEDGER_H +#define XACC_SPLIT_LEDGER_H #include @@ -241,4 +241,4 @@ void gnc_copy_trans_onto_trans(Transaction *from, Transaction *to, gboolean do_commit); -#endif /* __XACC_SPLIT_LEDGER_H__ */ +#endif /* XACC_SPLIT_LEDGER_H */ diff --git a/src/calculation/fin_spl_protos.h b/src/calculation/fin_spl_protos.h index 3d2db93bca..d1310c71da 100644 --- a/src/calculation/fin_spl_protos.h +++ b/src/calculation/fin_spl_protos.h @@ -19,8 +19,8 @@ * ***************************************************************************/ -#ifndef __FIN_SPL_PROTOS_H__ -#define __FIN_SPL_PROTOS_H__ +#ifndef FIN_SPL_PROTOS_H +#define FIN_SPL_PROTOS_H /*==================================================*/ /* expression_parser.c */ diff --git a/src/calculation/finproto.h b/src/calculation/finproto.h index 82cd2b8863..719a1b0170 100644 --- a/src/calculation/finproto.h +++ b/src/calculation/finproto.h @@ -19,8 +19,8 @@ * ***************************************************************************/ -#ifndef __FINPROTO_H__ -#define __FINPROTO_H__ +#ifndef FINPROTO_H +#define FINPROTO_H #include diff --git a/src/calculation/finvar.h b/src/calculation/finvar.h index 08da85e339..379c79efb2 100644 --- a/src/calculation/finvar.h +++ b/src/calculation/finvar.h @@ -19,8 +19,8 @@ * ***************************************************************************/ -#ifndef __FINVAR_H__ -#define __FINVAR_H__ +#ifndef FINVAR_H +#define FINVAR_H #if !defined( EOS ) #define EOS '\x000' diff --git a/src/calculation/numeric_ops.h b/src/calculation/numeric_ops.h index 9f82d4e2a0..a5911baa33 100644 --- a/src/calculation/numeric_ops.h +++ b/src/calculation/numeric_ops.h @@ -19,8 +19,8 @@ * ***************************************************************************/ -#ifndef __NUMERIC_OPS_H__ -#define __NUMERIC_OPS_H__ +#ifndef NUMERIC_OPS_H +#define NUMERIC_OPS_H void *trans_numeric(const char *str, /* pointer to string to translate */ char radix_point, /* radix character */ diff --git a/src/engine/Account.h b/src/engine/Account.h index f25ed88892..dfe605c97f 100644 --- a/src/engine/Account.h +++ b/src/engine/Account.h @@ -22,8 +22,8 @@ * * \********************************************************************/ -#ifndef __XACC_ACCOUNT_H__ -#define __XACC_ACCOUNT_H__ +#ifndef XACC_ACCOUNT_H +#define XACC_ACCOUNT_H #include "config.h" @@ -402,4 +402,4 @@ xaccAccountFindTransByDesc(Account *account, const char *description); Split * xaccAccountFindSplitByDesc(Account *account, const char *description); -#endif /* __XACC_ACCOUNT_H__ */ +#endif /* XACC_ACCOUNT_H */ diff --git a/src/engine/AccountP.h b/src/engine/AccountP.h index 0a67179eb7..255c4d96b5 100644 --- a/src/engine/AccountP.h +++ b/src/engine/AccountP.h @@ -39,8 +39,8 @@ * */ -#ifndef __XACC_ACCOUNT_P_H__ -#define __XACC_ACCOUNT_P_H__ +#ifndef XACC_ACCOUNT_P_H +#define XACC_ACCOUNT_P_H #include "config.h" @@ -215,4 +215,4 @@ void xaccFreeAccount (Account *account); void xaccAccountSetVersion (Account*, gint32); gint32 xaccAccountGetVersion (Account*); -#endif /* __XACC_ACCOUNT_P_H__ */ +#endif /* XACC_ACCOUNT_P_H */ diff --git a/src/engine/Backend.h b/src/engine/Backend.h index 6283713276..ef861e1ae1 100644 --- a/src/engine/Backend.h +++ b/src/engine/Backend.h @@ -34,8 +34,8 @@ * the GUI & other front-end users. This file defines these errors. */ -#ifndef __XACC_BACKEND_H__ -#define __XACC_BACKEND_H__ +#ifndef XACC_BACKEND_H +#define XACC_BACKEND_H #include "config.h" @@ -89,4 +89,4 @@ typedef enum { } GNCBackendError; /* NOTE: if you modify GNCBackendError, please update src/scm/gnc.gwp */ -#endif /* __XACC_BACKEND_H__ */ +#endif /* XACC_BACKEND_H */ diff --git a/src/engine/BackendP.h b/src/engine/BackendP.h index cdaeea052d..4fc6d6c51e 100644 --- a/src/engine/BackendP.h +++ b/src/engine/BackendP.h @@ -37,8 +37,8 @@ * */ -#ifndef __XACC_BACKEND_P_H__ -#define __XACC_BACKEND_P_H__ +#ifndef XACC_BACKEND_P_H +#define XACC_BACKEND_P_H #include "config.h" @@ -225,4 +225,4 @@ Backend * xaccGNCBookGetBackend (GNCBook *book); void xaccPriceDBSetBackend (GNCPriceDB *prdb, Backend *be); Backend * xaccPriceDBGetBackend (GNCPriceDB *prdb); -#endif /* __XACC_BACKEND_P_H__ */ +#endif /* XACC_BACKEND_P_H */ diff --git a/src/engine/DateUtils.h b/src/engine/DateUtils.h index 605be1d2ae..a70de67c93 100644 --- a/src/engine/DateUtils.h +++ b/src/engine/DateUtils.h @@ -21,8 +21,8 @@ * * \********************************************************************/ -#ifndef __XACC_DATE_UTILS_H__ -#define __XACC_DATE_UTILS_H__ +#ifndef XACC_DATE_UTILS_H +#define XACC_DATE_UTILS_H #include @@ -31,7 +31,7 @@ char * xaccDateUtilGetStamp (time_t thyme); char * xaccDateUtilGetStampNow (void); -#endif /* __XACC_DATE_UTILS_H__ */ +#endif /* XACC_DATE_UTILS_H */ /************************ END OF ************************************\ \************************* FILE *************************************/ diff --git a/src/engine/GNCId.h b/src/engine/GNCId.h index 0ab9a31547..c4192e7bff 100644 --- a/src/engine/GNCId.h +++ b/src/engine/GNCId.h @@ -21,8 +21,8 @@ * * \********************************************************************/ -#ifndef __GNC_ID_H__ -#define __GNC_ID_H__ 1 +#ifndef GNC_ID_H +#define GNC_ID_H 1 /* This file defines an API for using gnucash entity identifiers. * diff --git a/src/engine/GNCIdP.h b/src/engine/GNCIdP.h index 65c988e662..2d1dafb22b 100644 --- a/src/engine/GNCIdP.h +++ b/src/engine/GNCIdP.h @@ -21,8 +21,8 @@ * * \********************************************************************/ -#ifndef __GNC_ID_P_H__ -#define __GNC_ID_P_H__ 1 +#ifndef GNC_ID_P_H +#define GNC_ID_P_H 1 #include "GNCId.h" diff --git a/src/engine/Group.h b/src/engine/Group.h index 2f970d3cbb..03a1eea490 100644 --- a/src/engine/Group.h +++ b/src/engine/Group.h @@ -22,8 +22,8 @@ * * \********************************************************************/ -#ifndef __XACC_ACCOUNT_GROUP_H__ -#define __XACC_ACCOUNT_GROUP_H__ +#ifndef XACC_ACCOUNT_GROUP_H +#define XACC_ACCOUNT_GROUP_H #include "config.h" @@ -366,4 +366,4 @@ xaccGroupVisitUnvisitedTransactions(AccountGroup *g, void *data, GHashTable *visited_txns); -#endif /* __XACC_ACCOUNT_GROUP_H__ */ +#endif /* XACC_ACCOUNT_GROUP_H */ diff --git a/src/engine/GroupP.h b/src/engine/GroupP.h index 13dd72f42b..d239475d84 100644 --- a/src/engine/GroupP.h +++ b/src/engine/GroupP.h @@ -33,8 +33,8 @@ * */ -#ifndef __XACC_ACCOUNT_GROUP_P_H__ -#define __XACC_ACCOUNT_GROUP_P_H__ +#ifndef XACC_ACCOUNT_GROUP_P_H +#define XACC_ACCOUNT_GROUP_P_H #include "config.h" @@ -60,4 +60,4 @@ struct _account_group gnc_numeric balance; }; -#endif /* __XACC_ACCOUNT_GROUP_P_H__ */ +#endif /* XACC_ACCOUNT_GROUP_P_H */ diff --git a/src/engine/NetIO.h b/src/engine/NetIO.h index fcd744be14..85fd08b2dc 100644 --- a/src/engine/NetIO.h +++ b/src/engine/NetIO.h @@ -22,11 +22,11 @@ \********************************************************************/ -#ifndef __XACC_NET_IO_H__ -#define __XACC_NET_IO_H__ +#ifndef XACC_NET_IO_H +#define XACC_NET_IO_H #include "BackendP.h" Backend * xmlendNew (void); -#endif /* __XACC_NET_IO_H__ */ +#endif /* XACC_NET_IO_H */ diff --git a/src/engine/Query.h b/src/engine/Query.h index 7bfa6c3155..a0478759fd 100644 --- a/src/engine/Query.h +++ b/src/engine/Query.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __GNUCASH_QUERY_H__ -#define __GNUCASH_QUERY_H__ +#ifndef GNUCASH_QUERY_H +#define GNUCASH_QUERY_H #include #include diff --git a/src/engine/Queue.h b/src/engine/Queue.h index 816c4bef76..a1b20b0793 100644 --- a/src/engine/Queue.h +++ b/src/engine/Queue.h @@ -62,8 +62,8 @@ * Copyright (c) 1999, 2000 Linas Vepstas */ -#ifndef __XACC_QUEUE_H__ -#define __XACC_QUEUE_H__ +#ifndef XACC_QUEUE_H +#define XACC_QUEUE_H #include "Transaction.h" @@ -107,4 +107,4 @@ double xaccQueuePopTailValue (Queue *, double); double xaccQueueGetValue (Queue *); double xaccQueueGetShares (Queue *); -#endif /* __XACC_QUEUE_H__ */ +#endif /* XACC_QUEUE_H */ diff --git a/src/engine/Scrub.h b/src/engine/Scrub.h index f3c66bf8fd..e725a3fb6c 100644 --- a/src/engine/Scrub.h +++ b/src/engine/Scrub.h @@ -34,8 +34,8 @@ * Copyright (c) 1998, 1999, 2000 Linas Vepstas */ -#ifndef __XACC_SCRUB_H__ -#define __XACC_SCRUB_H__ +#ifndef XACC_SCRUB_H +#define XACC_SCRUB_H #include "Account.h" #include "Group.h" @@ -83,4 +83,4 @@ void xaccAccountScrubImbalance (Account *acc); void xaccAccountTreeScrubImbalance (Account *acc); void xaccGroupScrubImbalance (AccountGroup *grp); -#endif /* __XACC_SCRUB_H__ */ +#endif /* XACC_SCRUB_H */ diff --git a/src/engine/TransLog.h b/src/engine/TransLog.h index 249860073e..583c001b3a 100644 --- a/src/engine/TransLog.h +++ b/src/engine/TransLog.h @@ -21,8 +21,8 @@ * * \********************************************************************/ -#ifndef __XACC_TRANS_LOG_H__ -#define __XACC_TRANS_LOG_H__ +#ifndef XACC_TRANS_LOG_H +#define XACC_TRANS_LOG_H #include "config.h" @@ -42,5 +42,5 @@ void xaccLogDisable (void); */ void xaccLogSetBaseName (const char *); -#endif /* __XACC_TRANS_LOG_H__ */ +#endif /* XACC_TRANS_LOG_H */ diff --git a/src/engine/Transaction.h b/src/engine/Transaction.h index f0ccc85a9d..47f72f7830 100644 --- a/src/engine/Transaction.h +++ b/src/engine/Transaction.h @@ -22,8 +22,8 @@ * * \********************************************************************/ -#ifndef __XACC_TRANSACTION_H__ -#define __XACC_TRANSACTION_H__ +#ifndef XACC_TRANSACTION_H +#define XACC_TRANSACTION_H #include "config.h" @@ -569,4 +569,4 @@ Split * xaccSplitGetOtherSplit (Split *split); */ int xaccIsPeerSplit (Split *split_1, Split *split_2); -#endif /* __XACC_TRANSACTION_H__ */ +#endif /* XACC_TRANSACTION_H */ diff --git a/src/engine/TransactionP.h b/src/engine/TransactionP.h index 4449c2d4b1..eefa1d7272 100644 --- a/src/engine/TransactionP.h +++ b/src/engine/TransactionP.h @@ -42,8 +42,8 @@ * */ -#ifndef __XACC_TRANSACTION_P_H__ -#define __XACC_TRANSACTION_P_H__ +#ifndef XACC_TRANSACTION_P_H +#define XACC_TRANSACTION_P_H #include #include @@ -226,4 +226,4 @@ gnc_numeric xaccSplitsComputeValue (GList *splits, Split * skip_me, void xaccTransSetVersion (Transaction*, gint32); gint32 xaccTransGetVersion (Transaction*); -#endif /* __XACC_TRANSACTION_P_H__ */ +#endif /* XACC_TRANSACTION_P_H */ diff --git a/src/engine/date.h b/src/engine/date.h index 13f2ad5133..cb0165d788 100644 --- a/src/engine/date.h +++ b/src/engine/date.h @@ -28,8 +28,8 @@ * If a file-io thing needs date handling, it should do it itself, * instead of depending on the routines here. */ -#ifndef __XACC_DATE_H__ -#define __XACC_DATE_H__ +#ifndef XACC_DATE_H +#define XACC_DATE_H #include @@ -201,4 +201,4 @@ char * gnc_timespec_to_iso8601_buff (Timespec ts, char * buff); */ long int gnc_timezone (struct tm *tm); -#endif /* __XACC_DATE_H__ */ +#endif /* XACC_DATE_H */ diff --git a/src/engine/gnc-book-p.h b/src/engine/gnc-book-p.h index 4014bea5ea..fb0f3689a1 100644 --- a/src/engine/gnc-book-p.h +++ b/src/engine/gnc-book-p.h @@ -26,8 +26,8 @@ * Copyright (c) 2001 Rob Browning */ -#ifndef __GNC_BOOK_P_H__ -#define __GNC_BOOK_P_H__ +#ifndef GNC_BOOK_P_H +#define GNC_BOOK_P_H #include "gnc-book.h" #include "gnc-pricedb.h" @@ -38,4 +38,4 @@ void gnc_book_set_pricedb(GNCBook *book, GNCPriceDB *db); void gnc_book_mark_saved(GNCBook *book); -#endif /* __GNC_BOOK_P_H__ */ +#endif /* GNC_BOOK_P_H */ diff --git a/src/engine/gnc-book.h b/src/engine/gnc-book.h index d67484dade..f96d5a4fd2 100644 --- a/src/engine/gnc-book.h +++ b/src/engine/gnc-book.h @@ -50,8 +50,8 @@ * Copyright (c) 2000 Dave Peticolas */ -#ifndef __GNC_BOOK_H__ -#define __GNC_BOOK_H__ +#ifndef GNC_BOOK_H +#define GNC_BOOK_H #include "Group.h" #include "Backend.h" @@ -217,4 +217,4 @@ GNCBookFileType gnc_book_determine_file_type(GNCBook *book); /* Run the RPC Server */ void gnc_run_rpc_server (void); -#endif /* __GNC_BOOK_H__ */ +#endif /* GNC_BOOK_H */ diff --git a/src/engine/gnc-commodity.h b/src/engine/gnc-commodity.h index 612d25fd48..5d6b24b541 100644 --- a/src/engine/gnc-commodity.h +++ b/src/engine/gnc-commodity.h @@ -21,8 +21,8 @@ * * *******************************************************************/ -#ifndef __GNC_COMMODITY_H__ -#define __GNC_COMMODITY_H__ +#ifndef GNC_COMMODITY_H +#define GNC_COMMODITY_H #include diff --git a/src/engine/gnc-common.h b/src/engine/gnc-common.h index 131c581530..d4469eaf45 100644 --- a/src/engine/gnc-common.h +++ b/src/engine/gnc-common.h @@ -22,8 +22,8 @@ * * \********************************************************************/ -#ifndef __GNC_COMMON_H__ -#define __GNC_COMMON_H__ +#ifndef GNC_COMMON_H +#define GNC_COMMON_H #include "config.h" #include diff --git a/src/engine/gnc-engine-util.h b/src/engine/gnc-engine-util.h index 376d1f2f55..90abd2639d 100644 --- a/src/engine/gnc-engine-util.h +++ b/src/engine/gnc-engine-util.h @@ -24,8 +24,8 @@ * Author: Linas Vepstas (linas@linas.org) * \********************************************************************/ -#ifndef __GNC_ENGINE_UTIL_H__ -#define __GNC_ENGINE_UTIL_H__ +#ifndef GNC_ENGINE_UTIL_H +#define GNC_ENGINE_UTIL_H #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/engine/gnc-engine.h b/src/engine/gnc-engine.h index da473e039b..52b8ab5a86 100644 --- a/src/engine/gnc-engine.h +++ b/src/engine/gnc-engine.h @@ -21,8 +21,8 @@ * * ********************************************************************/ -#ifndef __GNC_ENGINE_H__ -#define __GNC_ENGINE_H__ +#ifndef GNC_ENGINE_H +#define GNC_ENGINE_H #include "gnc-commodity.h" diff --git a/src/engine/gnc-event-p.h b/src/engine/gnc-event-p.h index 9085a76232..19a1431e44 100644 --- a/src/engine/gnc-event-p.h +++ b/src/engine/gnc-event-p.h @@ -21,8 +21,8 @@ * * ********************************************************************/ -#ifndef __GNC_EVENT_P_H__ -#define __GNC_EVENT_P_H__ +#ifndef GNC_EVENT_P_H +#define GNC_EVENT_P_H #include "gnc-event.h" diff --git a/src/engine/gnc-event.h b/src/engine/gnc-event.h index ca2ba5ea5c..bdf51a3b71 100644 --- a/src/engine/gnc-event.h +++ b/src/engine/gnc-event.h @@ -21,8 +21,8 @@ * * ********************************************************************/ -#ifndef __GNC_EVENT_H__ -#define __GNC_EVENT_H__ +#ifndef GNC_EVENT_H +#define GNC_EVENT_H #include diff --git a/src/engine/gnc-numeric.h b/src/engine/gnc-numeric.h index 745960d6d9..3d1c50dc18 100644 --- a/src/engine/gnc-numeric.h +++ b/src/engine/gnc-numeric.h @@ -21,8 +21,8 @@ * * *******************************************************************/ -#ifndef __GNC_NUMERIC_H__ -#define __GNC_NUMERIC_H__ +#ifndef GNC_NUMERIC_H +#define GNC_NUMERIC_H #include diff --git a/src/engine/gnc-pricedb-p.h b/src/engine/gnc-pricedb-p.h index 588bb76144..59a37a09ab 100644 --- a/src/engine/gnc-pricedb-p.h +++ b/src/engine/gnc-pricedb-p.h @@ -21,8 +21,8 @@ * * *******************************************************************/ -#ifndef __GNC_PRICEDB_P_H__ -#define __GNC_PRICEDB_P_H__ +#ifndef GNC_PRICEDB_P_H +#define GNC_PRICEDB_P_H #include diff --git a/src/engine/gnc-pricedb.h b/src/engine/gnc-pricedb.h index 44f49f059f..f2cda1c87b 100644 --- a/src/engine/gnc-pricedb.h +++ b/src/engine/gnc-pricedb.h @@ -21,8 +21,8 @@ * * *******************************************************************/ -#ifndef __GNC_PRICEDB_H__ -#define __GNC_PRICEDB_H__ +#ifndef GNC_PRICEDB_H +#define GNC_PRICEDB_H #include "date.h" #include "gnc-numeric.h" diff --git a/src/engine/gnc-xml.h b/src/engine/gnc-xml.h index 64cf8f1549..b51da9ea44 100644 --- a/src/engine/gnc-xml.h +++ b/src/engine/gnc-xml.h @@ -22,8 +22,8 @@ * * \********************************************************************/ -#ifndef __GNC_XML_H__ -#define __GNC_XML_H__ +#ifndef GNC_XML_H +#define GNC_XML_H #include "config.h" @@ -61,4 +61,4 @@ sixtp* gnc_freqSpec_sixtp_parser_create(void); sixtp* gnc_template_transaction_sixtp_parser_create(void); -#endif /* __GNC_XML_H__ */ +#endif /* GNC_XML_H */ diff --git a/src/engine/guid.h b/src/engine/guid.h index 687d2bfe45..9428530568 100644 --- a/src/engine/guid.h +++ b/src/engine/guid.h @@ -21,8 +21,8 @@ * * \********************************************************************/ -#ifndef __GUID_H__ -#define __GUID_H__ +#ifndef GUID_H +#define GUID_H #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/src/engine/io-example-account.h b/src/engine/io-example-account.h index 076f02d2e2..b5597a76b6 100644 --- a/src/engine/io-example-account.h +++ b/src/engine/io-example-account.h @@ -22,8 +22,8 @@ * * \********************************************************************/ -#ifndef __IO_EXAMPLE_ACCOUNT_H__ -#define __IO_EXAMPLE_ACCOUNT_H__ +#ifndef IO_EXAMPLE_ACCOUNT_H +#define IO_EXAMPLE_ACCOUNT_H #include @@ -58,4 +58,4 @@ GSList* gnc_load_example_account_list(const char *dirname); gboolean gnc_is_example_account_xml(const gchar *name); -#endif /* __IO_EXAMPLE_ACCOUNT_H__ */ +#endif /* IO_EXAMPLE_ACCOUNT_H */ diff --git a/src/engine/io-gncbin.h b/src/engine/io-gncbin.h index b57ea1960d..d9f522ca55 100644 --- a/src/engine/io-gncbin.h +++ b/src/engine/io-gncbin.h @@ -27,8 +27,8 @@ * Huntington Beach, CA 92648-4632 * \********************************************************************/ -#ifndef __IO_GNCBIN_H__ -#define __IO_GNCBIN_H__ +#ifndef IO_GNCBIN_H +#define IO_GNCBIN_H #include "Backend.h" #include "gnc-book.h" @@ -53,4 +53,4 @@ void gnc_book_load_from_binfile(GNCBook *book); GNCBackendError gnc_book_get_binfile_io_error(void); -#endif /* __IO_GNCBIN_H__ */ +#endif /* IO_GNCBIN_H */ diff --git a/src/engine/io-gncxml-gen.h b/src/engine/io-gncxml-gen.h index be42321038..17a55f6238 100644 --- a/src/engine/io-gncxml-gen.h +++ b/src/engine/io-gncxml-gen.h @@ -22,8 +22,8 @@ * * \********************************************************************/ -#ifndef __IO_GNCXML_GEN_H__ -#define __IO_GNCXML_GEN_H__ +#ifndef IO_GNCXML_GEN_H +#define IO_GNCXML_GEN_H #include #include "sixtp.h" @@ -43,4 +43,4 @@ gboolean gnc_xml_parse_file(sixtp *top_parser, const char *filename, gxpf_callback callback, gpointer data); -#endif /* __IO_GNCXML_GEN_H__ */ +#endif /* IO_GNCXML_GEN_H */ diff --git a/src/engine/io-gncxml-p.h b/src/engine/io-gncxml-p.h index c78b60a6e6..713c6e54c2 100644 --- a/src/engine/io-gncxml-p.h +++ b/src/engine/io-gncxml-p.h @@ -22,8 +22,8 @@ * * ********************************************************************/ -#ifndef __IO_GNCXML_P_H__ -#define __IO_GNCXML_P_H__ +#ifndef IO_GNCXML_P_H +#define IO_GNCXML_P_H #include "sixtp.h" #include "io-gncxml.h" diff --git a/src/engine/io-gncxml.h b/src/engine/io-gncxml.h index d59666c68d..d0b96e8349 100644 --- a/src/engine/io-gncxml.h +++ b/src/engine/io-gncxml.h @@ -29,8 +29,8 @@ * Tuneups by James LewisMoss Dec 2000 */ -#ifndef __IO_GNCXML_H__ -#define __IO_GNCXML_H__ +#ifndef IO_GNCXML_H +#define IO_GNCXML_H #include @@ -48,4 +48,4 @@ gboolean gnc_book_load_from_xml_file(GNCBook *book); */ gboolean gnc_is_xml_data_file(const gchar *name); -#endif /* __IO_GNCXML_H__ */ +#endif /* IO_GNCXML_H */ diff --git a/src/engine/io-utils.h b/src/engine/io-utils.h index ceb3269eb9..4406b168d1 100644 --- a/src/engine/io-utils.h +++ b/src/engine/io-utils.h @@ -22,8 +22,8 @@ * * \********************************************************************/ -#ifndef __IO_UTILS_H__ -#define __IO_UTILS_H__ +#ifndef IO_UTILS_H +#define IO_UTILS_H #include @@ -37,4 +37,4 @@ void write_commodities(FILE *out, GNCBook *book); void write_emacs_trailer(FILE *out); -#endif /* __IO_UTILS_H__ */ +#endif /* IO_UTILS_H */ diff --git a/src/engine/kvp_frame.h b/src/engine/kvp_frame.h index dff736bbc6..7fce4d5708 100644 --- a/src/engine/kvp_frame.h +++ b/src/engine/kvp_frame.h @@ -21,8 +21,8 @@ * * \********************************************************************/ -#ifndef __KVP_FRAME_H__ -#define __KVP_FRAME_H__ +#ifndef KVP_FRAME_H +#define KVP_FRAME_H #include diff --git a/src/engine/sql/PostgresBackend.h b/src/engine/sql/PostgresBackend.h index e743492330..44d2c859a6 100644 --- a/src/engine/sql/PostgresBackend.h +++ b/src/engine/sql/PostgresBackend.h @@ -31,8 +31,8 @@ */ -#ifndef __POSTGRES_BACKEND_H__ -#define __POSTGRES_BACKEND_H__ +#ifndef POSTGRES_BACKEND_H +#define POSTGRES_BACKEND_H #include @@ -138,4 +138,4 @@ void pgendStoreAuditTransaction (PGBackend *be, Transaction *ptr, sqlBuild_QType int pgendTransactionGetDeletedVersion (PGBackend *be, Transaction *ptr); -#endif /* __POSTGRES_BACKEND_H__ */ +#endif /* POSTGRES_BACKEND_H */ diff --git a/src/engine/sql/account.h b/src/engine/sql/account.h index 7268c8eeff..47944caa70 100644 --- a/src/engine/sql/account.h +++ b/src/engine/sql/account.h @@ -21,8 +21,8 @@ \********************************************************************/ -#ifndef __POSTGRES_ACCOUNT_H__ -#define __POSTGRES_ACCOUNT_H__ +#ifndef POSTGRES_ACCOUNT_H +#define POSTGRES_ACCOUNT_H #include "Group.h" #include "guid.h" @@ -37,4 +37,4 @@ int pgendCopyAccountToEngine (PGBackend *be, const GUID *acct_guid); void pgend_account_commit_edit (Backend * bend, Account * acct); -#endif /* __POSTGRES_ACCOUNT_H__ */ +#endif /* POSTGRES_ACCOUNT_H */ diff --git a/src/engine/sql/builder.h b/src/engine/sql/builder.h index 2f932283e3..c8f8518560 100644 --- a/src/engine/sql/builder.h +++ b/src/engine/sql/builder.h @@ -35,8 +35,8 @@ * Linas Vepstas January 2001 */ -#ifndef __SQL_BUILDER_H__ -#define __SQL_BUILDER_H__ +#ifndef SQL_BUILDER_H +#define SQL_BUILDER_H #include "date.h" #include "guid.h" @@ -89,5 +89,5 @@ void sqlBuild_Where_Int32 (sqlBuilder *b, const char *tag, gint32 val); const char *sqlBuild_Query (sqlBuilder *b); -#endif /* __SQL_BUILDER_H__ */ +#endif /* SQL_BUILDER_H */ diff --git a/src/engine/sql/checkpoint.h b/src/engine/sql/checkpoint.h index 912b4f2916..0803fa595a 100644 --- a/src/engine/sql/checkpoint.h +++ b/src/engine/sql/checkpoint.h @@ -31,8 +31,8 @@ */ -#ifndef __CHECKPOINT_H__ -#define __CHECKPOINT_H__ +#ifndef CHECKPOINT_H +#define CHECKPOINT_H #include "Account.h" #include "Group.h" @@ -88,4 +88,4 @@ void pgendGroupGetAllBalances (PGBackend *, AccountGroup *, Timespec as_of_date) */ void pgendAccountGetBalance (PGBackend *, Account *, Timespec as_of_date); -#endif /* __CHECKPOINT_H__ */ +#endif /* CHECKPOINT_H */ diff --git a/src/engine/sql/escape.h b/src/engine/sql/escape.h index e914d289be..21c46530d0 100644 --- a/src/engine/sql/escape.h +++ b/src/engine/sql/escape.h @@ -31,8 +31,8 @@ * Linas Vepstas January 2001 */ -#ifndef __SQL_ESCAPE_H__ -#define __SQL_ESCAPE_H__ +#ifndef SQL_ESCAPE_H +#define SQL_ESCAPE_H typedef struct _escape sqlEscape; @@ -41,5 +41,5 @@ void sqlEscape_destroy (sqlEscape *); const char * sqlEscapeString (sqlEscape *, const char *orig_string); -#endif /* __SQL_ESCAPE_H__ */ +#endif /* SQL_ESCAPE_H */ diff --git a/src/engine/sql/events.h b/src/engine/sql/events.h index f1c01f77bb..2c0414aa15 100644 --- a/src/engine/sql/events.h +++ b/src/engine/sql/events.h @@ -31,8 +31,8 @@ */ -#ifndef __POSTGRES_EVENTS_H__ -#define __POSTGRES_EVENTS_H__ +#ifndef POSTGRES_EVENTS_H +#define POSTGRES_EVENTS_H #include "Backend.h" #include "PostgresBackend.h" @@ -44,4 +44,4 @@ void pgendSessionGetPid (PGBackend *); void pgendSessionSetupNotifies (PGBackend *); -#endif /* __POSTGRES_EVENTS_H__ */ +#endif /* POSTGRES_EVENTS_H */ diff --git a/src/engine/sql/gncquery.h b/src/engine/sql/gncquery.h index 7eb4f2b783..b0caca8b39 100644 --- a/src/engine/sql/gncquery.h +++ b/src/engine/sql/gncquery.h @@ -41,8 +41,8 @@ */ -#ifndef __GNC_QUERY_H__ -#define __GNC_QUERY_H__ +#ifndef GNC_QUERY_H +#define GNC_QUERY_H #include "Query.h" @@ -55,4 +55,4 @@ void sql_Query_destroy (sqlQuery *); const char *sqlQuery_build (sqlQuery *, Query *); -#endif /* __GNC_QUERY_H__ */ +#endif /* GNC_QUERY_H */ diff --git a/src/engine/sql/kvp-sql.h b/src/engine/sql/kvp-sql.h index 123f4f38ab..1fd383a3e9 100644 --- a/src/engine/sql/kvp-sql.h +++ b/src/engine/sql/kvp-sql.h @@ -31,8 +31,8 @@ * Copyright (c) 2001 Linas Vepstas */ -#ifndef __KVP_SQL_H__ -#define __KVP_SQL_H__ +#ifndef KVP_SQL_H +#define KVP_SQL_H #include "kvp_frame.h" #include "guid.h" @@ -67,4 +67,4 @@ void pgendKVPDeleteStr (PGBackend *, const char *guid_string); kvp_frame * pgendKVPFetch (PGBackend *, const GUID *, kvp_frame *); -#endif /* __KVP_SQL_H__ */ +#endif /* KVP_SQL_H */ diff --git a/src/engine/sql/price.h b/src/engine/sql/price.h index 3652d1c524..0503bb496c 100644 --- a/src/engine/sql/price.h +++ b/src/engine/sql/price.h @@ -21,8 +21,8 @@ \********************************************************************/ -#ifndef __POSTGRES_PRICE_H__ -#define __POSTGRES_PRICE_H__ +#ifndef POSTGRES_PRICE_H +#define POSTGRES_PRICE_H #include "PostgresBackend.h" @@ -36,4 +36,4 @@ void pgendPriceLookup (Backend *bend, GNCPriceLookup *look); void pgend_price_begin_edit (Backend * bend, GNCPrice *pr); void pgend_price_commit_edit (Backend * bend, GNCPrice *pr); -#endif /* __POSTGRES_PRICE_H__ */ +#endif /* POSTGRES_PRICE_H */ diff --git a/src/engine/sql/putil.h b/src/engine/sql/putil.h index ae5316b723..efec522c2f 100644 --- a/src/engine/sql/putil.h +++ b/src/engine/sql/putil.h @@ -31,8 +31,8 @@ * */ -#ifndef __P_UTIL_H__ -#define __P_UTIL_H__ +#ifndef P_UTIL_H +#define P_UTIL_H #include #include @@ -313,6 +313,6 @@ gnc_commodity * gnc_string_to_commodity (const char *str); } -#endif /* __P_UTIL_H__ */ +#endif /* P_UTIL_H */ /* ======================== END OF FILE ======================== */ diff --git a/src/engine/sql/txn.h b/src/engine/sql/txn.h index 0e2aba3054..005b6f5a9e 100644 --- a/src/engine/sql/txn.h +++ b/src/engine/sql/txn.h @@ -31,8 +31,8 @@ */ -#ifndef __POSTGRES_TXN_H__ -#define __POSTGRES_TXN_H__ +#ifndef POSTGRES_TXN_H +#define POSTGRES_TXN_H #include @@ -52,4 +52,4 @@ void pgend_trans_rollback_edit (Backend * bend, Transaction * trans); -#endif /* __POSTGRES_TXN_H__ */ +#endif /* POSTGRES_TXN_H */ diff --git a/src/experimental/ofx/parser/pfxBaseTypes.h b/src/experimental/ofx/parser/pfxBaseTypes.h index 3a2c144115..8078c5441b 100644 --- a/src/experimental/ofx/parser/pfxBaseTypes.h +++ b/src/experimental/ofx/parser/pfxBaseTypes.h @@ -8,8 +8,8 @@ // HISTORY: // Written by Linas Vepstas March 1998 -#ifndef __PFX_BASE_TYPES_H__ -#define __PFX_BASE_TYPES_H__ +#ifndef PFX_BASE_TYPES_H +#define PFX_BASE_TYPES_H #include "config.h" #include "DtdParser.h" @@ -48,4 +48,4 @@ class pfxBaseType { } #endif -#endif /* __PFX_BASE_TYPES_H__ */ +#endif /* PFX_BASE_TYPES_H */ diff --git a/src/experimental/ofx/parser/pfxCompTypes.h b/src/experimental/ofx/parser/pfxCompTypes.h index 988887dea7..23dd696923 100644 --- a/src/experimental/ofx/parser/pfxCompTypes.h +++ b/src/experimental/ofx/parser/pfxCompTypes.h @@ -8,8 +8,8 @@ // HISTORY: // Written by Linas Vepstas March 1998 -#ifndef __PFX_COMP_TYPES_H__ -#define __PFX_COMP_TYPES_H__ +#ifndef PFX_COMP_TYPES_H +#define PFX_COMP_TYPES_H #include "config.h" #include "DtdParser.h" @@ -54,4 +54,4 @@ class pfxCompoundType : } #endif -#endif /* __PFX_COMP_TYPES_H__ */ +#endif /* PFX_COMP_TYPES_H */ diff --git a/src/experimental/ofx/parser/pfxLangOut.h b/src/experimental/ofx/parser/pfxLangOut.h index 6f310173be..8019b77a8d 100644 --- a/src/experimental/ofx/parser/pfxLangOut.h +++ b/src/experimental/ofx/parser/pfxLangOut.h @@ -9,8 +9,8 @@ // HISTORY: // Written by Linas Vepstas April 1998 -#ifndef __PFX_COMP_OUT_H__ -#define __PFX_COMP_OUT_H__ +#ifndef PFX_COMP_OUT_H +#define PFX_COMP_OUT_H #include "config.h" #include @@ -104,4 +104,4 @@ class pfxOutConstructor : }; -#endif /* __PFX_COMP_OUT_H__ */ +#endif /* PFX_COMP_OUT_H */ diff --git a/src/experimental/ofx/parser/pfxUtils.h b/src/experimental/ofx/parser/pfxUtils.h index 7530c87b8e..96c4f33eb6 100644 --- a/src/experimental/ofx/parser/pfxUtils.h +++ b/src/experimental/ofx/parser/pfxUtils.h @@ -9,8 +9,8 @@ // Written by Linas Vepstas March 1998 -#ifndef __PFX_UTILS_H__ -#define __PFX_UTILS_H__ +#ifndef PFX_UTILS_H +#define PFX_UTILS_H #include @@ -37,4 +37,4 @@ char * pfxCapLower (char * str); } #endif -#endif /* __PFX_UTILS_H__ */ +#endif /* PFX_UTILS_H */ diff --git a/src/file-history.h b/src/file-history.h index b2b30b243b..02d6e9c3d7 100644 --- a/src/file-history.h +++ b/src/file-history.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __HISTORY_H__ -#define __HISTORY_H__ +#ifndef HISTORY_H +#define HISTORY_H #include #define MAX_HISTORY 4 diff --git a/src/gnc-component-manager.h b/src/gnc-component-manager.h index 9b3fc84969..f70845df2a 100644 --- a/src/gnc-component-manager.h +++ b/src/gnc-component-manager.h @@ -17,8 +17,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * \********************************************************************/ -#ifndef __GNC_COMPONENT_MANAGER_H__ -#define __GNC_COMPONENT_MANAGER_H__ +#ifndef GNC_COMPONENT_MANAGER_H +#define GNC_COMPONENT_MANAGER_H #include diff --git a/src/gnc-exp-parser.h b/src/gnc-exp-parser.h index 9881fab989..fdb5084243 100644 --- a/src/gnc-exp-parser.h +++ b/src/gnc-exp-parser.h @@ -17,8 +17,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * \********************************************************************/ -#ifndef __GNC_EXP_PARSER_H__ -#define __GNC_EXP_PARSER_H__ +#ifndef GNC_EXP_PARSER_H +#define GNC_EXP_PARSER_H #include "config.h" diff --git a/src/gnc-ui-common.h b/src/gnc-ui-common.h index 235cb1b9da..03255db4ef 100644 --- a/src/gnc-ui-common.h +++ b/src/gnc-ui-common.h @@ -22,8 +22,8 @@ * * \********************************************************************/ -#ifndef __GNC_UI_COMMON_H__ -#define __GNC_UI_COMMON_H__ +#ifndef GNC_UI_COMMON_H +#define GNC_UI_COMMON_H #include "config.h" diff --git a/src/gnc-ui-util.h b/src/gnc-ui-util.h index b16917d8b6..8656715138 100644 --- a/src/gnc-ui-util.h +++ b/src/gnc-ui-util.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __GNC_UI_UTIL_H__ -#define __GNC_UI_UTIL_H__ +#ifndef GNC_UI_UTIL_H +#define GNC_UI_UTIL_H #include "config.h" diff --git a/src/gnc-ui.h b/src/gnc-ui.h index e1cfde95cb..0aa7ba6439 100644 --- a/src/gnc-ui.h +++ b/src/gnc-ui.h @@ -18,8 +18,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * \********************************************************************/ -#ifndef __GNC_UI_H__ -#define __GNC_UI_H__ +#ifndef GNC_UI_H +#define GNC_UI_H #include "config.h" diff --git a/src/gnome/account-tree.h b/src/gnome/account-tree.h index 49163c1c5d..f3977f8130 100644 --- a/src/gnome/account-tree.h +++ b/src/gnome/account-tree.h @@ -21,8 +21,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __GNC_ACCOUNT_TREE_H__ -#define __GNC_ACCOUNT_TREE_H__ +#ifndef GNC_ACCOUNT_TREE_H +#define GNC_ACCOUNT_TREE_H #include @@ -167,4 +167,4 @@ void gnc_account_tree_set_selectable_filter (GNCAccountTree *tree, } #endif /* __cplusplus */ -#endif /* __GNC_ACCOUNT_TREE_H__ */ +#endif /* GNC_ACCOUNT_TREE_H */ diff --git a/src/gnome/dialog-account.h b/src/gnome/dialog-account.h index 25137d803c..c679281043 100644 --- a/src/gnome/dialog-account.h +++ b/src/gnome/dialog-account.h @@ -21,8 +21,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __DIALOG_ACCOUNT_H__ -#define __DIALOG_ACCOUNT_H__ +#ifndef DIALOG_ACCOUNT_H +#define DIALOG_ACCOUNT_H #include "AccWindow.h" diff --git a/src/gnome/dialog-options.h b/src/gnome/dialog-options.h index 7d85f86733..8c6f3fc958 100644 --- a/src/gnome/dialog-options.h +++ b/src/gnome/dialog-options.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __OPTIONS_DIALOG_H__ -#define __OPTIONS_DIALOG_H__ +#ifndef OPTIONS_DIALOG_H +#define OPTIONS_DIALOG_H #include #include @@ -55,4 +55,4 @@ void gnc_show_options_dialog(void); void gnc_build_options_dialog_contents(GNCOptionWin *win, GNCOptionDB *odb); -#endif /* __OPTIONS_DIALOG_H__ */ +#endif /* OPTIONS_DIALOG_H */ diff --git a/src/gnome/dialog-progress.h b/src/gnome/dialog-progress.h index 3bdc4a6566..6256778364 100644 --- a/src/gnome/dialog-progress.h +++ b/src/gnome/dialog-progress.h @@ -21,8 +21,8 @@ * * \********************************************************************/ -#ifndef __DIALOG_PROGRESS_H__ -#define __DIALOG_PROGRESS_H__ +#ifndef DIALOG_PROGRESS_H +#define DIALOG_PROGRESS_H #include diff --git a/src/gnome/dialog-style-sheet.h b/src/gnome/dialog-style-sheet.h index f3e9e49f95..a39c315a93 100644 --- a/src/gnome/dialog-style-sheet.h +++ b/src/gnome/dialog-style-sheet.h @@ -21,8 +21,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * ********************************************************************/ -#ifndef __GNC_DIALOG_STYLE_SHEET_H__ -#define __GNC_DIALOG_STYLE_SHEET_H__ +#ifndef GNC_DIALOG_STYLE_SHEET_H +#define GNC_DIALOG_STYLE_SHEET_H typedef struct _stylesheetdialog StyleSheetDialog; diff --git a/src/gnome/dialog-transfer.h b/src/gnome/dialog-transfer.h index 4d932562e8..6003347092 100644 --- a/src/gnome/dialog-transfer.h +++ b/src/gnome/dialog-transfer.h @@ -21,8 +21,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __DIALOG_TRANSFER_H__ -#define __DIALOG_TRANSFER_H__ +#ifndef DIALOG_TRANSFER_H +#define DIALOG_TRANSFER_H #include "Account.h" #include "account-tree.h" diff --git a/src/gnome/dialog-utils.h b/src/gnome/dialog-utils.h index d6b67da91a..003f337a4c 100644 --- a/src/gnome/dialog-utils.h +++ b/src/gnome/dialog-utils.h @@ -22,8 +22,8 @@ * * \********************************************************************/ -#ifndef __DIALOG_UTILS_H__ -#define __DIALOG_UTILS_H__ +#ifndef DIALOG_UTILS_H +#define DIALOG_UTILS_H #include #include diff --git a/src/gnome/druid-commodity.h b/src/gnome/druid-commodity.h index a5762aca08..2dd7ab3f5c 100644 --- a/src/gnome/druid-commodity.h +++ b/src/gnome/druid-commodity.h @@ -21,8 +21,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * ********************************************************************/ -#ifndef __DRUID_COMMODITY_H__ -#define __DRUID_COMMODITY_H__ +#ifndef DRUID_COMMODITY_H +#define DRUID_COMMODITY_H #include diff --git a/src/gnome/druid-utils.h b/src/gnome/druid-utils.h index 872be1d585..d394ef6329 100644 --- a/src/gnome/druid-utils.h +++ b/src/gnome/druid-utils.h @@ -21,8 +21,8 @@ * * \********************************************************************/ -#ifndef __DRUID_UTILS_H__ -#define __DRUID_UTILS_H__ +#ifndef DRUID_UTILS_H +#define DRUID_UTILS_H #include diff --git a/src/gnome/extensions.h b/src/gnome/extensions.h index 1e1ff2deb8..4669ecbaf4 100644 --- a/src/gnome/extensions.h +++ b/src/gnome/extensions.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __EXTENSIONS_H__ -#define __EXTENSIONS_H__ +#ifndef EXTENSIONS_H +#define EXTENSIONS_H #include #include diff --git a/src/gnome/gnc-gpg.h b/src/gnome/gnc-gpg.h index cb774e3483..ad4cc9a75a 100644 --- a/src/gnome/gnc-gpg.h +++ b/src/gnome/gnc-gpg.h @@ -21,8 +21,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * ********************************************************************/ -#ifndef __GNC_GPG_H__ -#define __GNC_GPG_H__ +#ifndef GNC_GPG_H +#define GNC_GPG_H #include diff --git a/src/gnome/gnc-html-guppi.h b/src/gnome/gnc-html-guppi.h index 14d4a74786..5d6a2093a5 100644 --- a/src/gnome/gnc-html-guppi.h +++ b/src/gnome/gnc-html-guppi.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __GNC_HTML_GUPPI_H__ -#define __GNC_HTML_GUPPI_H__ +#ifndef GNC_HTML_GUPPI_H +#define GNC_HTML_GUPPI_H #include #include "gnc-html.h" diff --git a/src/gnome/gnc-html-history.h b/src/gnome/gnc-html-history.h index ae1d435d68..30c07a3971 100644 --- a/src/gnome/gnc-html-history.h +++ b/src/gnome/gnc-html-history.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * ********************************************************************/ -#ifndef __GNC_HTML_HISTORY_H__ -#define __GNC_HTML_HISTORY_H__ +#ifndef GNC_HTML_HISTORY_H +#define GNC_HTML_HISTORY_H typedef struct _gnc_html_history_node gnc_html_history_node; typedef struct _gnc_html_history gnc_html_history; diff --git a/src/gnome/gnc-html.h b/src/gnome/gnc-html.h index e3e776f45b..ab7ae75a99 100644 --- a/src/gnome/gnc-html.h +++ b/src/gnome/gnc-html.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __GNC_HTML_H__ -#define __GNC_HTML_H__ +#ifndef GNC_HTML_H +#define GNC_HTML_H #include #include diff --git a/src/gnome/gnc-http.h b/src/gnome/gnc-http.h index f6e867709f..36f4845601 100644 --- a/src/gnome/gnc-http.h +++ b/src/gnome/gnc-http.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * ********************************************************************/ -#ifndef __GNC_HTTP_H__ -#define __GNC_HTTP_H__ +#ifndef GNC_HTTP_H +#define GNC_HTTP_H #include diff --git a/src/gnome/gnc-network.h b/src/gnome/gnc-network.h index 31c1477ece..38f6ace75a 100644 --- a/src/gnome/gnc-network.h +++ b/src/gnome/gnc-network.h @@ -21,8 +21,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * ********************************************************************/ -#ifndef __GNC_NETWORK_H__ -#define __GNC_NETWORK_H__ +#ifndef GNC_NETWORK_H +#define GNC_NETWORK_H #include "config.h" diff --git a/src/gnome/gnc-splash.h b/src/gnome/gnc-splash.h index 2f9ecc0c32..6125d3c230 100644 --- a/src/gnome/gnc-splash.h +++ b/src/gnome/gnc-splash.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __GNC_SPLASH_H__ -#define __GNC_SPLASH_H__ +#ifndef GNC_SPLASH_H +#define GNC_SPLASH_H void gnc_show_splash_screen (void); diff --git a/src/gnome/gtkselect.h b/src/gnome/gtkselect.h index 5f19a74116..50ba6900f0 100644 --- a/src/gnome/gtkselect.h +++ b/src/gnome/gtkselect.h @@ -25,8 +25,8 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef __GTK_SMART_SELECT_H__ -#define __GTK_SMART_SELECT_H__ +#ifndef GTK_SMART_SELECT_H +#define GTK_SMART_SELECT_H #include #include @@ -112,4 +112,4 @@ gint gtk_select_child_position (GtkSelect *list, } #endif /* __cplusplus */ -#endif /* __GTK_SMART_SELECT_H__ */ +#endif /* GTK_SMART_SELECT_H */ diff --git a/src/gnome/query-user.h b/src/gnome/query-user.h index bc8001b0fb..1ab5cb1597 100644 --- a/src/gnome/query-user.h +++ b/src/gnome/query-user.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __QUERY_USER_H__ -#define __QUERY_USER_H__ +#ifndef QUERY_USER_H +#define QUERY_USER_H // +jsled: for line below. #include "gnc-ui.h" diff --git a/src/gnome/reconcile-list.h b/src/gnome/reconcile-list.h index 104121b6ed..8075e60835 100644 --- a/src/gnome/reconcile-list.h +++ b/src/gnome/reconcile-list.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __GNC_RECONCILE_LIST_H__ -#define __GNC_RECONCILE_LIST_H__ +#ifndef GNC_RECONCILE_LIST_H +#define GNC_RECONCILE_LIST_H #include @@ -114,4 +114,4 @@ void gnc_reconcile_list_set_sort_order(GNCReconcileList *list, } #endif /* __cplusplus */ -#endif /* __RECONCILE_LIST_H__ */ +#endif /* RECONCILE_LIST_H */ diff --git a/src/gnome/top-level.h b/src/gnome/top-level.h index 898c53afdc..6969322532 100644 --- a/src/gnome/top-level.h +++ b/src/gnome/top-level.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * ********************************************************************/ -#ifndef __TOP_LEVEL_H__ -#define __TOP_LEVEL_H__ +#ifndef TOP_LEVEL_H +#define TOP_LEVEL_H #include diff --git a/src/gnome/window-acct-tree.h b/src/gnome/window-acct-tree.h index 81231e50ca..fd04e0979d 100644 --- a/src/gnome/window-acct-tree.h +++ b/src/gnome/window-acct-tree.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * ********************************************************************/ -#ifndef __WINDOW_ACCT_TREE_H__ -#define __WINDOW_ACCT_TREE_H__ +#ifndef WINDOW_ACCT_TREE_H +#define WINDOW_ACCT_TREE_H #include "mainwindow-account-tree.h" #include "window-main.h" diff --git a/src/gnome/window-help.h b/src/gnome/window-help.h index aec33d0594..8cc7bd35e6 100644 --- a/src/gnome/window-help.h +++ b/src/gnome/window-help.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __GNC_HELP_WINDOW_H__ -#define __GNC_HELP_WINDOW_H__ +#ifndef GNC_HELP_WINDOW_H +#define GNC_HELP_WINDOW_H #include diff --git a/src/gnome/window-main.h b/src/gnome/window-main.h index 7475bc7f5b..f95b5ae821 100644 --- a/src/gnome/window-main.h +++ b/src/gnome/window-main.h @@ -21,8 +21,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * ********************************************************************/ -#ifndef __WINDOW_MAIN_H__ -#define __WINDOW_MAIN_H__ +#ifndef WINDOW_MAIN_H +#define WINDOW_MAIN_H #include #include diff --git a/src/gnome/window-reconcile.h b/src/gnome/window-reconcile.h index f04b82a34c..83abf29159 100644 --- a/src/gnome/window-reconcile.h +++ b/src/gnome/window-reconcile.h @@ -21,8 +21,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __WINDOW_RECONCILE_H__ -#define __WINDOW_RECONCILE_H__ +#ifndef WINDOW_RECONCILE_H +#define WINDOW_RECONCILE_H #include "RecnWindow.h" diff --git a/src/gnome/window-register.h b/src/gnome/window-register.h index e52feab889..7ffbc3debe 100644 --- a/src/gnome/window-register.h +++ b/src/gnome/window-register.h @@ -21,8 +21,8 @@ * * \********************************************************************/ -#ifndef __WINDOW_REGISTER_H__ -#define __WINDOW_REGISTER_H__ +#ifndef WINDOW_REGISTER_H +#define WINDOW_REGISTER_H #include "RegWindow.h" #include "MultiLedger.h" diff --git a/src/gnome/window-report.h b/src/gnome/window-report.h index efbb985851..694cabe214 100644 --- a/src/gnome/window-report.h +++ b/src/gnome/window-report.h @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __GNC_REPORT_WINDOW_H__ -#define __GNC_REPORT_WINDOW_H__ +#ifndef GNC_REPORT_WINDOW_H +#define GNC_REPORT_WINDOW_H #include #include diff --git a/src/messages.h b/src/messages.h index 7dfc484908..71596289b2 100644 --- a/src/messages.h +++ b/src/messages.h @@ -19,8 +19,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * \********************************************************************/ -#ifndef __XACC_MESSAGES_H__ -#define __XACC_MESSAGES_H__ +#ifndef XACC_MESSAGES_H +#define XACC_MESSAGES_H #include "config.h" @@ -49,4 +49,4 @@ #undef N_ #define N_(String) (String) -#endif /* __XACC_MESSAGES_H__ */ +#endif /* XACC_MESSAGES_H */ diff --git a/src/register/QuickFill.h b/src/register/QuickFill.h index a53ef4a84a..31421d8f5a 100644 --- a/src/register/QuickFill.h +++ b/src/register/QuickFill.h @@ -23,8 +23,8 @@ * * \********************************************************************/ -#ifndef __QUICKFILL_H__ -#define __QUICKFILL_H__ +#ifndef QUICKFILL_H +#define QUICKFILL_H #include "config.h" @@ -64,4 +64,4 @@ void gnc_quickfill_insert (QuickFill *qf, const char *text, void gnc_quickfill_insert_wc (QuickFill *qf, const GdkWChar *text, QuickFillSort sort_code); -#endif /* __QUICKFILL_H__ */ +#endif /* QUICKFILL_H */ diff --git a/src/register/basiccell.h b/src/register/basiccell.h index 9a8449a3b1..596bda29fc 100644 --- a/src/register/basiccell.h +++ b/src/register/basiccell.h @@ -154,8 +154,8 @@ * Copyright (c) 2000 Dave Peticolas */ -#ifndef __BASIC_CELL_H__ -#define __BASIC_CELL_H__ +#ifndef BASIC_CELL_H +#define BASIC_CELL_H #include #include @@ -262,4 +262,4 @@ char * gnc_wcstombs (const GdkWChar *src); gint gnc_wcslen (const GdkWChar *src); GdkWChar * gnc_wcsdup (const GdkWChar *src); -#endif /* __BASIC_CELL_H__ */ +#endif /* BASIC_CELL_H */ diff --git a/src/register/cellblock.h b/src/register/cellblock.h index 71980762d7..b4a8d92559 100644 --- a/src/register/cellblock.h +++ b/src/register/cellblock.h @@ -58,8 +58,8 @@ * Copyright (c) 2000 Dave Peticolas */ -#ifndef __XACC_CELL_BLOCK_H__ -#define __XACC_CELL_BLOCK_H__ +#ifndef XACC_CELL_BLOCK_H +#define XACC_CELL_BLOCK_H #include "basiccell.h" @@ -109,4 +109,4 @@ void gnc_cellblock_destroy (CellBlock *cellblock); CellBlockCell * gnc_cellblock_get_cell (CellBlock *cellblock, int row, int col); -#endif /* __XACC_CELL_BLOCK_H__ */ +#endif /* XACC_CELL_BLOCK_H */ diff --git a/src/register/combocell.h b/src/register/combocell.h index 71505365a8..abe093475f 100644 --- a/src/register/combocell.h +++ b/src/register/combocell.h @@ -44,8 +44,8 @@ * Copyright (c) 2000 Dave Peticolas */ -#ifndef __COMBO_CELL_H__ -#define __COMBO_CELL_H__ +#ifndef COMBO_CELL_H +#define COMBO_CELL_H #include @@ -92,6 +92,6 @@ void xaccComboCellSetAutoSize (ComboCell *cell, gboolean autosize); * Defaults to false. This is a 'class' method. */ void xaccComboCellSetAutoPop (gboolean auto_pop_combos); -#endif /* __COMBO_CELL_H__ */ +#endif /* COMBO_CELL_H */ /* --------------- end of file ---------------------- */ diff --git a/src/register/gnome/gnucash-scrolled-window.h b/src/register/gnome/gnucash-scrolled-window.h index 94e2a32f14..39ac068d4a 100644 --- a/src/register/gnome/gnucash-scrolled-window.h +++ b/src/register/gnome/gnucash-scrolled-window.h @@ -21,8 +21,8 @@ * Boston, MA 02111-1307, USA gnu@gnu.org * \********************************************************************/ -#ifndef __GNC_SCROLLED_WINDOW_H__ -#define __GNC_SCROLLED_WINDOW_H__ +#ifndef GNC_SCROLLED_WINDOW_H +#define GNC_SCROLLED_WINDOW_H #include @@ -61,4 +61,4 @@ GtkWidget * gnc_scrolled_window_new (void); #endif /* __cplusplus */ -#endif /* __GNC_SCROLLED_WINDOW_H__ */ +#endif /* GNC_SCROLLED_WINDOW_H */ diff --git a/src/register/gtable.h b/src/register/gtable.h index 3dc4e46d92..b907999366 100644 --- a/src/register/gtable.h +++ b/src/register/gtable.h @@ -20,8 +20,8 @@ * * \********************************************************************/ -#ifndef __G_TABLE_H__ -#define __G_TABLE_H__ +#ifndef G_TABLE_H +#define G_TABLE_H #include "config.h" diff --git a/src/register/numcell.h b/src/register/numcell.h index 72af358739..4729a74499 100644 --- a/src/register/numcell.h +++ b/src/register/numcell.h @@ -32,8 +32,8 @@ * Copyright (c) 2000 Dave Peticolas */ -#ifndef __NUM_CELL_H__ -#define __NUM_CELL_H__ +#ifndef NUM_CELL_H +#define NUM_CELL_H #include "basiccell.h" @@ -50,4 +50,4 @@ void xaccDestroyNumCell (NumCell *cell); void xaccSetNumCellValue (NumCell *cell, const char *str); gboolean xaccSetNumCellLastNum (NumCell *cell, const char *str); -#endif /* __NUM_CELL_H__ */ +#endif /* NUM_CELL_H */ diff --git a/src/register/register-common.h b/src/register/register-common.h index 74d98d5dda..b23938bafa 100644 --- a/src/register/register-common.h +++ b/src/register/register-common.h @@ -21,8 +21,8 @@ * * \********************************************************************/ -#ifndef __REGISTER_COMMON_H__ -#define __REGISTER_COMMON_H__ +#ifndef REGISTER_COMMON_H +#define REGISTER_COMMON_H #include diff --git a/src/register/splitreg.h b/src/register/splitreg.h index e9c531b67d..7c797e8b99 100644 --- a/src/register/splitreg.h +++ b/src/register/splitreg.h @@ -41,8 +41,8 @@ * Copyright (c) 1998, 1999, 2000 Linas Vepstas */ -#ifndef __XACC_SPLITREG_H__ -#define __XACC_SPLITREG_H__ +#ifndef XACC_SPLITREG_H +#define XACC_SPLITREG_H #include "basiccell.h" #include "cellblock.h" @@ -312,6 +312,6 @@ const char * xaccSplitRegisterGetCellTypeName (CellType type); CellType xaccSplitRegisterGetCellTypeFromName (const char *name); -#endif /* __XACC_SPLITREG_H__ */ +#endif /* XACC_SPLITREG_H */ /* ============ END OF FILE ===================== */ diff --git a/src/register/table-allgui.h b/src/register/table-allgui.h index 398fdf36c0..ac5d3a9d61 100644 --- a/src/register/table-allgui.h +++ b/src/register/table-allgui.h @@ -86,8 +86,8 @@ * Copyright (c) 2000 Dave Peticolas */ -#ifndef __TABLE_ALLGUI_H__ -#define __TABLE_ALLGUI_H__ +#ifndef TABLE_ALLGUI_H +#define TABLE_ALLGUI_H #include @@ -436,6 +436,6 @@ gboolean gnc_table_traverse_update(Table *table, gncTableTraversalDir dir, VirtualLocation *dest_loc); -#endif /* __TABLE_ALLGUI_H__ */ +#endif /* TABLE_ALLGUI_H */ /* ================== end of file ======================= */ diff --git a/src/register/table-html.h b/src/register/table-html.h index d02dc16b67..f1f6b70894 100644 --- a/src/register/table-html.h +++ b/src/register/table-html.h @@ -32,12 +32,12 @@ * Copyright (c) 1998 Linas Vepstas */ -#ifndef __XACC_TABLE_HTML_H__ -#define __XACC_TABLE_HTML_H__ +#ifndef XACC_TABLE_HTML_H +#define XACC_TABLE_HTML_H int xaccTableDumpHTML (Table * table, int fd); int xaccTablePrintHTML (Table * table, char *filename); void xaccTableWebServeHTML (Table * table, unsigned short port); -#endif __XACC_TABLE_HTML_H__ +#endif XACC_TABLE_HTML_H diff --git a/src/register/textcell.h b/src/register/textcell.h index 70dbb01473..220f6329aa 100644 --- a/src/register/textcell.h +++ b/src/register/textcell.h @@ -34,8 +34,8 @@ * Copyright (c) 2000 Dave Peticolas */ -#ifndef __TEXT_CELL_H__ -#define __TEXT_CELL_H__ +#ifndef TEXT_CELL_H +#define TEXT_CELL_H #include "basiccell.h" @@ -44,6 +44,6 @@ BasicCell * xaccMallocTextCell (void); void xaccInitTextCell (BasicCell *cell); void xaccDestroyTextCell (BasicCell *cell); -#endif /* __TEXT_CELL_H__ */ +#endif /* TEXT_CELL_H */ /* --------------- end of file ---------------------- */