GNOME.org
 

[gnumeric] Compilation: clean up dialog including.

commit 8fbd4c85787ebe2d454cdc1d05df2b7c250f31f1
Author: Morten Welinder <terra gnome org>
Date:   Tue May 15 22:11:08 2018 -0400

    Compilation: clean up dialog including.

 src/Makefile.am                                    |    1 -
 src/dialogs/dao-gui-utils.h                        |    2 +-
 src/dialogs/dialog-advanced-filter.c               |    4 ++--
 src/dialogs/dialog-analysis-tool-chi-squared.c     |    4 ++--
 src/dialogs/dialog-analysis-tool-frequency.c       |    4 ++--
 src/dialogs/dialog-analysis-tool-kaplan-meier.c    |    4 ++--
 src/dialogs/dialog-analysis-tool-normality.c       |    4 ++--
 src/dialogs/dialog-analysis-tool-one-mean.c        |    4 ++--
 .../dialog-analysis-tool-principal-components.c    |    4 ++--
 src/dialogs/dialog-analysis-tool-sign-test.c       |    4 ++--
 .../dialog-analysis-tool-wilcoxon-mann-whitney.c   |    4 ++--
 src/dialogs/dialog-analysis-tools.c                |    4 ++--
 src/dialogs/dialog-consolidate.c                   |    4 ++--
 src/dialogs/dialog-fill-series.c                   |    4 ++--
 src/dialogs/dialog-random-generator-cor.c          |    4 ++--
 src/dialogs/dialog-random-generator.c              |    4 ++--
 src/dialogs/dialog-scenarios.c                     |    2 +-
 src/dialogs/dialog-shuffle.c                       |    4 ++--
 src/dialogs/dialog-simulation.c                    |    4 ++--
 src/dialogs/dialog-solver.c                        |    2 +-
 src/gui-clipboard.c                                |    2 +-
 src/gui-file.c                                     |    2 +-
 src/io-context-gtk.c                               |    2 +-
 src/print.c                                        |    2 +-
 src/sheet-control-gui.c                            |    2 +-
 src/sheet-object-cell-comment.c                    |    2 +-
 src/sheet-object-widget.c                          |    2 +-
 src/sheet-object.c                                 |    2 +-
 src/stf-export.c                                   |    2 +-
 src/stf.c                                          |    4 ++--
 src/workbook-cmd-format.c                          |    2 +-
 31 files changed, 47 insertions(+), 48 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 5e7e06f..ffb19ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,6 @@ AM_CPPFLAGS =                                                                 \
        -I$(top_srcdir)                                                 \
        -I$(srcdir)                                                     \
        -I$(srcdir)/widgets                                             \
-       -I$(srcdir)/dialogs                                             \
        -I$(srcdir)/tools                                               \
        $(GNUMERIC_CFLAGS)
 
diff --git a/src/dialogs/dao-gui-utils.h b/src/dialogs/dao-gui-utils.h
index f2e7633..d3d3037 100644
--- a/src/dialogs/dao-gui-utils.h
+++ b/src/dialogs/dao-gui-utils.h
@@ -30,7 +30,7 @@
 #include "gnumeric.h"
 #include "numbers.h"
 #include <widgets/gnumeric-expr-entry.h>
-#include "tool-dialogs.h"
+#include "dialogs/tool-dialogs.h"
 #include "tools/dao.h"
 
 
diff --git a/src/dialogs/dialog-advanced-filter.c b/src/dialogs/dialog-advanced-filter.c
index 2c93972..7f94d4a 100644
--- a/src/dialogs/dialog-advanced-filter.c
+++ b/src/dialogs/dialog-advanced-filter.c
@@ -32,8 +32,8 @@
 #include <cell.h>
 #include <ranges.h>
 #include <gui-util.h>
-#include <tool-dialogs.h>
-#include <dao-gui-utils.h>
+#include <dialogs/tool-dialogs.h>
+#include <dialogs/dao-gui-utils.h>
 #include <value.h>
 #include <wbc-gtk.h>
 
