More include file tweaking. Don't include gtk.h from any header

files. Add in some includes that are currently pulled in by deprecated parts of the gnome library. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@11983 57a11ea4-9604-0410-9ed3-97b8803252fd
2024-11-29 04:04:07 -06:00 · 2005-11-20 02:54:09 +00:00 · 2005-11-20 02:54:09 +00:00 · 63769c7e31
commit 63769c7e31
parent db2bed0e58
64 changed files with 72 additions and 41 deletions
--- a/4
+++ b/4
@ -1,5 +1,9 @@
 2005-11-19  David Hampton  <hampton@employees.org>

+	* various: More include file tweaking.  Don't include gtk.h from
+	any header files.  Add in some includes that are currently
+	pulled in by deprecated parts of the gnome library.
+
 	* numerous: Include file cleanup.  Remove the messages.[ch] files
 	in favor of the glib supplied gi18n.h file.  Replace includes of
 	gnome.h with gtk.h (or better yet glib.h) wherever possible.
--- a/src/business/business-gnome/dialog-date-close.c
+++ b/src/business/business-gnome/dialog-date-close.c
@ -24,6 +24,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>

 #include "dialog-utils.h"
 #include "gnc-engine-util.h"
--- a/src/business/business-gnome/dialog-invoice.c
+++ b/src/business/business-gnome/dialog-invoice.c
@ -24,6 +24,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>
 #include <g-wrap-wct.h>
 #include <libguile.h>

--- a/src/business/business-gnome/gnc-plugin-page-invoice.c
+++ b/src/business/business-gnome/gnc-plugin-page-invoice.c
@ -23,6 +23,9 @@

 #include "config.h"

+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
 #include "gnc-plugin.h"
 #include "dialog-invoice.h"
 #include "gnc-plugin-page-invoice.h"
