Cosmetics mainly: Rename math.h to cmath, reorder some includes, remove some includes...

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

diff --git a/src/Compare.cpp b/src/Compare.cpp
index d9ccfee396277d795bc261a1f9e0595946cd44c1..db849b1bd229bc6a04e7faa11450d604316fe692 100644 (file)
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -20,7 +20,8 @@
 #include "support/lassert.h"   
 
 #include <boost/next_prior.hpp>
-#include <math.h>
+
+#include <cmath>
 
 using namespace std;
 using namespace lyx::support;

diff --git a/src/Compare.h b/src/Compare.h
index f2583aebaa87346b42c29091fed9a9090ff12ca4..39ba46967146f3aa8aefe4412cb552e9fc82907f 100644 (file)
--- a/src/Compare.h
+++ b/src/Compare.h
@@ -16,12 +16,12 @@
 
 #include "support/FileName.h"
 
-#include <string>
-
 #include <QObject>
 #include <QThread>
 #include <QWaitCondition>
 
+#include <string>
+
 
 namespace lyx {
 

diff --git a/src/frontends/qt4/FindAndReplace.cpp b/src/frontends/qt4/FindAndReplace.cpp
index 53a19b56b0dc39ec17bdf2be2e3276913db69ffb..dc409ba2cb312e860e5a64c7dc4f4b7e5fa15463 100644 (file)
--- a/src/frontends/qt4/FindAndReplace.cpp
+++ b/src/frontends/qt4/FindAndReplace.cpp
@@ -13,9 +13,9 @@
 #include "FindAndReplace.h"
 
 #include "GuiApplication.h"
-#include "qt_helpers.h"
 #include "GuiView.h"
 #include "GuiWorkArea.h"
+#include "qt_helpers.h"
 
 #include "buffer_funcs.h"
 #include "BufferParams.h"
@@ -23,16 +23,17 @@
 #include "Cursor.h"
 #include "FuncRequest.h"
 #include "lyxfind.h"
-#include "OutputParams.h"
 #include "output_latex.h"
+#include "OutputParams.h"
 #include "TexRow.h"
-#include "alert.h"
+
+#include "frontends/alert.h"
 
 #include "support/debug.h"
+#include "support/filetools.h"
 #include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
-#include "support/filetools.h"
 
 #include <QCloseEvent>
 #include <QLineEdit>

diff --git a/src/frontends/qt4/GuiProgressView.cpp b/src/frontends/qt4/GuiProgressView.cpp
index c2e38e165ad709902ae8ba2e94f535b549b1447f..2677c2997b4452b38506f183590e8724200d51f3 100644 (file)
--- a/src/frontends/qt4/GuiProgressView.cpp
+++ b/src/frontends/qt4/GuiProgressView.cpp
@@ -13,19 +13,19 @@
 #include <config.h>
 
 #include "GuiProgressView.h"
-#include "GuiApplication.h"
 
+#include "GuiApplication.h"
 #include "qt_helpers.h"
+
 #include "FuncRequest.h"
 
-#include "support/debug.h"
 #include "support/convert.h"
-
-#include <QSettings>
-#include <QTime>
+#include "support/debug.h"
 
 #include <QCheckBox>
 #include <QDebug>
+#include <QSettings>
+#include <QTime>
 
 using namespace std;
 using namespace lyx::support;

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index bfa88ff658fd4e7dcfab37e9ac9a481d13d67cfc..d65936e6232814e9d15f5ef40e4f7373e97cead2 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -17,39 +17,35 @@
 #include "lyxfind.h"
 
 #include "Buffer.h"
-#include "BufferList.h"
 #include "buffer_funcs.h"
+#include "BufferList.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Changes.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
 #include "FuncRequest.h"
-#include "OutputParams.h"
+#include "LyXFunc.h"
 #include "output_latex.h"
+#include "OutputParams.h"
 #include "Paragraph.h"
 #include "ParIterator.h"
 #include "TexRow.h"
 #include "Text.h"
-#include "FuncRequest.h"
-#include "LyXFunc.h"
+
+#include "frontends/alert.h"
 
 #include "mathed/InsetMath.h"
 #include "mathed/InsetMathGrid.h"
 #include "mathed/InsetMathHull.h"
 #include "mathed/MathStream.h"
 
-#include "frontends/alert.h"
-
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
-#include "support/lstrings.h"
 #include "support/lassert.h"
-
-#include "frontends/Application.h"
-#include "frontends/LyXView.h"
+#include "support/lstrings.h"
 
 #include <boost/regex.hpp>
 #include <boost/next_prior.hpp>
@@ -1226,7 +1222,7 @@ bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt)
 }
 
 
-ostringstream & operator<<(ostringstream & os, lyx::FindAndReplaceOptions const & opt)
+ostringstream & operator<<(ostringstream & os, FindAndReplaceOptions const & opt)
 {
        os << to_utf8(opt.search) << "\nEOSS\n"
           << opt.casesensitive << ' '
@@ -1244,7 +1240,7 @@ ostringstream & operator<<(ostringstream & os, lyx::FindAndReplaceOptions const
        return os;
 }
 
-istringstream & operator>>(istringstream & is, lyx::FindAndReplaceOptions & opt)
+istringstream & operator>>(istringstream & is, FindAndReplaceOptions & opt)
 {
        LYXERR(Debug::FIND, "parsing");
        string s;