diff --git a/src/dialogs/dialog-analysis-tool-chi-squared.c b/src/dialogs/dialog-analysis-tool-chi-squared.c
index fec0852..85e0758 100644
--- a/src/dialogs/dialog-analysis-tool-chi-squared.c
+++ b/src/dialogs/dialog-analysis-tool-chi-squared.c
@@ -35,8 +35,8 @@
 #include <gui-util.h>
 #include <parse-util.h>
 #include <gnm-format.h>
-#include <tool-dialogs.h>
-#include <dao-gui-utils.h>
+#include <dialogs/tool-dialogs.h>
+#include <dialogs/dao-gui-utils.h>
 #include <sheet.h>
 #include <expr.h>
 #include <number-match.h>
diff --git a/src/dialogs/dialog-analysis-tool-frequency.c b/src/dialogs/dialog-analysis-tool-frequency.c
index f3acc91..dd61f6d 100644
--- a/src/dialogs/dialog-analysis-tool-frequency.c
+++ b/src/dialogs/dialog-analysis-tool-frequency.c
@@ -35,8 +35,8 @@
 #include <gui-util.h>
 #include <parse-util.h>
 #include <gnm-format.h>
-#include <tool-dialogs.h>
-#include <dao-gui-utils.h>
+#include <dialogs/tool-dialogs.h>
+#include <dialogs/dao-gui-utils.h>
 #include <sheet.h>
 #include <expr.h>
 #include <number-match.h>
diff --git a/src/dialogs/dialog-analysis-tool-kaplan-meier.c b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
index 55745dd..424432b 100644
--- a/src/dialogs/dialog-analysis-tool-kaplan-meier.c
+++ b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
@@ -35,8 +35,8 @@
 #include <gui-util.h>
 #include <parse-util.h>
 #include <gnm-format.h>
-#include <tool-dialogs.h>
-#include <dao-gui-utils.h>
+#include <dialogs/tool-dialogs.h>
+#include <dialogs/dao-gui-utils.h>
 #include <sheet.h>
 #include <expr.h>
 #include <number-match.h>
diff --git a/src/dialogs/dialog-analysis-tool-normality.c b/src/dialogs/dialog-analysis-tool-normality.c
index dd849b9..68c240e 100644
--- a/src/dialogs/dialog-analysis-tool-normality.c
+++ b/src/dialogs/dialog-analysis-tool-normality.c
@@ -35,8 +35,8 @@
 #include <gui-util.h>
 #include <parse-util.h>
 #include <gnm-format.h>
-#include <tool-dialogs.h>
-#include <dao-gui-utils.h>
+#include <dialogs/tool-dialogs.h>
+#include <dialogs/dao-gui-utils.h>
 #include <sheet.h>
 #include <expr.h>
 #include <number-match.h>
diff --git a/src/dialogs/dialog-analysis-tool-one-mean.c b/src/dialogs/dialog-analysis-tool-one-mean.c
index 17fd0cb..fcdd729 100644
--- a/src/dialogs/dialog-analysis-tool-one-mean.c
+++ b/src/dialogs/dialog-analysis-tool-one-mean.c
@@ -35,8 +35,8 @@
 #include <gui-util.h>
 #include <parse-util.h>
 #include <gnm-format.h>
-#include <tool-dialogs.h>
-#include <dao-gui-utils.h>
+#include <dialogs/tool-dialogs.h>
+#include <dialogs/dao-gui-utils.h>
 #include <sheet.h>
 #include <expr.h>
 #include <number-match.h>
diff --git a/src/dialogs/dialog-analysis-tool-principal-components.c 
b/src/dialogs/dialog-analysis-tool-principal-components.c
index d5b74ac..8abcd44 100644
--- a/src/dialogs/dialog-analysis-tool-principal-components.c
+++ b/src/dialogs/dialog-analysis-tool-principal-components.c
@@ -35,8 +35,8 @@
 #include <gui-util.h>
 #include <parse-util.h>
 #include <gnm-format.h>
-#include <tool-dialogs.h>
-#include <dao-gui-utils.h>
+#include <dialogs/tool-dialogs.h>
+#include <dialogs/dao-gui-utils.h>
 #include <sheet.h>
 #include <expr.h>
 #include <number-match.h>
