From 10e10e8ff89c98822410e5dba1346badcb13df76 Mon Sep 17 00:00:00 2001 From: Dekel Tsur Date: Sun, 20 Oct 2002 14:27:28 +0000 Subject: [PATCH] Use QT_VERSION >= 300 instead of >= 0x030000 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5449 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 4 ++++ src/frontends/qt2/QLPainter.C | 4 ++-- src/frontends/qt2/qfont_loader.C | 4 ++-- src/frontends/qt2/qfont_metrics.C | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index feede38a66..56a75b7be3 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2002-10-20 Dekel Tsur + + * several files: Use QT_VERSION >= 300 instead of >= 0x030000 + 2002-10-20 John Levon * ui/QDelimiterDialog.ui: remove two huge XPMs that diff --git a/src/frontends/qt2/QLPainter.C b/src/frontends/qt2/QLPainter.C index 07d6a085c5..ffabddcaea 100644 --- 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 ec6e18621a..5558d80ce4 100644 --- a/src/frontends/qt2/qfont_loader.C +++ b/src/frontends/qt2/qfont_loader.C @@ -22,7 +22,7 @@ #include "BufferView.h" #include -#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 c6b6bcebb0..30f4dd3234 100644 --- 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]));