diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/kofficecore/KoSpeaker.cpp | 2 | ||||
-rw-r--r-- | lib/kofficecore/THOUGHTS | 4 | ||||
-rw-r--r-- | lib/koproperty/editor.cpp | 2 | ||||
-rw-r--r-- | lib/kotext/DESIGN | 5 | ||||
-rw-r--r-- | lib/kotext/KoTextObject.cpp | 5 | ||||
-rw-r--r-- | lib/kotext/KoVariable.cpp | 2 | ||||
-rw-r--r-- | lib/kwmf/kowmfreadprivate.h | 2 | ||||
-rw-r--r-- | lib/kwmf/kowmfwrite.h | 2 | ||||
-rw-r--r-- | lib/kwmf/qwmf.cpp | 7 | ||||
-rw-r--r-- | lib/kwmf/qwmf.h | 4 |
10 files changed, 15 insertions, 20 deletions
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index 2d1a62e2..c708dd56 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -289,7 +289,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/) else if (w->inherits("TQListBox")) { TQListBox* lb = dynamic_cast<TQListBox *>(w); - // qt docs say coordinates are in "on-screen" coordinates. What does that mean? + // tqt docs say coordinates are in "on-screen" coordinates. What does that mean? TQListBoxItem* item = 0; if (pos == TQPoint()) item = lb->item(lb->currentItem()); diff --git a/lib/kofficecore/THOUGHTS b/lib/kofficecore/THOUGHTS index 4a9d3579..fbfd33c2 100644 --- a/lib/kofficecore/THOUGHTS +++ b/lib/kofficecore/THOUGHTS @@ -11,7 +11,7 @@ of "spare precision". Another related issue is getting KOffice applications support 1:1 sizes on the screen (i.e. that an A4 paper is A4 also on the screen). Here the problem is that in X we can have a wide range of resolutions (from 75 or so up to 120 dpi). We also can have different -resolutions in X and Y direction, but as Qt only honors one of them (the +resolutions in X and Y direction, but as TQt only honors one of them (the Y resolution) I think it's safe to ignore the X resolution (see QPaintDevice::x11AppDpiY()). In lib/kofficeui we have some classes replacing QPoint/QRect (they use double @@ -115,7 +115,7 @@ of the cases, but maybe we can make that a bit more consistent at least among "object-based" applications like KPresenter, Kivio, and KIllustrator. 4) Printing: -Here the problem is that even Qt has enough problems with printing :( +Here the problem is that even TQt has enough problems with printing :( We definitely need some magic here, because right now we don't take any advantage of the better resolution of the printer. This will be a hard job (and an ugly hack) even if we have accurate coordinates and so diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 8c62f14b..295f24f8 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -243,7 +243,7 @@ Editor::fill() updateGroupLabelsPosition(); } setUpdatesEnabled(true); - // aaah, call this instead of update() as explained here http://lists.trolltech.com/qt-interest/2000-06/thread00337-0.html + // aaah, call this instead of update() triggerUpdate(); } diff --git a/lib/kotext/DESIGN b/lib/kotext/DESIGN index 12bc2940..7ea038bf 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 01eea0fa..7c9518ea 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 981c0f03..33e28ffd 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"); diff --git a/lib/kwmf/kowmfreadprivate.h b/lib/kwmf/kowmfreadprivate.h index feebe0b3..7523eb74 100644 --- a/lib/kwmf/kowmfreadprivate.h +++ b/lib/kwmf/kowmfreadprivate.h @@ -189,7 +189,7 @@ private: /** Convert (x1,y1) and (x2, y2) positions in angle and angleLength */ void xyToAngle( int xStart, int yStart, int xEnd, int yEnd, int& angle, int& aLength ); - /** Convert windows rasterOp in QT rasterOp */ + /** Convert windows rasterOp in TQt rasterOp */ TQt::RasterOp winToTQtRaster( TQ_UINT16 param ) const; TQt::RasterOp winToTQtRaster( TQ_UINT32 param ) const; diff --git a/lib/kwmf/kowmfwrite.h b/lib/kwmf/kowmfwrite.h index fda0540f..04ce2c3a 100644 --- a/lib/kwmf/kowmfwrite.h +++ b/lib/kwmf/kowmfwrite.h @@ -128,7 +128,7 @@ private: /** Convert angle a and alen in coordinate (xStart,yStart) and (xEnd, yEnd) */ void angleToxy( int& xStart, int& yStart, int& xEnd, int& yEnd, int a, int alen ); - /** Convert windows rasterOp in QT rasterOp */ + /** Convert windows rasterOp in TQt rasterOp */ TQ_UINT16 qtRasterToWin16( TQt::RasterOp op ) const; TQ_UINT32 qtRasterToWin32( TQt::RasterOp op ) const; diff --git a/lib/kwmf/qwmf.cpp b/lib/kwmf/qwmf.cpp index 415c63dd..79f9b9f7 100644 --- a/lib/kwmf/qwmf.cpp +++ b/lib/kwmf/qwmf.cpp @@ -1250,11 +1250,6 @@ bool QWinMetaFile::dibToBmp( TQImage& bmp, const char* dib, long size ) kdDebug() << "QWinMetaFile::dibToBmp: invalid bitmap " << endl; return false; } - else { -// if ( bmp.save("/home/software/kde-cvs/qt/examples/wmf/test.bmp", "BMP") ) -// if ( bmp.load( "/home/software/kde-cvs/qt/examples/wmf/test.bmp", "BMP" ) ) -// fprintf(stderr, "Bitmap ok \n"); - return true; - } + return true; } diff --git a/lib/kwmf/qwmf.h b/lib/kwmf/qwmf.h index 2fe154dc..157b3146 100644 --- a/lib/kwmf/qwmf.h +++ b/lib/kwmf/qwmf.h @@ -37,7 +37,7 @@ class WinObjBrushHandle; struct WmfPlaceableHeader; /** - * QWinMetaFile is a WMF viewer based on QT toolkit + * QWinMetaFile is a WMF viewer based on TQt toolkit * How to use QWinMetaFile : * <pre> * #include "qwmf.h" @@ -200,7 +200,7 @@ protected: void addHandle( WinObjHandle* ); void deleteHandle( int ); - /** Convert windows rasterOp in QT rasterOp */ + /** Convert windows rasterOp in TQt rasterOp */ TQt::RasterOp winToTQtRaster( short parm ) const; TQt::RasterOp winToTQtRaster( long parm ) const; |