diff --git a/src/dialogs/dialog-analysis-tool-sign-test.c b/src/dialogs/dialog-analysis-tool-sign-test.c
index 22e510d..1da143f 100644
--- a/src/dialogs/dialog-analysis-tool-sign-test.c
+++ b/src/dialogs/dialog-analysis-tool-sign-test.c
@@ -36,8 +36,8 @@
 #include <gui-util.h>
 #include <parse-util.h>
 #include <gnm-format.h>
-#include <tool-dialogs.h>
-#include <dao-gui-utils.h>
+#include <dialogs/tool-dialogs.h>
+#include <dialogs/dao-gui-utils.h>
 #include <sheet.h>
 #include <expr.h>
 #include <number-match.h>
diff --git a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c 
b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
index 58fce0a..ca9af37 100644
--- a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
+++ b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
@@ -35,8 +35,8 @@
 #include <gui-util.h>
 #include <parse-util.h>
 #include <gnm-format.h>
-#include <tool-dialogs.h>
-#include <dao-gui-utils.h>
+#include <dialogs/tool-dialogs.h>
+#include <dialogs/dao-gui-utils.h>
 #include <sheet.h>
 #include <expr.h>
 #include <number-match.h>
diff --git a/src/dialogs/dialog-analysis-tools.c b/src/dialogs/dialog-analysis-tools.c
index 4b0eace..71a3e04 100644
--- a/src/dialogs/dialog-analysis-tools.c
+++ b/src/dialogs/dialog-analysis-tools.c
@@ -37,8 +37,8 @@
 #include <gui-util.h>
 #include <parse-util.h>
 #include <gnm-format.h>
-#include <tool-dialogs.h>
-#include <dao-gui-utils.h>
+#include <dialogs/tool-dialogs.h>
+#include <dialogs/dao-gui-utils.h>
 #include <sheet.h>
 #include <expr.h>
 #include <number-match.h>
diff --git a/src/dialogs/dialog-consolidate.c b/src/dialogs/dialog-consolidate.c
index 15f07b8..e8e35e6 100644
--- a/src/dialogs/dialog-consolidate.c
+++ b/src/dialogs/dialog-consolidate.c
@@ -24,7 +24,7 @@
 #include <gnumeric.h>
 #include "dialogs.h"
 #include "help.h"
-#include "tool-dialogs.h"
+#include "dialogs/tool-dialogs.h"
 
 #include <commands.h>
 #include <consolidate.h>
@@ -38,7 +38,7 @@
 #include <widgets/gnumeric-cell-renderer-expr-entry.h>
 #include <widgets/gnm-dao.h>
 #include <wbc-gtk.h>
-#include <dao-gui-utils.h>
+#include <dialogs/dao-gui-utils.h>
 #include <tools/dao.h>
 #include <gtk/gtk.h>
 
diff --git a/src/dialogs/dialog-fill-series.c b/src/dialogs/dialog-fill-series.c
index dbbd24a..dfe3dad 100644
--- a/src/dialogs/dialog-fill-series.c
+++ b/src/dialogs/dialog-fill-series.c
@@ -26,7 +26,7 @@
 #include <gnumeric.h>
 #include "dialogs.h"
 #include "help.h"
-#include "tool-dialogs.h"
+#include "dialogs/tool-dialogs.h"
 
 #include <gui-util.h>
 #include <selection.h>
@@ -44,7 +44,7 @@
 #include <cell.h>
 #include <widgets/gnm-dao.h>
 
-#include <dao-gui-utils.h>
+#include <dialogs/dao-gui-utils.h>
 
 #include <gtk/gtk.h>
 #include "fill-series.h"
diff --git a/src/dialogs/dialog-random-generator-cor.c b/src/dialogs/dialog-random-generator-cor.c
index b4bd86d..da6dfa7 100644
--- a/src/dialogs/dialog-random-generator-cor.c
+++ b/src/dialogs/dialog-random-generator-cor.c
@@ -25,7 +25,7 @@
 #include <gnumeric.h>
 #include "dialogs.h"
 #include "help.h"
-#include "tool-dialogs.h"
+#include "dialogs/tool-dialogs.h"
 #include "random-generator-cor.h"
 
 #include <workbook.h>
