From 2b998cd1a6d72214726d05cc050b816d131399e6 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 7 Sep 2010 21:40:40 -0700 Subject: [PATCH] gui: Include only to use GTK+. The GTK+ manual says: "The recommended way of using GTK+ has always been to only include the toplevel headers gtk.h, gdk.h, gdk-pixbuf.h." We might as well follow this practice, since it only makes life easier. --- src/ui/gui/customentry.c | 5 ++--- src/ui/gui/helper.c | 2 +- src/ui/gui/psppire-acr.h | 6 ++---- src/ui/gui/psppire-buttonbox.c | 3 +-- src/ui/gui/psppire-buttonbox.h | 4 ++-- src/ui/gui/psppire-conf.h | 2 +- src/ui/gui/psppire-data-editor.c | 1 - src/ui/gui/psppire-data-editor.h | 4 ++-- src/ui/gui/psppire-data-window.c | 3 +-- src/ui/gui/psppire-data-window.h | 8 ++++---- src/ui/gui/psppire-dialog.c | 2 -- src/ui/gui/psppire-dialog.h | 4 ++-- src/ui/gui/psppire-dictview.c | 4 ++-- src/ui/gui/psppire-dictview.h | 4 ++-- src/ui/gui/psppire-hbuttonbox.c | 5 +---- src/ui/gui/psppire-keypad.c | 7 ++----- src/ui/gui/psppire-keypad.h | 5 ++--- src/ui/gui/psppire-output-window.h | 6 ++---- src/ui/gui/psppire-select-dest.c | 4 ++-- src/ui/gui/psppire-selector.c | 11 ++--------- src/ui/gui/psppire-selector.h | 8 ++------ src/ui/gui/psppire-syntax-window.c | 3 +-- src/ui/gui/psppire-syntax-window.h | 4 +--- src/ui/gui/psppire-var-view.c | 5 ++--- src/ui/gui/psppire-var-view.h | 4 ++-- src/ui/gui/psppire-vbuttonbox.c | 5 +---- src/ui/gui/psppire-window.c | 7 +------ src/ui/gui/psppire-window.h | 7 ++----- 28 files changed, 45 insertions(+), 88 deletions(-) diff --git a/src/ui/gui/customentry.c b/src/ui/gui/customentry.c index 7b310469..a376a7fb 100644 --- a/src/ui/gui/customentry.c +++ b/src/ui/gui/customentry.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2005, 2007 Free Software Foundation + Copyright (C) 2005, 2007, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -55,8 +55,7 @@ #include -#include -#include +#include #include "customentry.h" diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index a85b80ba..36165c7c 100644 --- a/src/ui/gui/helper.c +++ b/src/ui/gui/helper.c @@ -31,7 +31,7 @@ #include #include #include "psppire-syntax-window.h" -#include +#include #include #include diff --git a/src/ui/gui/psppire-acr.h b/src/ui/gui/psppire-acr.h index ba38631d..b5838552 100644 --- a/src/ui/gui/psppire-acr.h +++ b/src/ui/gui/psppire-acr.h @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,9 +43,7 @@ #include #include -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/src/ui/gui/psppire-buttonbox.c b/src/ui/gui/psppire-buttonbox.c index ab7fe3d4..c3b94dd0 100644 --- a/src/ui/gui/psppire-buttonbox.c +++ b/src/ui/gui/psppire-buttonbox.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation + Copyright (C) 2007, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,7 +19,6 @@ #include #include -#include #include "psppire-buttonbox.h" #include "psppire-dialog.h" diff --git a/src/ui/gui/psppire-buttonbox.h b/src/ui/gui/psppire-buttonbox.h index 03f9fe34..632e0fd3 100644 --- a/src/ui/gui/psppire-buttonbox.h +++ b/src/ui/gui/psppire-buttonbox.h @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation + Copyright (C) 2007, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ #include #include -#include +#include G_BEGIN_DECLS diff --git a/src/ui/gui/psppire-conf.h b/src/ui/gui/psppire-conf.h index 4e7ece0a..674577e7 100644 --- a/src/ui/gui/psppire-conf.h +++ b/src/ui/gui/psppire-conf.h @@ -18,7 +18,7 @@ #include #include -#include +#include #ifndef __PSPPIRE_CONF_H__ #define __PSPPIRE_CONF_H__ diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index 2aba780e..23af0e5a 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -15,7 +15,6 @@ along with this program. If not, see . */ #include -#include #include #include #include "psppire-data-editor.h" diff --git a/src/ui/gui/psppire-data-editor.h b/src/ui/gui/psppire-data-editor.h index b5b3f360..0c555a98 100644 --- a/src/ui/gui/psppire-data-editor.h +++ b/src/ui/gui/psppire-data-editor.h @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "psppire-var-store.h" diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 9edc9208..ff17ed32 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -16,8 +16,7 @@ #include -#include -#include +#include #include #include "data/any-reader.h" diff --git a/src/ui/gui/psppire-data-window.h b/src/ui/gui/psppire-data-window.h index c3bcb840..1e024939 100644 --- a/src/ui/gui/psppire-data-window.h +++ b/src/ui/gui/psppire-data-window.h @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008 Free Software Foundation + Copyright (C) 2008, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,11 +21,11 @@ #include #include -#include -#include "psppire-window.h" -#include "psppire-data-editor.h" #include +#include "ui/gui/psppire-window.h" +#include "ui/gui/psppire-data-editor.h" + G_BEGIN_DECLS #define PSPPIRE_DATA_WINDOW_TYPE (psppire_data_window_get_type ()) diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c index 977f08e6..5cef8be4 100644 --- a/src/ui/gui/psppire-dialog.c +++ b/src/ui/gui/psppire-dialog.c @@ -18,8 +18,6 @@ #include #include -#include -#include #include "psppire-dialog.h" #include "psppire-buttonbox.h" #include "psppire-selector.h" diff --git a/src/ui/gui/psppire-dialog.h b/src/ui/gui/psppire-dialog.h index 6c175cfb..a939d0f9 100644 --- a/src/ui/gui/psppire-dialog.h +++ b/src/ui/gui/psppire-dialog.h @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation + Copyright (C) 2007, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ #include #include -#include +#include #define PSPPIRE_RESPONSE_PASTE 1 diff --git a/src/ui/gui/psppire-dictview.c b/src/ui/gui/psppire-dictview.c index 4d56eda9..cab7436c 100644 --- a/src/ui/gui/psppire-dictview.c +++ b/src/ui/gui/psppire-dictview.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2009 Free Software Foundation + Copyright (C) 2009, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ #include -#include +#include #include "psppire-dictview.h" #include "psppire-dict.h" #include "psppire-conf.h" diff --git a/src/ui/gui/psppire-dictview.h b/src/ui/gui/psppire-dictview.h index dd08d78f..1a8ddbb9 100644 --- a/src/ui/gui/psppire-dictview.h +++ b/src/ui/gui/psppire-dictview.h @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2009 Free Software Foundation + Copyright (C) 2009, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ #include #include -#include +#include #include "psppire-dict.h" #include "dict-display.h" diff --git a/src/ui/gui/psppire-hbuttonbox.c b/src/ui/gui/psppire-hbuttonbox.c index 3332a354..0e62d509 100644 --- a/src/ui/gui/psppire-hbuttonbox.c +++ b/src/ui/gui/psppire-hbuttonbox.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation + Copyright (C) 2007, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,12 +19,9 @@ #include #include -#include #include "psppire-hbuttonbox.h" #include "psppire-dialog.h" -#include - #include #define _(msgid) gettext (msgid) diff --git a/src/ui/gui/psppire-keypad.c b/src/ui/gui/psppire-keypad.c index 23ddccb5..84107c74 100644 --- a/src/ui/gui/psppire-keypad.c +++ b/src/ui/gui/psppire-keypad.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,10 +15,7 @@ along with this program. If not, see . */ #include -#include -#include -#include -#include +#include #include #include "psppire-keypad.h" diff --git a/src/ui/gui/psppire-keypad.h b/src/ui/gui/psppire-keypad.h index 97938fb8..553dbf7e 100644 --- a/src/ui/gui/psppire-keypad.h +++ b/src/ui/gui/psppire-keypad.h @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -49,8 +49,7 @@ #include #include -#include -#include +#include G_BEGIN_DECLS diff --git a/src/ui/gui/psppire-output-window.h b/src/ui/gui/psppire-output-window.h index c242e732..7ceaee7f 100644 --- a/src/ui/gui/psppire-output-window.h +++ b/src/ui/gui/psppire-output-window.h @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009 Free Software Foundation + Copyright (C) 2008, 2009, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,11 +21,9 @@ #include #include -#include -#include +#include #include "psppire-window.h" #include "psppire.h" -#include extern int viewer_length; extern int viewer_width ; diff --git a/src/ui/gui/psppire-select-dest.c b/src/ui/gui/psppire-select-dest.c index c46abcee..b9d0eba6 100644 --- a/src/ui/gui/psppire-select-dest.c +++ b/src/ui/gui/psppire-select-dest.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2009 Free Software Foundation + Copyright (C) 2009, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ #include #include "psppire-select-dest.h" -#include +#include GType psppire_select_dest_widget_get_type (void) diff --git a/src/ui/gui/psppire-selector.c b/src/ui/gui/psppire-selector.c index 74d2bffc..135bac99 100644 --- a/src/ui/gui/psppire-selector.c +++ b/src/ui/gui/psppire-selector.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007, 2009 Free Software Foundation + Copyright (C) 2007, 2009, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -63,17 +63,10 @@ #include "psppire-dict.h" #include "psppire-select-dest.h" -#include -#include -#include +#include #include "psppire-selector.h" -#include -#include -#include -#include - static void psppire_selector_base_finalize (PsppireSelectorClass *, gpointer); static void psppire_selector_base_init (PsppireSelectorClass *class); static void psppire_selector_class_init (PsppireSelectorClass *class); diff --git a/src/ui/gui/psppire-selector.h b/src/ui/gui/psppire-selector.h index bb267cd4..028af187 100644 --- a/src/ui/gui/psppire-selector.h +++ b/src/ui/gui/psppire-selector.h @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation + Copyright (C) 2007, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,11 +21,7 @@ #include #include -#include -#include -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index 50e7f09d..eea46eba 100644 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@ -16,8 +16,7 @@ #include -#include -#include +#include #include "executor.h" #include "helper.h" diff --git a/src/ui/gui/psppire-syntax-window.h b/src/ui/gui/psppire-syntax-window.h index 2b1fe03f..661aaa76 100644 --- a/src/ui/gui/psppire-syntax-window.h +++ b/src/ui/gui/psppire-syntax-window.h @@ -20,10 +20,8 @@ #include #include -#include -#include -#include "psppire-window.h" #include +#include "psppire-window.h" G_BEGIN_DECLS diff --git a/src/ui/gui/psppire-var-view.c b/src/ui/gui/psppire-var-view.c index 76130c04..009aad62 100644 --- a/src/ui/gui/psppire-var-view.c +++ b/src/ui/gui/psppire-var-view.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2009, 2011 Free Software Foundation + Copyright (C) 2009, 2010, 2011 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,8 +16,7 @@ #include -#include -#include +#include #include "psppire-var-view.h" #include "psppire-var-ptr.h" #include "psppire-select-dest.h" diff --git a/src/ui/gui/psppire-var-view.h b/src/ui/gui/psppire-var-view.h index 35dc91d2..45832eba 100644 --- a/src/ui/gui/psppire-var-view.h +++ b/src/ui/gui/psppire-var-view.h @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2009 Free Software Foundation + Copyright (C) 2009, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ #include #include -#include +#include G_BEGIN_DECLS diff --git a/src/ui/gui/psppire-vbuttonbox.c b/src/ui/gui/psppire-vbuttonbox.c index 98c2898c..66d0dda3 100644 --- a/src/ui/gui/psppire-vbuttonbox.c +++ b/src/ui/gui/psppire-vbuttonbox.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation + Copyright (C) 2007, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,12 +19,9 @@ #include #include -#include #include "psppire-vbuttonbox.h" #include "psppire-dialog.h" -#include - #include #define _(msgid) gettext (msgid) diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c index b67f95a4..369ece50 100644 --- a/src/ui/gui/psppire-window.c +++ b/src/ui/gui/psppire-window.c @@ -17,12 +17,7 @@ #include -#include -#include -#include -#include -#include -#include +#include #include #include diff --git a/src/ui/gui/psppire-window.h b/src/ui/gui/psppire-window.h index 441e12af..19ed97ec 100644 --- a/src/ui/gui/psppire-window.h +++ b/src/ui/gui/psppire-window.h @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009 Free Software Foundation + Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,10 +21,7 @@ #include #include -#include -#include -#include -#include +#include G_BEGIN_DECLS -- 2.30.2