Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / mathed / MathMacroArgument.cpp

diff --git a/src/mathed/MathMacroArgument.cpp b/src/mathed/MathMacroArgument.cpp
index b7a0273266322c57b2da3e2ade0a697f02aafa57..2e6b0e2275e46bd49a531c99528335790a55be79 100644 (file)
--- a/src/mathed/MathMacroArgument.cpp
+++ b/src/mathed/MathMacroArgument.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,12 +15,12 @@
 #include "MathStream.h"
 #include "MathSupport.h"
 
-#include "debug.h"
+#include "support/debug.h"
 
 
 namespace lyx {
 
-MathMacroArgument::MathMacroArgument(size_t n)
+MathMacroArgument::MathMacroArgument(int n)
        : number_(n)
 {
        if (n < 1 || n > 9) {
@@ -43,7 +43,7 @@ Inset * MathMacroArgument::clone() const
 }
 
 
-void MathMacroArgument::setNumber(size_t n)
+void MathMacroArgument::setNumber(int n)
 {
        if (n < 1 || n > 9) {
                LYXERR0("MathMacroArgument::setNumber: wrong Argument id: " << n);
@@ -62,7 +62,7 @@ void MathMacroArgument::write(WriteStream & os) const
 
 void MathMacroArgument::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       mathed_string_dim(mi.base.font, str_, dim);
+       metricsStrRedBlack(mi, dim, str_);
 }