* qt_helpers.[Ch]: new conversion from/to ucs4 strings and chars to/from QChar and...

[lyx.git] / src / frontends / qt4 / QLPainter.C

diff --git a/src/frontends/qt4/QLPainter.C b/src/frontends/qt4/QLPainter.C
index a8d5e30aa78e416e61e7db76b7ff2784c5688d0a..4fdbd7f28bea087c1f8ec55f858c4987841c354f 100644 (file)
--- a/src/frontends/qt4/QLPainter.C
+++ b/src/frontends/qt4/QLPainter.C
@@ -19,6 +19,7 @@
 #include "FontLoader.h"
 
 #include "Application.h"
+#include "qt_helpers.h"
 
 #include "debug.h"
 #include "language.h"
@@ -26,11 +27,16 @@
 
 #include "frontends/font_metrics.h"
 
+#include "support/unicode.h"
+
 #include <QPainter>
 #include <QPicture>
 #include <QPixmap>
 #include <QImage>
 
+using lyx::char_type;
+using lyx::docstring;
+
 using std::endl;
 using std::string;
 
@@ -52,7 +58,7 @@ void QLPainter::start()
 {
        qp_.reset(new QPainter(qwa_->paintDevice()));
        // new QPainter has default QPen:
-       current_color_ = LColor::black; 
+       current_color_ = LColor::black;
        current_ls_ = line_solid;
        current_lw_ = line_thin;
 }
@@ -177,15 +183,15 @@ void QLPainter::image(int x, int y, int w, int h,
 }
 
 
-void QLPainter::text(int x, int y, string const & s, LyXFont const & f)
+void QLPainter::text(int x, int y, docstring const & s, LyXFont const & f)
 {
-       return text(x, y, s.data(), s.length(), f);
+    return text(x, y, reinterpret_cast<char_type const *>(s.data()), s.length(), f);
 }
 
 
-void QLPainter::text(int x, int y, char c, LyXFont const & f)
+void QLPainter::text(int x, int y, char_type c, LyXFont const & f)
 {
-       char s[2] = { c, '\0' };
+       char_type s[2] = { c, char_type('\0') };
        return text(x, y, s, 1, f);
 }
 
@@ -205,7 +211,7 @@ void QLPainter::smallCapsText(int x, int y,
        int tmpx = x;
        size_t ls = s.length();
        for (unsigned int i = 0; i < ls; ++i) {
-               QChar const c = s[i].upper();
+               QChar const c = s[i].toUpper();
                if (c != s.at(i)) {
                        qp_->setFont(qsmallfont);
                        qp_->drawText(tmpx, y, c);
@@ -219,22 +225,30 @@ void QLPainter::smallCapsText(int x, int y,
 }
 
 
-void QLPainter::text(int x, int y, char const * s, size_t ls,
+void QLPainter::text(int x, int y, char_type const * s, size_t ls,
        LyXFont const & f)
 {
+#if 0
        Encoding const * encoding = f.language()->encoding();
        if (f.isSymbolFont())
                encoding = encodings.symbol_encoding();
+#endif
 
+#if 0
        QString str;
        str.setLength(ls);
        for (unsigned int i = 0; i < ls; ++i)
                str[i] = QChar(encoding->ucs(s[i]));
+#else
+       QString str = ucs4_to_qstring(s, ls);
+#endif
 
+#if 0
        // HACK: QT3 refuses to show single compose characters
        //       Still needed with Qt4?
        if (ls == 1 && str[0].unicode() >= 0x05b0 && str[0].unicode() <= 0x05c2)
                str = ' ' + str;
+#endif
 
        if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
                setQPainterPen(f.realColor());