Use QT_VERSION >= 300 instead of >= 0x030000

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index feede38a666b6b5b44c1429f376d749af506d5f3..56a75b7be341caf4d37859fac32be9879eb87175 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-20  Dekel Tsur  <dekelts@tau.ac.il>
+
+       * several files: Use QT_VERSION >= 300 instead of >= 0x030000
+
 2002-10-20  John Levon  <levon@movementarian.org>
 
        * ui/QDelimiterDialog.ui: remove two huge XPMs that

diff --git a/src/frontends/qt2/QLPainter.C b/src/frontends/qt2/QLPainter.C
index 07d6a085c527b12f15f6db33ea0d7b24a0485346..ffabddcaeaf201a6a62395953cc840aefbd1d2b7 100644 (file)
--- a/src/frontends/qt2/QLPainter.C
+++ b/src/frontends/qt2/QLPainter.C
@@ -256,7 +256,7 @@ Painter & QLPainter::text(int x, int y,
                encoding = encodings.symbol_encoding();
 
        QString str;
-#if QT_VERSION >= 0x030000
+#if QT_VERSION >= 300
        str.setLength(ls);
        for (size_t i = 0; i < ls; ++i)
                str[i] = QChar(encoding->ucs(s[i]));
@@ -270,7 +270,7 @@ Painter & QLPainter::text(int x, int y,
 
        if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
                qp_->setFont(fontloader.get(f));
-#if QT_VERSION >= 0x030000
+#if QT_VERSION >= 300
                // We need to draw the text as LTR as we use our own bidi
                // code.
                qp_->drawText(x, y, str, -1, QPainter::LTR);

diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt2/qfont_loader.C
index ec6e18621a43da9922236690c14cf3805aa35f04..5558d80ce4bd74b99cefec5433d281b9479297b8 100644 (file)
--- a/src/frontends/qt2/qfont_loader.C
+++ b/src/frontends/qt2/qfont_loader.C
@@ -22,7 +22,7 @@
 #include "BufferView.h"
 
 #include <qglobal.h>
-#if QT_VERSION < 0x030000
+#if QT_VERSION < 300
 #include "support/lstrings.h"
 #endif
 
@@ -164,7 +164,7 @@ bool qfont_loader::available(LyXFont const & f)
        if (!lyxrc.use_gui)
                return false;
 
-#if QT_VERSION >= 0x030000
+#if QT_VERSION >= 300
        return getfontinfo(f)->font.exactMatch();
 #else
        string tmp;

diff --git a/src/frontends/qt2/qfont_metrics.C b/src/frontends/qt2/qfont_metrics.C
index c6b6bcebb0d82deafe5b01652e77c3e20d216814..30f4dd3234dfadb3b55be230a1b571a99a7ec4ca 100644 (file)
--- a/src/frontends/qt2/qfont_metrics.C
+++ b/src/frontends/qt2/qfont_metrics.C
@@ -88,7 +88,7 @@ int width(char const * s, size_t ls, LyXFont const & f)
                encoding = encodings.symbol_encoding();
 
        QString str;
-#if QT_VERSION >= 0x030000
+#if QT_VERSION >= 300
        str.setLength(ls);
        for (size_t i = 0; i < ls; ++i)
                str[i] = QChar(encoding->ucs(s[i]));