summaryrefslogtreecommitdiffstats
path: root/lib/kotext
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-03-09 18:58:02 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-03-22 21:28:42 +0900
commit3723148aa321530969ae4dd7472c461b94b5405e (patch)
treee5d11a855ae5ab9b409ce5f478b3a78d310f39f5 /lib/kotext
parente220a1b2b9fa4c97bbcaabf51cd259e62edd3ab3 (diff)
downloadkoffice-3723148a.tar.gz
koffice-3723148a.zip
Replace Qt with TQt
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 7a7827396f90ad06945cd5a367f93d8ffd380e0f)
Diffstat (limited to 'lib/kotext')
-rw-r--r--lib/kotext/DESIGN5
-rw-r--r--lib/kotext/KoTextObject.cpp5
-rw-r--r--lib/kotext/KoVariable.cpp2
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");