Fix computation of string width when using a QTextLayout

[lyx.git] / src / Intl.cpp

diff --git a/src/Intl.cpp b/src/Intl.cpp
index bdf295e6556f0940e1b4cd26a6d9475e5b7d5f3f..fdae0b1aba144b5bc1471e0749830fba66d0f7ea 100644 (file)
--- a/src/Intl.cpp
+++ b/src/Intl.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Angus Leeming
  * \author John Levon
  *
@@ -14,11 +14,9 @@
 #include <config.h>
 
 #include "Intl.h"
-#include "debug.h"
 #include "LyXRC.h"
 
-using std::endl;
-
+#include "support/debug.h"
 
 namespace lyx {
 
@@ -39,18 +37,19 @@ void Intl::keyMapOn(bool on)
                        keyMapPrim();
                else
                        keyMapSec();
-       } else
+       } else {
                trans.disableKeymap();
+       }
 }
 
 
 void Intl::toggleKeyMap()
 {
-       if (keymapon && (keymap == PRIMARY)) {
+       if (keymapon && (keymap == PRIMARY))
                keyMapSec();
-       } else if (keymapon) {
+       else if (keymapon)
                keyMapOn(false);
-       } else
+       else
                keyMapPrim();
 }
 
@@ -77,7 +76,7 @@ void Intl::keyMapSec()
 
 void Intl::initKeyMapper(bool on)
 {
-       LYXERR(Debug::INIT) << "Initializing key mappings..." << endl;
+       LYXERR(Debug::INIT, "Initializing key mappings...");
 
        if (trans.setPrimary(prim_lang) == -1)
                prim_lang.erase();