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

diff --git a/src/frontends/Alert.C b/src/frontends/Alert.C
index 1806e8dc90839ccb79ef3c3aa160aa460eaa0346..7f246462fc8e0f682ad4e98de1b73f623f24c8cf 100644 (file)
--- a/src/frontends/Alert.C
+++ b/src/frontends/Alert.C
@@ -11,15 +11,15 @@
 #include <config.h>
 
 #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 5cb370065277466516e4e0f1dacb75ebe0679392..fdeda321ef992119d2f2a0c1a7da28015177a07b 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,4 +1,11 @@
-2003-09-04  Angus Leeming  <angus@localhost.localdomain>
+2003-09-05  Angus Leeming  <leeming@lyx.org>
+
+       * 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  <leeming@lyx.org>
 
        * 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 5711d0180360eb921c483f4b51cc5cb41868ef2d..e2c57741d066afdf3647101920d27fefb67f594e 100644 (file)
--- a/src/frontends/Dialogs.C
+++ b/src/frontends/Dialogs.C
@@ -13,7 +13,9 @@
 #include <config.h>
 
 #include "Dialogs.h"
+
 #include "controllers/Dialog.h"
+
 #include <boost/signals/signal2.hpp>
 #include <boost/bind.hpp>
 

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index a52ae351f1c5d8c1b059350b6b89833ee4dd2da0..f49bdeeed1b542862f4c9b9dd170c07704233c97 100644 (file)
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -12,24 +12,26 @@
 #include <config.h>
 
 #include "LyXView.h"
+#include "Dialogs.h"
+#include "Timeout.h"
+#include "Toolbar.h"
+#include "Menubar.h"
+
+#include "buffer.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 "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 "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 6b37652747d6408e7ecd41f9492a1578fdcd975e..6e6f82d9a672a7e1f34457ab4e5b21d2beab3ae0 100644 (file)
--- 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 f3294346c80b0e8fbbbbed168c32f995f3aaa3ea..6fd9fd166f50083b322053f30263bb699305ecbd 100644 (file)
--- a/src/frontends/Painter.C
+++ b/src/frontends/Painter.C
@@ -11,14 +11,14 @@
 
 #include <config.h>
 
-
 #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 db0b959c1dcd8653b5b5e37b84e9535f7570db06..64f1faf062454f73999949acee3d7106de1c831e 100644 (file)
--- a/src/frontends/Timeout.C
+++ b/src/frontends/Timeout.C
@@ -12,6 +12,7 @@
 #include <config.h>
 
 #include "Timeout.h"
+
 #include "support/LAssert.h"
 
 using namespace lyx::support;

diff --git a/src/frontends/Toolbar.C b/src/frontends/Toolbar.C
index 5faae3f6d75306000eaf2a3a3ac0d14e96b8311f..d7a391ee6ae88fde9084043e4d85adb8ff880c7d 100644 (file)
--- a/src/frontends/Toolbar.C
+++ b/src/frontends/Toolbar.C
@@ -10,13 +10,12 @@
 
 #include <config.h>
 
-
 #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 (file)
index 969cadc..0000000
--- 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 <config.h>
-
-
-#include "WorkArea.h"

diff --git a/src/frontends/guiapi.C b/src/frontends/guiapi.C
index 0a29fba932eac4ac10cf6313f5f73fe1c158253b..8d6922008d1c32409c74d4ba7ed38ba4e8fd0bf9 100644 (file)
--- 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 e86b870597216c64c41ac348473940e15e067a56..c4f320acd5b62e2705b6b456fd07bb3d21c24a19 100644 (file)
--- a/src/frontends/screen.C
+++ b/src/frontends/screen.C
@@ -13,28 +13,27 @@
 #include <config.h>
 
 #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 {