@@ -35,7 +35,7 @@
 #include <gui-util.h>
 #include <parse-util.h>
 #include <gnm-format.h>
-#include <dao-gui-utils.h>
+#include <dialogs/dao-gui-utils.h>
 #include <sheet.h>
 #include <expr.h>
 #include <number-match.h>
diff --git a/src/dialogs/dialog-random-generator.c b/src/dialogs/dialog-random-generator.c
index abd0532..d9815a4 100644
--- a/src/dialogs/dialog-random-generator.c
+++ b/src/dialogs/dialog-random-generator.c
@@ -26,7 +26,7 @@
 #include <gnumeric.h>
 #include "dialogs.h"
 #include "help.h"
-#include "tool-dialogs.h"
+#include "dialogs/tool-dialogs.h"
 #include "random-generator.h"
 
 #include <workbook.h>
@@ -36,7 +36,7 @@
 #include <gui-util.h>
 #include <parse-util.h>
 #include <gnm-format.h>
-#include <dao-gui-utils.h>
+#include <dialogs/dao-gui-utils.h>
 #include <sheet.h>
 #include <expr.h>
 #include <number-match.h>
diff --git a/src/dialogs/dialog-scenarios.c b/src/dialogs/dialog-scenarios.c
index 251a3f2..342cc1b 100644
--- a/src/dialogs/dialog-scenarios.c
+++ b/src/dialogs/dialog-scenarios.c
@@ -31,7 +31,7 @@
 #include <workbook.h>
 #include <wbc-gtk.h>
 #include <sheet.h>
-#include <dao-gui-utils.h>
+#include <dialogs/dao-gui-utils.h>
 #include <position.h>
 #include <ranges.h>
 #include <value.h>
diff --git a/src/dialogs/dialog-shuffle.c b/src/dialogs/dialog-shuffle.c
index b2c486c..1a30fc2 100644
--- a/src/dialogs/dialog-shuffle.c
+++ b/src/dialogs/dialog-shuffle.c
@@ -32,8 +32,8 @@
 #include <cell.h>
 #include <ranges.h>
 #include <gui-util.h>
-#include <tool-dialogs.h>
-#include <dao-gui-utils.h>
+#include <dialogs/tool-dialogs.h>
+#include <dialogs/dao-gui-utils.h>
 #include <value.h>
 #include <wbc-gtk.h>
 #include <commands.h>
diff --git a/src/dialogs/dialog-simulation.c b/src/dialogs/dialog-simulation.c
index 53eb708..1ddaeed 100644
--- a/src/dialogs/dialog-simulation.c
+++ b/src/dialogs/dialog-simulation.c
@@ -28,8 +28,8 @@
 #include <cell.h>
 #include <ranges.h>
 #include <gui-util.h>
-#include <tool-dialogs.h>
-#include <dao-gui-utils.h>
+#include <dialogs/tool-dialogs.h>
+#include <dialogs/dao-gui-utils.h>
 #include <value.h>
 #include <wbc-gtk.h>
 
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index f22988e..7c0677c 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -30,7 +30,7 @@
 
 #include <gui-util.h>
 #include <func.h>
-#include <tool-dialogs.h>
+#include <dialogs/tool-dialogs.h>
 #include <value.h>
 #include <cell.h>
 #include <sheet.h>
diff --git a/src/gui-clipboard.c b/src/gui-clipboard.c
index c3b14c4..871996b 100644
--- a/src/gui-clipboard.c
+++ b/src/gui-clipboard.c
@@ -29,7 +29,7 @@
 #include "commands.h"
 #include "value.h"
 #include "number-match.h"
-#include "dialog-stf.h"
+#include "dialogs/dialog-stf.h"
 #include "stf-parse.h"
 #include "mstyle.h"
 #include "gnm-format.h"
diff --git a/src/gui-file.c b/src/gui-file.c
index 9a19344..a808833 100644
--- a/src/gui-file.c
+++ b/src/gui-file.c
@@ -14,7 +14,7 @@
 
 #include "gui-util.h"
 #include "gutils.h"
-#include "dialogs.h"
+#include "dialogs/dialogs.h"
 #include "sheet.h"
 #include "application.h"
 #include "command-context.h"
