X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacroArgument.cpp;h=76b43f3629f255a0fffc3f5a0ee4186ed8e95bc8;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=ebf2ee615e969a08b80ccc56f23ee144fb388e22;hpb=12314897982e07afd8926c997f66d7bb08e7e1fd;p=lyx.git

diff --git a/src/mathed/MathMacroArgument.cpp b/src/mathed/MathMacroArgument.cpp
index ebf2ee615e..76b43f3629 100644
--- 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,21 +15,16 @@
 #include "MathStream.h"
 #include "MathSupport.h"
 
-#include "debug.h"
+#include "support/debug.h"
 
 
 namespace lyx {
 
-using std::endl;
-using std::size_t;
-
-
-MathMacroArgument::MathMacroArgument(size_t n)
+MathMacroArgument::MathMacroArgument(int n)
 	: number_(n)
 {
 	if (n < 1 || n > 9) {
-		lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
-			<< n << endl;
+		LYXERR0("MathMacroArgument::MathMacroArgument: wrong Argument id: " << n);
 	}
 
 	// The profiler tells us not to use
@@ -48,11 +43,10 @@ Inset * MathMacroArgument::clone() const
 }
 
 
-void MathMacroArgument::setNumber(std::size_t n)
+void MathMacroArgument::setNumber(int n)
 {
 	if (n < 1 || n > 9) {
-		lyxerr << "MathMacroArgument::setNumber: wrong Argument id: "
-		<< n << endl;
+		LYXERR0("MathMacroArgument::setNumber: wrong Argument id: " << n);
 	}
 
 	number_ = n;
@@ -68,14 +62,13 @@ 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_);
 }
 
 
 void MathMacroArgument::draw(PainterInfo & pi, int x, int y) const
 {
 	drawStrRed(pi, x, y, str_);
-	setPosCache(pi, x, y);
 }