From 69d87202cb139ffe9e4b3ce92e434523b7b09b64 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 17 Oct 2018 19:46:30 +0900 Subject: QT_NO_* -> TQT_NO_* renaming. Signed-off-by: Michele Calgaro --- src/canvas/ntqcanvas.h | 12 ++++++------ src/canvas/qcanvas.cpp | 36 ++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/canvas') diff --git a/src/canvas/ntqcanvas.h b/src/canvas/ntqcanvas.h index 8b2958dcb..1b18dab4e 100644 --- a/src/canvas/ntqcanvas.h +++ b/src/canvas/ntqcanvas.h @@ -59,7 +59,7 @@ #define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN #endif -#ifndef QT_NO_CANVAS +#ifndef TQT_NO_CANVAS class TQCanvasSprite; @@ -403,7 +403,7 @@ private: class TQM_EXPORT_CANVAS TQCanvasPixmap : public TQPixmap { public: -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQCanvasPixmap(const TQString& datafilename); #endif TQCanvasPixmap(const TQImage& image); @@ -438,7 +438,7 @@ class TQM_EXPORT_CANVAS TQCanvasPixmapArray { public: TQCanvasPixmapArray(); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQCanvasPixmapArray(const TQString& datafilenamepattern, int framecount=0); #endif // this form is deprecated @@ -447,7 +447,7 @@ public: TQCanvasPixmapArray(TQValueList, TQPointArray hotspots = TQPointArray() ); ~TQCanvasPixmapArray(); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO bool readPixmaps(const TQString& datafilenamepattern, int framecount=0); bool readCollisionMasks(const TQString& filenamepattern); #endif @@ -467,7 +467,7 @@ private: TQCanvasPixmapArray( const TQCanvasPixmapArray & ); TQCanvasPixmapArray &operator=( const TQCanvasPixmapArray & ); #endif -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO bool readPixmaps(const TQString& datafilenamepattern, int framecount, bool maskonly); #endif @@ -811,6 +811,6 @@ private: #define Q_DEFINED_QCANVAS #include "ntqwinexport.h" -#endif // QT_NO_CANVAS +#endif // TQT_NO_CANVAS #endif // TQCANVAS_H diff --git a/src/canvas/qcanvas.cpp b/src/canvas/qcanvas.cpp index d5eceae9b..e947ccfe4 100644 --- a/src/canvas/qcanvas.cpp +++ b/src/canvas/qcanvas.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqcanvas.h" -#ifndef QT_NO_CANVAS +#ifndef TQT_NO_CANVAS #include "ntqapplication.h" #include "ntqbitmap.h" #include "ntqimage.h" @@ -66,7 +66,7 @@ public: class TQCanvasViewData { public: TQCanvasViewData() : repaint_from_moving( FALSE ) {} -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix xform; TQWMatrix ixform; #endif @@ -1067,7 +1067,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr, { TQPoint tl = view->contentsToViewport(TQPoint(0,0)); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix wm = view->worldMatrix(); TQWMatrix iwm = wm.invert(); // ivr = covers all chunks in vr @@ -1084,7 +1084,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr, if ( !all.contains(ivr) ) { // Need to clip with edge of canvas. -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS // For translation-only transformation, it is safe to include the right // and bottom edges, but otherwise, these must be excluded since they // are not precisely defined (different bresenham paths). @@ -1113,7 +1113,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr, offscr.x11SetScreen(p->device()->x11Screen()); #endif TQPainter dbp(&offscr); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS twm.translate(-vr.x(),-vr.y()); twm.translate(-tl.x(),-tl.y()); dbp.setWorldMatrix( wm*twm, TRUE ); @@ -1135,7 +1135,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr, } else { p->setClipRect(r); } -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS p->setWorldMatrix( wm*twm ); #else #endif @@ -1152,7 +1152,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr, void TQCanvas::update() { TQCanvasClusterizer clusterizer(d->viewList.count()); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQPtrList doneareas; doneareas.setAutoDelete(TRUE); #endif @@ -1161,13 +1161,13 @@ void TQCanvas::update() TQCanvasView* view; while( (view=it.current()) != 0 ) { ++it; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix wm = view->worldMatrix(); #endif TQRect area(view->contentsX(),view->contentsY(), view->visibleWidth(),view->visibleHeight()); if (area.width()>0 && area.height()>0) { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( !wm.isIdentity() ) { // r = Visible area of the canvas where there are changes TQRect r = changeBounds(view->inverseWorldMatrix().map(area)); @@ -1190,7 +1190,7 @@ void TQCanvas::update() for (int i=0; iviewList.first(); view; view=d->viewList.next()) { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( !view->worldMatrix().isIdentity() ) continue; // Cannot paint those here (see callers). #endif @@ -2841,7 +2841,7 @@ TQRect TQCanvasItem::boundingRectAdvanced() const \sa TQCanvasPixmapArray TQCanvasItem TQCanvasSprite */ -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO /*! Constructs a TQCanvasPixmap that uses the image stored in \a @@ -2876,7 +2876,7 @@ void TQCanvasPixmap::init(const TQImage& image) convertFromImage(image); hotx = image.offset().x(); hoty = image.offset().y(); -#ifndef QT_NO_IMAGE_DITHER_TO_1 +#ifndef TQT_NO_IMAGE_DITHER_TO_1 if( image.hasAlphaBuffer() ) { TQImage i = image.createAlphaMask(); collision_mask = new TQImage(i); @@ -2971,7 +2971,7 @@ TQCanvasPixmapArray::TQCanvasPixmapArray() { } -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO /*! Constructs a TQCanvasPixmapArray from files. @@ -3072,7 +3072,7 @@ void TQCanvasPixmapArray::reset() framecount = 0; } -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO /*! Reads one or more pixmaps into the pixmap array. @@ -3591,7 +3591,7 @@ void TQCanvasView::setCanvas(TQCanvas* canvas) updateContentsSize(); } -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS /*! Returns a reference to the canvas view's current transformation matrix. @@ -3643,7 +3643,7 @@ void TQCanvasView::updateContentsSize() { if ( viewing ) { TQRect br; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS br = d->xform.map(TQRect(0,0,viewing->width(),viewing->height())); #else br = TQRect(0,0,viewing->width(),viewing->height()); @@ -5412,4 +5412,4 @@ void TQCanvasPolygonalItem::scanPolygon(const TQPointArray& pa, int winding, TQP } -#endif // QT_NO_CANVAS +#endif // TQT_NO_CANVAS -- cgit v1.2.1