diff --git a/src/io-context-gtk.c b/src/io-context-gtk.c
index 93aa7ac..3b01f06 100644
--- a/src/io-context-gtk.c
+++ b/src/io-context-gtk.c
@@ -17,7 +17,7 @@
 #include <goffice/goffice.h>
 #include "application.h"
 #include "libgnumeric.h"
-#include "dialogs.h"
+#include "dialogs/dialogs.h"
 #include "gnm-i18n.h"
 
 #include <gsf/gsf-impl-utils.h>
diff --git a/src/print.c b/src/print.c
index ed9eeb6..4f84f7b 100644
--- a/src/print.c
+++ b/src/print.c
@@ -28,7 +28,7 @@
 #include "workbook-control.h"
 #include "wbc-gtk.h"
 #include "command-context.h"
-#include "dialogs.h"
+#include "dialogs/dialogs.h"
 #include "gnumeric-conf.h"
 #include "libgnumeric.h"
 #include "sheet.h"
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index df18ea6..496a9fb 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -50,7 +50,7 @@
 #include "commands.h"
 #include "gnm-commands-slicer.h"
 #include "clipboard.h"
-#include "dialogs.h"
+#include "dialogs/dialogs.h"
 #include "gui-file.h"
 #include "sheet-merge.h"
 #include "ranges.h"
diff --git a/src/sheet-object-cell-comment.c b/src/sheet-object-cell-comment.c
index 365bc70..b2d0fdc 100644
--- a/src/sheet-object-cell-comment.c
+++ b/src/sheet-object-cell-comment.c
@@ -30,7 +30,7 @@
 #include "sheet-view.h"
 #include "sheet-merge.h"
 #include "sheet-control-gui-priv.h"
-#include "dialogs.h"
+#include "dialogs/dialogs.h"
 #include "gui-util.h"
 #include <goffice/goffice.h>
 
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index 60bf5a0..3393f61 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -44,7 +44,7 @@
 #include "cell.h"
 #include "mathfunc.h"
 #include "gnumeric-expr-entry.h"
-#include "dialogs.h"
+#include "dialogs/dialogs.h"
 #include "dialogs/help.h"
 #include "xml-sax.h"
 #include "commands.h"
diff --git a/src/sheet-object.c b/src/sheet-object.c
index 39ba941..14de232 100644
--- a/src/sheet-object.c
+++ b/src/sheet-object.c
@@ -17,7 +17,7 @@
 #include "sheet-control.h"
 #include "sheet-control-gui.h"
 #include "sheet-private.h"
-#include "dialogs.h"
+#include "dialogs/dialogs.h"
 #include "sheet-object-impl.h"
 #include "expr.h"
 #include "ranges.h"
diff --git a/src/stf-export.c b/src/stf-export.c
index 0dceb93..14ed15a 100644
--- a/src/stf-export.c
+++ b/src/stf-export.c
@@ -597,7 +597,7 @@ GSF_CLASS (GnmStfExport, gnm_stf_export,
 
 
 #include "wbc-gtk.h"
-#include "dialog-stf-export.h"
+#include "dialogs/dialog-stf-export.h"
 #include "workbook-view.h"
 
 /**
diff --git a/src/stf.c b/src/stf.c
index 07d11e2..64f3a33 100644
--- a/src/stf.c
+++ b/src/stf.c
@@ -37,8 +37,8 @@
 #include "wbc-gtk.h"
 #include "workbook-view.h"
 #include "workbook.h"
-#include "dialog-stf.h"
-#include "dialog-stf-export.h"
+#include "dialogs/dialog-stf.h"
+#include "dialogs/dialog-stf-export.h"
 #include "position.h"
 #include "expr.h"
 #include "value.h"
diff --git a/src/workbook-cmd-format.c b/src/workbook-cmd-format.c
index dda9521..e7f0962 100644
--- a/src/workbook-cmd-format.c
+++ b/src/workbook-cmd-format.c
@@ -25,7 +25,7 @@
 #include "workbook-view.h"
 #include "workbook.h"
 #include "application.h"
-#include "dialogs.h"
+#include "dialogs/dialogs.h"
 #include "sheet.h"
 #include "commands.h"
 #include "style-border.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]