anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-06 00:10:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use QT_VERSION >= 300 instead of >= 0x030000

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5449 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Dekel Tsur 2002-10-20 14:27:28 +00:00
parent 5bb80ecda1
commit 10e10e8ff8
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt2/ChangeLog
View File

@ -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> 2002-10-20 John Levon <levon@movementarian.org>
* ui/QDelimiterDialog.ui: remove two huge XPMs that * ui/QDelimiterDialog.ui: remove two huge XPMs that

4
src/frontends/qt2/QLPainter.C
View File

@ -256,7 +256,7 @@ Painter & QLPainter::text(int x, int y,
encoding = encodings.symbol_encoding(); encoding = encodings.symbol_encoding();
QString str; QString str;
#if QT_VERSION >= 0x030000 #if QT_VERSION >= 300
str.setLength(ls); str.setLength(ls);
for (size_t i = 0; i < ls; ++i) for (size_t i = 0; i < ls; ++i)
str[i] = QChar(encoding->ucs(s[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) { if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
qp_->setFont(fontloader.get(f)); 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 // We need to draw the text as LTR as we use our own bidi
// code. // code.
qp_->drawText(x, y, str, -1, QPainter::LTR); qp_->drawText(x, y, str, -1, QPainter::LTR);

4
src/frontends/qt2/qfont_loader.C
View File

@ -22,7 +22,7 @@
#include "BufferView.h" #include "BufferView.h"
#include <qglobal.h> #include <qglobal.h>
#if QT_VERSION < 0x030000 #if QT_VERSION < 300
#include "support/lstrings.h" #include "support/lstrings.h"
#endif #endif
@ -164,7 +164,7 @@ bool qfont_loader::available(LyXFont const & f)
if (!lyxrc.use_gui) if (!lyxrc.use_gui)
return false; return false;
#if QT_VERSION >= 0x030000 #if QT_VERSION >= 300
return getfontinfo(f)->font.exactMatch(); return getfontinfo(f)->font.exactMatch();
#else #else
string tmp; string tmp;

2
src/frontends/qt2/qfont_metrics.C
View File

@ -88,7 +88,7 @@ int width(char const * s, size_t ls, LyXFont const & f)
encoding = encodings.symbol_encoding(); encoding = encodings.symbol_encoding();
QString str; QString str;
#if QT_VERSION >= 0x030000 #if QT_VERSION >= 300
str.setLength(ls); str.setLength(ls);
for (size_t i = 0; i < ls; ++i) for (size_t i = 0; i < ls; ++i)
str[i] = QChar(encoding->ucs(s[i])); str[i] = QChar(encoding->ucs(s[i]));