From d6cb58ab663a42b3a8b04e3a3ac40f9e4074ae12 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 5 Sep 2003 10:55:42 +0000 Subject: [PATCH] Remove WorkArea.C (empty). Rearrange #includes in alphabetical and directory order. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7672 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/Alert.C | 6 +++--- src/frontends/ChangeLog | 9 ++++++++- src/frontends/Dialogs.C | 2 ++ src/frontends/LyXView.C | 29 ++++++++++++++++------------- src/frontends/Makefile.am | 1 - src/frontends/Painter.C | 4 ++-- src/frontends/Timeout.C | 1 + src/frontends/Toolbar.C | 5 ++--- src/frontends/WorkArea.C | 14 -------------- src/frontends/guiapi.C | 1 + src/frontends/screen.C | 29 ++++++++++++++--------------- 11 files changed, 49 insertions(+), 52 deletions(-) delete mode 100644 src/frontends/WorkArea.C diff --git a/src/frontends/Alert.C b/src/frontends/Alert.C index 1806e8dc90..7f246462fc 100644 --- a/src/frontends/Alert.C +++ b/src/frontends/Alert.C @@ -11,15 +11,15 @@ #include #include "Alert.h" +#include "Alert_pimpl.h" #include "debug.h" #include "lyx_gui.h" -#include "Alert_pimpl.h" - using std::endl; -using std::pair; using std::make_pair; +using std::pair; + int Alert::prompt(string const & title, string const & question, int default_button, int escape_button, diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 5cb3700652..fdeda321ef 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,4 +1,11 @@ -2003-09-04 Angus Leeming +2003-09-05 Angus Leeming + + * WorkArea.C: removed. It was entirely empty. + * Makefile.am: remove WorkArea.C + + * *.C: rearranged #includes in alphabetical and directory order. + +2003-09-04 Angus Leeming * Alert_pimpl.h: move out #include "debug.h". * LyXView.h: move out #include "types.h". diff --git a/src/frontends/Dialogs.C b/src/frontends/Dialogs.C index 5711d01803..e2c57741d0 100644 --- a/src/frontends/Dialogs.C +++ b/src/frontends/Dialogs.C @@ -13,7 +13,9 @@ #include #include "Dialogs.h" + #include "controllers/Dialog.h" + #include #include diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C index a52ae351f1..f49bdeeed1 100644 --- a/src/frontends/LyXView.C +++ b/src/frontends/LyXView.C @@ -12,24 +12,26 @@ #include #include "LyXView.h" -#include "debug.h" -#include "intl.h" -#include "lyxrc.h" -#include "lyxtext.h" +#include "Dialogs.h" +#include "Timeout.h" +#include "Toolbar.h" +#include "Menubar.h" + #include "buffer.h" -#include "MenuBackend.h" -#include "gettext.h" -#include "lyxfunc.h" -#include "funcrequest.h" -#include "lyx_cb.h" #include "BufferView.h" #include "bufferview_funcs.h" +#include "debug.h" +#include "funcrequest.h" +#include "gettext.h" +#include "intl.h" +#include "lyx_cb.h" +#include "lyxfunc.h" +#include "lyxrc.h" +#include "lyxtext.h" +#include "MenuBackend.h" -#include "Dialogs.h" -#include "Toolbar.h" -#include "Timeout.h" -#include "Menubar.h" #include "controllers/ControlCommandBuffer.h" + #include "mathed/math_cursor.h" #include "support/filetools.h" // OnlyFilename() @@ -42,6 +44,7 @@ using namespace lyx::support; using std::endl; + string current_layout; diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index 6b37652747..6e6f82d9a6 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -27,7 +27,6 @@ libfrontends_la_SOURCES = \ Timeout.h \ Toolbar.C \ Toolbar.h \ - WorkArea.C \ WorkArea.h \ WorkAreaFactory.h \ font_metrics.h \ diff --git a/src/frontends/Painter.C b/src/frontends/Painter.C index f3294346c8..6fd9fd166f 100644 --- a/src/frontends/Painter.C +++ b/src/frontends/Painter.C @@ -11,14 +11,14 @@ #include - #include "Painter.h" +#include "font_metrics.h" #include "lyxfont.h" #include "WorkArea.h" -#include "frontends/font_metrics.h" using std::max; + Painter & Painter::button(int x, int y, int w, int h) { fillRectangle(x, y, w, h, LColor::buttonbg); diff --git a/src/frontends/Timeout.C b/src/frontends/Timeout.C index db0b959c1d..64f1faf062 100644 --- a/src/frontends/Timeout.C +++ b/src/frontends/Timeout.C @@ -12,6 +12,7 @@ #include #include "Timeout.h" + #include "support/LAssert.h" using namespace lyx::support; diff --git a/src/frontends/Toolbar.C b/src/frontends/Toolbar.C index 5faae3f6d7..d7a391ee6a 100644 --- a/src/frontends/Toolbar.C +++ b/src/frontends/Toolbar.C @@ -10,13 +10,12 @@ #include - #include "Toolbar.h" -#include "ToolbarBackend.h" + #include "debug.h" #include "LyXAction.h" +#include "ToolbarBackend.h" -using std::endl; Toolbar::Toolbar() : last_textclass_(-1) diff --git a/src/frontends/WorkArea.C b/src/frontends/WorkArea.C deleted file mode 100644 index 969cadcd41..0000000000 --- a/src/frontends/WorkArea.C +++ /dev/null @@ -1,14 +0,0 @@ -/** - * \file WorkArea.C - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * - * \author Asger and Juergen - * - * Full author contact details are available in file CREDITS. - */ - -#include - - -#include "WorkArea.h" diff --git a/src/frontends/guiapi.C b/src/frontends/guiapi.C index 0a29fba932..8d6922008d 100644 --- a/src/frontends/guiapi.C +++ b/src/frontends/guiapi.C @@ -14,6 +14,7 @@ #include "guiapi.h" #include "Dialogs.h" + extern "C" { void gui_show_dialog(Dialogs * d, char const * name, char const * data) diff --git a/src/frontends/screen.C b/src/frontends/screen.C index e86b870597..c4f320acd5 100644 --- a/src/frontends/screen.C +++ b/src/frontends/screen.C @@ -13,28 +13,27 @@ #include #include "screen.h" +#include "font_metrics.h" +#include "lyx_gui.h" +#include "Painter.h" +#include "WorkArea.h" -#include "lyxtext.h" -#include "lyxrc.h" -#include "lyxrow.h" #include "BufferView.h" #include "buffer.h" -#include "WorkArea.h" -#include "Painter.h" -#include "font_metrics.h" -#include "language.h" #include "debug.h" -#include "rowpainter.h" -#include "insets/updatableinset.h" -#include "lyx_gui.h" -#include "metricsinfo.h" - -// Splash screen-specific stuff +#include "language.h" #include "lyxfont.h" +#include "lyxrc.h" +#include "lyxrow.h" +#include "lyxtext.h" +#include "metricsinfo.h" +#include "rowpainter.h" #include "version.h" -#include "graphics/GraphicsLoader.h" +#include "insets/updatableinset.h" + #include "graphics/GraphicsImage.h" +#include "graphics/GraphicsLoader.h" #include "support/filetools.h" // LibFileSearch @@ -46,7 +45,7 @@ using namespace lyx::support; using std::min; using std::max; -using std::endl; + namespace {