cosmetics... less than intented

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21190 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Length.cpp b/src/Length.cpp
index a47052b506757b53083842dd7c33c7b1ad4a4bd2..4627f8bf47104e3101df88970131353d9411b922 100644 (file)
--- a/src/Length.cpp
+++ b/src/Length.cpp
@@ -16,10 +16,10 @@
 #include <config.h>
 
 #include "Length.h"
-#include "lengthcommon.h"
 #include "LyXRC.h"
 
 #include "support/docstream.h"
+
 #include <sstream>
 #include <iomanip>
 

diff --git a/src/Length.h b/src/Length.h
index 725943503c016f364241fc32788dce0ebb547b8d..a5dd75143f7a3e30f0b75f7f56b8353174255dec 100644 (file)
--- a/src/Length.h
+++ b/src/Length.h
@@ -12,8 +12,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef LYX_LENGTH_H
-#define LYX_LENGTH_H
+#ifndef LENGTH_H
+#define LENGTH_H
 
 #include "support/docstring.h"
 
@@ -182,6 +182,22 @@ bool operator!=(GlueLength const & l1, GlueLength const & l2);
     stored into "result", if that is not 0. */
 bool isValidGlueLength(std::string const & data, GlueLength * result = 0);
 
+/// the number of units possible
+extern int const num_units;
+
+/**
+ * array of unit names
+ *
+ * FIXME: I am not sure if "mu" should be possible to select (Lgb)
+ */
+extern char const * const unit_name[];
+extern char const * const unit_name_gui[];
+
+/// return the unit given a string representation such as "cm"
+Length::UNIT unitFromString(std::string const & data);
+
+
+
 } // namespace lyx
 
-#endif // LYXLENGTH_H
+#endif // LENGTH_H

diff --git a/src/Makefile.am b/src/Makefile.am
index d73e7f1d09ff2dcb8a3ac79507bb53b0f4cb79b2..318fd20ce88daa87e74e3133de705661ea100c6c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -181,7 +181,6 @@ liblyxcore_la_SOURCES = \
        Length.cpp \
        Length.h \
        lengthcommon.cpp \
-       lengthcommon.h \
        Lexer.cpp \
        Lexer.h \
        lfuns.h \

diff --git a/src/VSpace.cpp b/src/VSpace.cpp
index c080e7d9940ab2a549a84faee97c9bddcbf5ece6..f377edebaed284f1f69f99c1a7f92ca088a7ccde 100644 (file)
--- a/src/VSpace.cpp
+++ b/src/VSpace.cpp
@@ -11,11 +11,12 @@
 #include <config.h>
 
 #include "VSpace.h"
+
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "gettext.h"
-#include "lengthcommon.h"
+#include "Length.h"
 #include "Text.h"
 #include "TextMetrics.h" // for defaultRowHeight()
 

diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index 93bf7b57b7ba51494045b754b3c722d9d6946ac5..2ec93db89cbfd06f04952e4e516da8e5bf95fc6f 100644 (file)
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -18,8 +18,8 @@
 #include "gettext.h"
 
 #include "LengthCombo.h"
+#include "Length.h"
 #include "qt_helpers.h"
-#include "lengthcommon.h"
 #include "LyXRC.h" // to set the default length values
 #include "Validator.h"
 

diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp
index f16d6ed8aa82adad45ff636febe099ccd2408e0d..386bc1fcfa7d1771e1fa806511a14c661e6a2d82 100644 (file)
--- a/src/frontends/qt4/GuiExternal.cpp
+++ b/src/frontends/qt4/GuiExternal.cpp
@@ -14,11 +14,10 @@
 
 #include "GuiExternal.h"
 
-#include "GuiExternal.h"
 #include "frontend_helpers.h"
 #include "FuncRequest.h"
 #include "gettext.h"
-#include "lengthcommon.h"
+#include "Length.h"
 #include "LyXRC.h"
 
 #include "insets/ExternalSupport.h"

diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp
index fb22af224497e1279ec10f8dbcbf72487e91cb13..66a01ca51cf2a3dfd2f5f56bb642aaa4deb27360 100644 (file)
--- a/src/frontends/qt4/GuiGraphics.cpp
+++ b/src/frontends/qt4/GuiGraphics.cpp
@@ -16,10 +16,9 @@
 
 #include "GuiGraphics.h"
 
