author | zecke <zecke> | 2004-02-25 20:55:24 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-25 20:55:24 (UTC) |
commit | ad8cbdb693ecccd2a67a8294014360b70ad4253a (patch) (unidiff) | |
tree | c0d3bdc8d3b3d143d195170fee2cc54045840fa6 /core/apps/embeddedkonsole/konsole.cpp | |
parent | ddab47e21543e806a7de978985f77ea2b9e8c214 (diff) | |
download | opie-ad8cbdb693ecccd2a67a8294014360b70ad4253a.zip opie-ad8cbdb693ecccd2a67a8294014360b70ad4253a.tar.gz opie-ad8cbdb693ecccd2a67a8294014360b70ad4253a.tar.bz2 |
remove the stupid #ifdef __i386__
We're on Opie and don't need to mess with Qtopia..
we fix up broken Qt usage of legacy via a __weak__ symbol hack
Diffstat (limited to 'core/apps/embeddedkonsole/konsole.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index 1c613a9..2c0001f 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -425,20 +425,18 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
425 | // try for expandable fonts | 425 | // try for expandable fonts |
426 | size = sizes[sizes.count()-1] + 2 * (i - sizes.count() + 1); | 426 | size = sizes[sizes.count()-1] + 2 * (i - sizes.count() + 1); |
427 | } | 427 | } |
428 | else | 428 | else |
429 | { | 429 | { |
430 | printf("sizes[%d] = %d\n", i, sizes[i]); | 430 | printf("sizes[%d] = %d\n", i, sizes[i]); |
431 | size = sizes[i]; | 431 | size = sizes[i]; |
432 | } | 432 | } |
433 | #ifndef __i386__ | ||
434 | // a hack, sizes on Z seem to be points*10 | 433 | // a hack, sizes on Z seem to be points*10 |
435 | size /= 10; | 434 | size /= 10; |
436 | #endif | ||
437 | 435 | ||
438 | f = QFont(familyNames[j], size); | 436 | f = QFont(familyNames[j], size); |
439 | f.setFixedPitch(true); | 437 | f.setFixedPitch(true); |
440 | QFontMetrics fm(f); | 438 | QFontMetrics fm(f); |
441 | // don't trust f.fixedPitch() or f.exactMatch(), they lie!! | 439 | // don't trust f.fixedPitch() or f.exactMatch(), they lie!! |
442 | if (fm.width("l") == fm.width("m") | 440 | if (fm.width("l") == fm.width("m") |
443 | && (i < (uint)sizes.count() | 441 | && (i < (uint)sizes.count() |
444 | || fm.width("m") > last_width)) | 442 | || fm.width("m") > last_width)) |