--- a/src/business/business-gnome/gw-business-gnome-spec.scm
+++ b/src/business/business-gnome/gw-business-gnome-spec.scm
@ -32,6 +32,7 @@
   ws
   (lambda (wrapset client-wrapset)
     (list
+      "#include <gtk/gtk.h>\n"
      "#include <business-urls.h>\n"
      "#include <dialog-billterms.h>\n"
      "#include <dialog-customer.h>\n"
--- a/src/gnome-search/dialog-search.h
+++ b/src/gnome-search/dialog-search.h
@ -24,8 +24,6 @@
 #ifndef _GNC_DIALOG_SEARCH_H
 #define _GNC_DIALOG_SEARCH_H

-#include <gtk/gtk.h>
-
 #include "GNCId.h"
 #include "QueryNew.h"

--- a/src/gnome-search/gnc-general-search.c
+++ b/src/gnome-search/gnc-general-search.c
@ -29,7 +29,9 @@
  @NOTATION@
 */

-#include <config.h>
+#include "config.h"
+
+#include <gtk/gtk.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
--- a/src/gnome-search/gnc-general-search.h
+++ b/src/gnome-search/gnc-general-search.h
@ -32,7 +32,6 @@
 #ifndef GNC_GENERAL_SEARCH_H
 #define GNC_GENERAL_SEARCH_H

-#include <gtk/gtk.h>
 #include "dialog-search.h"
 #include "gnc-book.h"

--- a/src/gnome-utils/dialog-options.c
+++ b/src/gnome-utils/dialog-options.c
@ -23,6 +23,8 @@
 #include "config.h"

 #include <gnome.h>
+#include <gdk/gdk.h>
+#include <glib/gi18n.h>
 #include <g-wrap-wct.h>

 #include "gnc-tree-model-budget.h" //FIXME?
@ -45,7 +47,6 @@
 #include "gnc-ui.h"
 #include "guile-util.h"
 #include "option-util.h"
-#include "gdk/gdkfont.h"
 #include "guile-mappings.h"
 #include "gnc-date-format.h"
 #include "misc-gnome-utils.h"
--- a/src/gnome-utils/gnc-date-edit.c
+++ b/src/gnome-utils/gnc-date-edit.c
@ -36,6 +36,7 @@
 #include "config.h"

 #include <gnome.h> 
+#include <glib/gi18n.h>
 #include <string.h>
 #include <stdlib.h> /* atoi */
 #include <ctype.h> /* isdigit */
--- a/src/gnome-utils/gnc-gui-query.c
+++ b/src/gnome-utils/gnc-gui-query.c
@ -23,6 +23,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-gconf-utils.h"
--- a/src/gnome-utils/gnc-html-graph-gog.c
+++ b/src/gnome-utils/gnc-html-graph-gog.c
@ -23,10 +23,10 @@

 #include "config.h"

-#include <string.h>
-
+#include <gtk/gtk.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-embedded.h>
+#include <string.h>

 #include "gnc-html-graph-gog.h"
 #include "gnc-html.h"
--- a/src/gnome-utils/gnc-html-history.c
+++ b/src/gnome-utils/gnc-html-history.c
@ -22,7 +22,7 @@

 #include "config.h"

-#include <glib.h>
+#include <gtk/gtk.h>
 #include <string.h>

 #include "gnc-html-history.h"
--- a/src/gnome-utils/gnc-html.h
+++ b/src/gnome-utils/gnc-html.h
@ -23,10 +23,7 @@
 #ifndef GNC_HTML_H
 #define GNC_HTML_H

-#include <glib.h>
 #include <gtkhtml/gtkhtml.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>

 typedef char * URLType;

--- a/src/gnome-utils/gnc-main-window.h
+++ b/src/gnome-utils/gnc-main-window.h
@ -36,8 +36,6 @@
 #ifndef __GNC_MAIN_WINDOW_H
 #define __GNC_MAIN_WINDOW_H

-#include <gtk/gtk.h>
-
 #include "gnc-plugin-page.h"

 G_BEGIN_DECLS
--- a/src/gnome-utils/gnc-menu-extensions.h
+++ b/src/gnome-utils/gnc-menu-extensions.h
@ -23,7 +23,6 @@
 #ifndef GNC_MENU_EXTENSIONS_H
 #define GNC_MENU_EXTENSIONS_H

-#include <gtk/gtk.h>
 #include <libguile.h>

 typedef struct _ExtensionInfo
--- a/src/gnome-utils/gnc-period-select.h
+++ b/src/gnome-utils/gnc-period-select.h
@ -32,7 +32,6 @@
 #ifndef GNC_PERIOD_SELECT_H
 #define GNC_PERIOD_SELECT_H

-#include <gtk/gtk.h>
 #include "gnc-accounting-period.h"

 G_BEGIN_DECLS
--- a/src/gnome-utils/gnc-plugin-file-history.h
+++ b/src/gnome-utils/gnc-plugin-file-history.h
@ -35,7 +35,6 @@
 #ifndef __GNC_PLUGIN_FILE_HISTORY_H
 #define __GNC_PLUGIN_FILE_HISTORY_H

-#include <gtk/gtk.h>
 #include "gnc-plugin.h"

 G_BEGIN_DECLS
--- a/src/gnome-utils/gnc-plugin-manager.c
+++ b/src/gnome-utils/gnc-plugin-manager.c
@ -24,7 +24,7 @@

 #include "config.h"

-#include <glib.h>
+#include <gtk/gtk.h>

 #include "gnc-plugin-manager.h"
 #include "gnc-engine.h"
--- a/src/gnome-utils/gnc-plugin-menu-additions.h
+++ b/src/gnome-utils/gnc-plugin-menu-additions.h
@ -38,7 +38,6 @@
 #ifndef __GNC_PLUGIN_MENU_ADDITIONS_H
 #define __GNC_PLUGIN_MENU_ADDITIONS_H

-#include <gtk/gtk.h>
 #include "gnc-plugin.h"

 G_BEGIN_DECLS
--- a/src/gnome-utils/gnc-tree-model-account-types.c
+++ b/src/gnome-utils/gnc-tree-model-account-types.c
@ -25,9 +25,11 @@
 */

 #include "config.h"
+
+#include <gtk/gtk.h>
+
 #include "gnc-trace.h"
 #include "gnc-tree-model-account-types.h"
-
 #include "Account.h"

 static QofLogModule log_module = GNC_MOD_GUI;
--- a/src/gnome-utils/gnc-tree-model-account-types.h
+++ b/src/gnome-utils/gnc-tree-model-account-types.h
@ -37,8 +37,6 @@
 #ifndef __GNC_TREE_MODEL_ACCOUNT_TYPES_H
 #define __GNC_TREE_MODEL_ACCOUNT_TYPES_H

-#include <gtk/gtk.h>
-
 G_BEGIN_DECLS

 /* type macros */
--- a/src/gnome-utils/gnc-tree-model-budget.c
+++ b/src/gnome-utils/gnc-tree-model-budget.c
@ -22,6 +22,10 @@
 /** @addtogroup gnome-util
 *     @{ */

+#include "config.h"
+
+#include <gtk/gtk.h>
+
 #include "gnc-tree-model-budget.h"
 #include "gnc-budget.h"
 #include "gnc-ui-util.h"
--- a/src/gnome-utils/gnc-tree-model-budget.h
+++ b/src/gnome-utils/gnc-tree-model-budget.h
@ -29,7 +29,6 @@
 #ifndef __GNC_TREE_MODEL_BUDGET_H__
 #define __GNC_TREE_MODEL_BUDGET_H__

-#include <gtk/gtk.h>
 #include "gnc-budget.h"

 /* The budget list columns. */
--- a/src/gnome-utils/gnc-tree-view-price.c
+++ b/src/gnome-utils/gnc-tree-view-price.c
@ -25,6 +25,7 @@
 #include "config.h"

 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>

 #include "gnc-tree-view.h"
@ -38,7 +39,6 @@
 #include "gnc-gnome-utils.h"
 #include "gnc-icons.h"
 #include "gnc-ui-util.h"
-#include <libgnome/libgnome.h>


 /** Static Globals *******************************************************/
--- a/src/gnome-utils/misc-gnome-utils.h
+++ b/src/gnome-utils/misc-gnome-utils.h
@ -20,8 +20,6 @@
 #ifndef __GTT_UTIL_H__
 #define __GTT_UTIL_H__

-#include <gtk/gtk.h>
-
 /* Some gtk-like utilities */
 void xxxgtk_textview_set_text (GtkTextView *text, const char *str);
 char * xxxgtk_textview_get_text (GtkTextView *text);
--- a/src/gnome-utils/print-session.c
+++ b/src/gnome-utils/print-session.c
@ -25,6 +25,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>
 #include <libgnomeprint/gnome-font.h>
 #include <libgnomeprintui/gnome-print-job-preview.h>
 #include <stdio.h>
--- a/src/gnome/dialog-totd.h
+++ b/src/gnome/dialog-totd.h
@ -24,8 +24,6 @@
 #ifndef DIALOG_TOTD_H
 #define DIALOG_TOTD_H

-#include <gtk/gtk.h>
-
 void gnc_totd_dialog (GtkWindow *parent, gboolean startup);

 #endif 
--- a/src/gnome/druid-hierarchy.c
+++ b/src/gnome/druid-hierarchy.c
@ -23,6 +23,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
--- a/src/gnome/druid-loan.c
+++ b/src/gnome/druid-loan.c
@ -24,6 +24,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>
 #include <string.h>
 #include <glade/glade.h>
 #include <math.h>
--- a/src/gnome/druid-merge.c
+++ b/src/gnome/druid-merge.c
@ -24,6 +24,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
--- a/src/gnome/druid-stock-split.c
+++ b/src/gnome/druid-stock-split.c
@ -24,6 +24,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>

 #include "Group.h"
 #include "Transaction.h"
--- a/src/gnome/gnc-plugin-page-budget.c
+++ b/src/gnome/gnc-plugin-page-budget.c
@ -39,6 +39,7 @@
 #include "config.h"

 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>

 #include "gnc-plugin-page-register.h"
--- a/src/gnome/gnc-plugin-page-register.c
+++ b/src/gnome/gnc-plugin-page-register.c
@ -35,6 +35,7 @@
 #include "config.h"

 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #ifndef HAVE_GLIB26
 #include "gkeyfile.h"
 #endif
--- a/src/gnome/gnc-plugin-register.c
+++ b/src/gnome/gnc-plugin-register.c
@ -24,6 +24,8 @@

 #include "config.h"

+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>

 #include "gnc-component-manager.h"
--- a/src/gnome/gnc-plugin-register.h
+++ b/src/gnome/gnc-plugin-register.h
@ -25,8 +25,6 @@
 #ifndef __GNC_PLUGIN_REGISTER_H
 #define __GNC_PLUGIN_REGISTER_H

-#include <gtk/gtkwindow.h>
-
 #include "gnc-plugin.h"

 G_BEGIN_DECLS
--- a/src/gnome/gnc-split-reg.h
+++ b/src/gnome/gnc-split-reg.h
@ -68,8 +68,6 @@
 #define GNC_SPLIT_REG_H

 #include <libguile.h>
-#include <gtk/gtk.h>
-#include "config.h"

 #include "gnc-ledger-display.h"
 #include "gnucash-sheet.h"
--- a/src/import-export/binary-import/druid-commodity.c
+++ b/src/import-export/binary-import/druid-commodity.c
@ -26,6 +26,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>

 #include "Scrub.h"
 #include "dialog-commodity.h"
--- a/src/import-export/gnc-import-format-gnome.c
+++ b/src/import-export/gnc-import-format-gnome.c
@ -3,6 +3,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>

 #include "gnc-druid-gnome-ui.h"
 #include "gnc-import-format-gnome.h"
--- a/src/import-export/hbci/dialog-hbcitrans.c
+++ b/src/import-export/hbci/dialog-hbcitrans.c
@ -27,6 +27,7 @@
 #endif

 #include <gnome.h>
+#include <glib/gi18n.h>
 #include <aqbanking/version.h>
 #include <aqbanking/account.h>
 #include <aqbanking/jobsingletransfer.h>
--- a/src/import-export/hbci/druid-hbci-initial.c
+++ b/src/import-export/hbci/druid-hbci-initial.c
@ -23,6 +23,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
--- a/src/import-export/hbci/gnc-hbci-gettrans.c
+++ b/src/import-export/hbci/gnc-hbci-gettrans.c
@ -23,6 +23,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>

 #include "gnc-hbci-gettrans.h"

--- a/src/import-export/hbci/gnc-plugin-hbci.c
+++ b/src/import-export/hbci/gnc-plugin-hbci.c
@ -23,6 +23,9 @@

 #include "config.h"

+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
 #include "druid-hbci-initial.h"
 #include "gnc-plugin-manager.h"
 #include "gnc-gnome-utils.h"
--- a/src/import-export/hbci/gncmod-hbci.c
+++ b/src/import-export/hbci/gncmod-hbci.c
@ -6,8 +6,9 @@
 *********************************************************************/

 #include "config.h"
+
+#include <gtk/gtk.h>
 #include <stdio.h>
-#include <glib.h>
 #include <libguile.h>

 #include "gnc-module.h"
--- a/src/import-export/hbci/hbci-interaction.c
+++ b/src/import-export/hbci/hbci-interaction.c
@ -23,6 +23,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <locale.h>
--- a/src/import-export/import-backend.c
+++ b/src/import-export/import-backend.c
@ -29,7 +29,8 @@

 #include "config.h"

-#include <glib.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <stdlib.h> 
 #include <math.h>

--- a/src/import-export/import-backend.h
+++ b/src/import-export/import-backend.h
@ -27,7 +27,6 @@
 #ifndef TRANSACTION_MATCHER_H
 #define TRANSACTION_MATCHER_H

-#include <gtk/gtk.h>
 #include "Transaction.h"
 #include "import-match-map.h"
 #include "import-settings.h"
--- a/src/import-export/import-main-matcher.c
+++ b/src/import-export/import-main-matcher.c
@ -27,6 +27,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>

 #include "import-main-matcher.h"

--- a/src/import-export/import-match-picker.c
+++ b/src/import-export/import-match-picker.c
@ -29,7 +29,7 @@

 #include "config.h"

-#include <glib.h>
+#include <gtk/gtk.h>

 #include "import-backend.h"
 #include "import-match-picker.h"
--- a/src/import-export/log-replay/gncmod-log-replay.c
+++ b/src/import-export/log-replay/gncmod-log-replay.c
@ -24,7 +24,8 @@
 @author Copyright (c) 2003 Benoit Grégoire bock@step.polymtl.ca
 */
 #include "config.h"
-#include <glib.h>
+
+#include <gtk/gtk.h>
 #include <libguile.h>

 #include "gnc-log-replay.h"
--- a/src/import-export/ofx/gncmod-ofx-import.c
+++ b/src/import-export/ofx/gncmod-ofx-import.c
@ -24,7 +24,8 @@
 @author Copyright (c) 2002 Benoit Grégoire bock@step.polymtl.ca
 */
 #include "config.h"
-#include <glib.h>
+
+#include <gtk/gtk.h>

 #include "gnc-ofx-import.h"
 #include "gnc-module.h"
--- a/src/import-export/qif-import/druid-qif-import.c
+++ b/src/import-export/qif-import/druid-qif-import.c
@ -26,6 +26,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>
 #include <libguile.h>
 #include <stdio.h>
 #include <sys/time.h>
--- a/src/register/register-gnome/combocell-gnome.c
+++ b/src/register/register-gnome/combocell-gnome.c
@ -35,6 +35,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <string.h>

 #include "QuickFill.h"
 #include "combocell.h"
--- a/src/register/register-gnome/gnucash-grid.c
+++ b/src/register/register-gnome/gnucash-grid.c
@ -29,6 +29,8 @@

 #include "config.h"

+#include <string.h>
+
 #include "gnucash-sheet.h"
 #include "gnucash-grid.h"
 #include "gnucash-color.h"
--- a/src/register/register-gnome/gnucash-header.c
+++ b/src/register/register-gnome/gnucash-header.c
@ -28,6 +28,8 @@

 #include "config.h"

+#include <string.h>
+
 #include "gnucash-sheet.h"
 #include "gnucash-color.h"
 #include "gnucash-style.h"
--- a/src/register/register-gnome/gnucash-item-edit.c
+++ b/src/register/register-gnome/gnucash-item-edit.c
@ -31,6 +31,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <string.h>

 #include "gnucash-color.h"
 #include "gnucash-cursor.h"
--- a/src/register/register-gnome/gnucash-item-list.c
+++ b/src/register/register-gnome/gnucash-item-list.c
@ -27,6 +27,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>

 #include "gnc-engine.h"
 #include "gnucash-item-list.h"
--- a/src/register/register-gnome/quickfillcell-gnome.c
+++ b/src/register/register-gnome/quickfillcell-gnome.c
@ -30,6 +30,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <string.h>

 #include "quickfillcell.h"
 #include "quickfillcell-gnome.h"
--- a/src/report/report-gnome/dialog-column-view.c
+++ b/src/report/report-gnome/dialog-column-view.c
@ -23,6 +23,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>
 #include <libguile.h>
 #include <g-wrap-wct.h>

--- a/src/report/report-gnome/dialog-column-view.h
+++ b/src/report/report-gnome/dialog-column-view.h
@ -24,7 +24,6 @@
 #define GNC_DIALOG_COLUMN_VIEW_H

 #include <libguile.h>
-#include <gtk/gtk.h>

 typedef struct gncp_column_view_edit gnc_column_view_edit;

--- a/src/report/report-gnome/gncmod-report-gnome.c
+++ b/src/report/report-gnome/gncmod-report-gnome.c
@ -9,9 +9,9 @@
 #include <config.h>
 #endif

+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <libguile.h>
-#include <glib.h>

 #include "gnc-module.h"
 #include "gnc-module-api.h"
--- a/src/report/report-gnome/gw-report-gnome-spec.scm
+++ b/src/report/report-gnome/gw-report-gnome-spec.scm
@ -27,8 +27,8 @@
   ws
   (lambda (wrapset client-wrapset)
     (list
+      "#include <gtk/gtk.h>\n"
      "#include <dialog-column-view.h>\n"
-      "#include <dialog-style-sheet.h>\n"
      "#include <gnc-plugin-page-report.h>\n"
      "#include <window-report.h>\n")))

--- a/src/report/report-gnome/window-report.c
+++ b/src/report/report-gnome/window-report.c
@ -28,6 +28,7 @@
 #include "config.h"

 #include <gnome.h>
+#include <glib/gi18n.h>
 #include <errno.h>
 #include <libguile.h>
 #include <sys/stat.h>
--- a/src/report/stylesheets/gncmod-stylesheets.c
+++ b/src/report/stylesheets/gncmod-stylesheets.c
@ -6,8 +6,9 @@
 *********************************************************************/

 #include "config.h"
+
+#include <gtk/gtk.h>
 #include <stdio.h>
-#include <glib.h>
 #include <libguile.h>

 #include "gnc-module.h"