-#include "GuiGraphics.h"
 #include "debug.h"
 #include "LengthCombo.h"
-#include "lengthcommon.h"
+#include "Length.h"
 #include "LyXRC.h"
 #include "qt_helpers.h"
 #include "Validator.h"

diff --git a/src/frontends/qt4/LengthCombo.cpp b/src/frontends/qt4/LengthCombo.cpp
index 648bc7a246fb15a8adec891e8e76644e6ee69f3f..9b1db41b46fd0a9d8a00a8c8ad232d890cd57a0b 100644 (file)
--- a/src/frontends/qt4/LengthCombo.cpp
+++ b/src/frontends/qt4/LengthCombo.cpp
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "LengthCombo.h"
-#include "lengthcommon.h"
+
 #include "qt_helpers.h"
 
 

diff --git a/src/frontends/qt4/qt_helpers.cpp b/src/frontends/qt4/qt_helpers.cpp
index 9bfa3955d35c6691f67004a39d4905d6c2e14374..9734a29b087da506ebd64c1c8fb7eafb3a8f55ea 100644 (file)
--- a/src/frontends/qt4/qt_helpers.cpp
+++ b/src/frontends/qt4/qt_helpers.cpp
@@ -12,17 +12,17 @@
 
 #include <config.h>
 
-#include "LengthCombo.h"
 #include "qt_helpers.h"
 
-#include "lengthcommon.h"
+#include "LengthCombo.h"
+
+#include "debug.h"
 #include "gettext.h"
+#include "Length.h"
 
 #include "support/os.h"
 #include "support/lstrings.h"
 
-#include "debug.h"
-
 #include <QComboBox>
 #include <QCheckBox>
 #include <QPalette>

diff --git a/src/lengthcommon.cpp b/src/lengthcommon.cpp
index 191eca85ba0e7ee85df8e1dbee545ab69f953e2d..9897dc3413de94c4669687602056247b09e4ff10 100644 (file)
--- a/src/lengthcommon.cpp
+++ b/src/lengthcommon.cpp
@@ -12,7 +12,7 @@
 
 #include <config.h>
 
-#include "lengthcommon.h"
+#include "Length.h"
 
 #include "gettext.h"
 

diff --git a/src/lengthcommon.h b/src/lengthcommon.h
deleted file mode 100644 (file)
index 4d4acc9..0000000
--- a/src/lengthcommon.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*-
-/**
- * \file lengthcommon.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Lars Gullik Bjønnes
- * \author Matthias Ettrich
- * \author Jean-Marc Lasgouttes
- * \author John Levon
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef LENGTH_COMMON_H
-#define LENGTH_COMMON_H
-
-#include "Length.h"
-
-
-namespace lyx {
-
-
-/// the number of units possible
-extern int const num_units;
-
-/**
- * array of unit names
- *
- * FIXME: I am not sure if "mu" should be possible to select (Lgb)
- */
-extern char const * const unit_name[];
-extern char const * const unit_name_gui[];
-
-/// return the unit given a string representation such as "cm"
-Length::UNIT unitFromString(std::string const & data);
-
-
-
-} // namespace lyx
-
-#endif // LENGTH_COMMON_H

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 1993098ff64dd19dbd1a92cf25768db5d01411d7..e1f9c2412f4062b60dce65deda1f24783064b12d 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -14,15 +14,16 @@
 #include <config.h>
 
 #include "tex2lyx.h"
+
 #include "Context.h"
-#include "Layout.h"
 #include "FloatList.h"
-#include "lengthcommon.h"
+#include "Layout.h"
+#include "Length.h"
+
 #include "support/lstrings.h"
 #include "support/convert.h"
 #include "support/filetools.h"
 
-#include <boost/filesystem/operations.hpp>
 #include <boost/tuple/tuple.hpp>
 
 #include <iostream>
@@ -52,8 +53,6 @@ using support::suffixIs;
 using support::contains;
 using support::subst;
 
-namespace fs = boost::filesystem;
-
 
 void parse_text_in_inset(Parser & p, ostream & os, unsigned flags, bool outer,
                Context const & context)