cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

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

diff --git a/src/buffer.C b/src/buffer.C
index 1467f5bd5486b81b83840063227f3cc355f30dfa..91d57fa612c2cdcf3d6cd030f6c079148adfc8b5 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -55,7 +55,7 @@
 #include "insets/insetinclude.h"
 #include "insets/insettext.h"
 
-#include "mathed/MatheMacroTemplate.h"
+#include "mathed/MathMacroTemplate.h"
 #include "mathed/MathMacroTable.h"
 #include "mathed/MathSupport.h"
 

diff --git a/src/frontends/WorkArea.h b/src/frontends/WorkArea.h
index 7c399a18751fcb9b9c3539264a7d4c1dd8c4a58f..66898685310b5a5b69b68a815169f1044f16684e 100644 (file)
--- a/src/frontends/WorkArea.h
+++ b/src/frontends/WorkArea.h
@@ -22,10 +22,14 @@
 
 #include <boost/signals/trackable.hpp>
 
+// FIXME: defined in X.h, spuriously pulled in by Qt 3 headers
+#undef CursorShape
+
 class BufferView;
 class FuncRequest;
 class LyXView;
 
+
 namespace lyx {
 namespace frontend {
 

diff --git a/src/mathed/MathFactory.C b/src/mathed/MathFactory.C
index f8d44d9de9583afe5d83fec5e3fc1c48e0d79220..fd322961d4f82c45726fc121fab55b114955e65c 100644 (file)
--- a/src/mathed/MathFactory.C
+++ b/src/mathed/MathFactory.C
@@ -11,33 +11,30 @@
 #include <config.h>
 
 #include "MathFactory.h"
-#include "MathParser.h"
-#include "InsetMathArray.h"
+
 #include "InsetMathAMSArray.h"
+#include "InsetMathArray.h"
 #include "InsetMathBinom.h"
-#include "InsetMathBox.h"
-#include "InsetMathBoxed.h"
 #include "InsetMathBoldSymbol.h"
+#include "InsetMathBoxed.h"
+#include "InsetMathBox.h"
 #include "InsetMathCases.h"
 #include "InsetMathColor.h"
 #include "InsetMathDecoration.h"
 #include "InsetMathDFrac.h"
 #include "InsetMathDots.h"
 #include "InsetMathFBox.h"
-#include "InsetMathFrameBox.h"
 #include "InsetMathFont.h"
 #include "InsetMathFontOld.h"
 #include "InsetMathFrac.h"
+#include "InsetMathFrameBox.h"
 #include "InsetMathKern.h"
 #include "InsetMathLefteqn.h"
 #include "InsetMathMacro.h"
-#include "MathMacroArgument.h"
-#include "MathMacroTable.h"
-#include "MathMacroTemplate.h"
 #include "InsetMathMakebox.h"
 #include "InsetMathOverset.h"
-#include "MathParser.h"
 #include "InsetMathPhantom.h"
+#include "InsetMathRef.h"
 #include "InsetMathRoot.h"
 #include "InsetMathSize.h"
 #include "InsetMathSpace.h"
@@ -52,12 +49,13 @@
 #include "InsetMathUnknown.h"
 #include "InsetMathXArrow.h"
 #include "InsetMathXYMatrix.h"
-
-//#include "insets/insetref.h"
-#include "InsetMathRef.h"
+#include "MathMacroArgument.h"
+#include "MathMacroTable.h"
+#include "MathMacroTemplate.h"
+#include "MathParser.h"
+#include "MathSupport.h"
 
 #include "debug.h"
-#include "MathSupport.h"
 
 #include "support/filetools.h" // LibFileSearch
 #include "support/lstrings.h"

diff --git a/src/mathed/MathParser.C b/src/mathed/MathParser.C
index 826d61529ec680da64093d3e2c68862a57830c65..f71fccab460081e952a3ef93c4bf310e3dbf1824 100644 (file)
--- a/src/mathed/MathParser.C
+++ b/src/mathed/MathParser.C
@@ -39,6 +39,7 @@ following hack as starting point to write some macros:
 #include <config.h>
 
 #include "MathParser.h"
+
 #include "InsetMathArray.h"
 #include "InsetMathBig.h"
 #include "InsetMathBrace.h"
@@ -47,20 +48,18 @@ following hack as starting point to write some macros:
 #include "InsetMathComment.h"
 #include "InsetMathDelim.h"
 #include "InsetMathEnv.h"
-#include "MathFactory.h"
 #include "InsetMathKern.h"
 #include "InsetMathMacro.h"
-#include "MathMacroArgument.h"
-#include "MathMacroTemplate.h"
 #include "InsetMathPar.h"
+#include "InsetMathRef.h"
 #include "InsetMathRoot.h"
 #include "InsetMathScript.h"
 #include "InsetMathSqrt.h"
-#include "MathSupport.h"
 #include "InsetMathTabular.h"
-
-//#include "insets/insetref.h"
-#include "InsetMathRef.h"
+#include "MathMacroTemplate.h"
+#include "MathFactory.h"
+#include "MathMacroArgument.h"
+#include "MathSupport.h"
 
 #include "lyxlex.h"
 #include "debug.h"