diff options
Diffstat (limited to 'lib/kotext')
| -rw-r--r-- | lib/kotext/DESIGN | 5 | ||||
| -rw-r--r-- | lib/kotext/KoTextObject.cpp | 5 | ||||
| -rw-r--r-- | lib/kotext/KoVariable.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/kotext/DESIGN b/lib/kotext/DESIGN index 12bc29409..7ea038bf1 100644 --- a/lib/kotext/DESIGN +++ b/lib/kotext/DESIGN @@ -88,10 +88,9 @@ and _then_ multiplied by 20, instead of loading a 240pt font for that as we did This is implemented by KoTextFormat::charWidth(). On screen, at 100%, a layoutUnitToFontSize(240,false)=(240/20)*1.0=20.0pt font size will be used. -This does NOT depend on the DPI settings. Qt takes care of pt->pixel conversion for fonts. +This does NOT depend on the DPI settings. TQt takes care of pt->pixel conversion for fonts. -When printing... TODO, double-check whether Qt does pt->pixel conversion correctly -(apparently it didn't, in Qt 2). +When printing... TODO, double-check whether TQt does pt->pixel conversion correctly QFont multiplies by 10 and stores into a 'short'... So for QFont the maximum font size is 3276, and in KOffice the maximum font size in points is around 163. diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index 01eea0fab..7c9518ead 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -315,8 +315,9 @@ void KoTextObject::UndoRedoInfo::clear() } } type = Invalid; - // Before TQt-3.2.0, this called KoTextString::clear(), which called resize(0) on the array, which _detached_. Tricky. - // Since TQt-3.2.0, resize(0) doesn't detach anymore -> KoTextDocDeleteCommand calls copy() itself. + // Before Qt-3.2.0, this called KoTextString::clear(), which called resize(0) on the array, which _detached_. Tricky. + // Since Qt-3.2.0, resize(0) doesn't detach anymore -> KoTextDocDeleteCommand calls copy() itself. + text = TQString(); id = -1; index = -1; diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 981c0f03a..33e28ffdf 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -1539,7 +1539,7 @@ void KoTimeVariable::loadOasis( const TQDomElement &elem, KoOasisContext& /*cont Q_ASSERT( localName == "time" ); // caller checked for it if ( localName == "time" ) // current (or fixed) time { - // Use TQDateTime to work around a possible problem of TQTime::fromString in TQt 3.2.2 + // Use TQDateTime to work around a possible problem of TQTime::fromString in Qt 3.2.2 TQDateTime dt(TQDateTime::fromString(elem.attributeNS( KoXmlNS::text, "time-value", TQString()), TQt::ISODate)); bool fixed = (elem.hasAttributeNS( KoXmlNS::text, "fixed") && elem.attributeNS( KoXmlNS::text, "fixed", TQString())=="true"); |