summaryrefslogtreecommitdiffstats
path: root/kolourpaint/patches
diff options
context:
space:
mode:
Diffstat (limited to 'kolourpaint/patches')
-rw-r--r--kolourpaint/patches/checkerboard-faster-render.diff8
-rw-r--r--kolourpaint/patches/color_eraser_speedup.diff6
-rw-r--r--kolourpaint/patches/doc_resize_no_flicker.diff62
3 files changed, 38 insertions, 38 deletions
diff --git a/kolourpaint/patches/checkerboard-faster-render.diff b/kolourpaint/patches/checkerboard-faster-render.diff
index 8c9c6402..824106ca 100644
--- a/kolourpaint/patches/checkerboard-faster-render.diff
+++ b/kolourpaint/patches/checkerboard-faster-render.diff
@@ -34,17 +34,17 @@ QPainter::fillRect(). QPainter::drawPixmap() seems much faster. For
+ {
+ for (int x = 0; x < rep; x++)
+ {
-+ QColor col;
++ TQColor col;
+
+ if ((parityAsInt + x + y) % 2)
+ {
+ if (!isPreview)
-+ col = QColor (213, 213, 213);
++ col = TQColor (213, 213, 213);
+ else
-+ col = QColor (224, 224, 224);
++ col = TQColor (224, 224, 224);
+ }
+ else
-+ col = Qt::white;
++ col = TQt::white;
+
+ painter.fillRect (x * cellSize, y * cellSize,
+ cellSize, cellSize,
diff --git a/kolourpaint/patches/color_eraser_speedup.diff b/kolourpaint/patches/color_eraser_speedup.diff
index d57ece28..b6e51d5d 100644
--- a/kolourpaint/patches/color_eraser_speedup.diff
+++ b/kolourpaint/patches/color_eraser_speedup.diff
@@ -64,7 +64,7 @@ diff -u -p -r1.9 kptoolpen.cpp
+ painter.begin (&pixmap);
painter.setPen (color (m_mouseButton));
-- QImage image;
+- TQImage image;
- if (m_mode & WashesPixmaps)
- {
#if DEBUG_KP_TOOL_PEN
@@ -83,8 +83,8 @@ diff -u -p -r1.9 kptoolpen.cpp
@@ -453,10 +451,21 @@ void kpToolPen::draw (const QPoint &this
else if (m_mode & (DrawsPixmaps | WashesPixmaps))
{
- QRgb colorToReplace;
-+ QImage image;
+ TQRgb colorToReplace;
++ TQImage image;
+ QRegion region;
if (m_mode & WashesPixmaps)
diff --git a/kolourpaint/patches/doc_resize_no_flicker.diff b/kolourpaint/patches/doc_resize_no_flicker.diff
index 6398e47a..a3593b95 100644
--- a/kolourpaint/patches/doc_resize_no_flicker.diff
+++ b/kolourpaint/patches/doc_resize_no_flicker.diff
@@ -118,9 +118,9 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
// protected
-void kpViewScrollableContainer::repaintWidgetAtResizeLineViewRect (
-- QWidget *widget, const QRect &resizeLineViewRect)
+- TQWidget *widget, const QRect &resizeLineViewRect)
+void kpViewScrollableContainer::repaintWidgetRegion (
-+ QWidget *widget,
++ TQWidget *widget,
+ const QRegion &viewRegion)
{
- const QRect resizeLineGlobalRect = mapViewToGlobal (resizeLineViewRect);
@@ -144,7 +144,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
+
+ if (!redrawWidgetRegion.isEmpty ())
{
- // TODO: should be "!widget->testWFlags (Qt::WRepaintNoErase)"
+ // TODO: should be "!widget->testWFlags (TQt::WRepaintNoErase)"
// but for some reason, doesn't work for viewport().
const bool erase = !dynamic_cast <kpView *> (widget);
- widget->repaint (redrawWidgetRect, erase);
@@ -153,7 +153,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
}
// protected
--void kpViewScrollableContainer::repaintWidgetAtResizeLines (QWidget *widget)
+-void kpViewScrollableContainer::repaintWidgetAtResizeLines (TQWidget *widget)
+void kpViewScrollableContainer::eraseResizeLines (const QRegion &viewRegion)
{
- repaintWidgetAtResizeLineViewRect (widget, rightResizeLineRect ());
@@ -202,25 +202,25 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
+
QPainter p (viewport (), true/*unclipped*/);
- p.setRasterOp (Qt::NotROP);
+ p.setRasterOp (TQt::NotROP);
- const QRect rightRect = rightResizeLineRect ();
- if (rightRect.isValid ())
-- p.fillRect (mapViewToViewport (rightRect), Qt::white);
+- p.fillRect (mapViewToViewport (rightRect), TQt::white);
-
- const QRect bottomRect = bottomResizeLineRect ();
- if (bottomRect.isValid ())
-- p.fillRect (mapViewToViewport (bottomRect), Qt::white);
+- p.fillRect (mapViewToViewport (bottomRect), TQt::white);
-
- const QRect bottomRightRect = bottomRightResizeLineRect ();
- if (bottomRightRect.isValid ())
-- p.fillRect (mapViewToViewport (bottomRightRect), Qt::white);
+- p.fillRect (mapViewToViewport (bottomRightRect), TQt::white);
+ const QMemArray <QRect> rects = mapViewToViewport (viewRegion).rects ();
+ for (QMemArray <QRect>::ConstIterator it = rects.begin ();
+ it != rects.end ();
+ it++)
+ {
-+ p.fillRect (*it, Qt::white);
++ p.fillRect (*it, TQt::white);
+ }
p.end ();
@@ -353,8 +353,8 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
+ }
+#endif
+
- updateResizeLines (QMAX (1, TQMAX (m_view->width () + viewDX, m_view->zoomDocToViewX (1))),
- QMAX (1, TQMAX (m_view->height () + viewDY, m_view->zoomDocToViewY (1))),
+ updateResizeLines (TQMAX (1, TQMAX (m_view->width () + viewDX, m_view->zoomDocToViewX (1))),
+ TQMAX (1, TQMAX (m_view->height () + viewDY, m_view->zoomDocToViewY (1))),
viewDX, viewDY);
emit continuedDocResize (newDocSize ());
@@ -389,7 +389,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
+ //m_resizeLinesNeedErase = false;
+
- QTimer::singleShot (0, this, SLOT (slotContentsMoved ()));
+ QTimer::singleShot (0, this, TQ_SLOT (slotContentsMoved ()));
}
@@ -874,9 +982,27 @@ void kpViewScrollableContainer::slotCont
<< " grip=" << grip << endl;
@@ -455,7 +455,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
+ }
+}
+
-+// protected virtual [base QWidget]
++// protected virtual [base TQWidget]
+void kpViewScrollableContainer::windowActivationChange (bool wasActive)
+{
+#if DEBUG_KP_VIEW_SCROLLABLE_CONTAINER && 1
@@ -466,7 +466,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
+ QScrollView::windowActivationChange (wasActive);
+
+ // Wait for m_view to update
-+ QTimer::singleShot (0, this, SLOT (windowActivationChanged ()));
++ QTimer::singleShot (0, this, TQ_SLOT (windowActivationChanged ()));
+}
+
+
@@ -502,11 +502,11 @@ diff -u -p -r1.3 kpviewscrollablecontainer.h
QRect mapViewToGlobal (const QRect &viewRect);
+ QRegion mapViewToGlobal (const QRegion &viewRegion);
-- void repaintWidgetAtResizeLineViewRect (QWidget *widget,
+- void repaintWidgetAtResizeLineViewRect (TQWidget *widget,
- const QRect &resizeLineViewRect);
-- void repaintWidgetAtResizeLines (QWidget *widget);
+- void repaintWidgetAtResizeLines (TQWidget *widget);
- void eraseResizeLines ();
-+ void repaintWidgetRegion (QWidget *widget,
++ void repaintWidgetRegion (TQWidget *widget,
+ const QRegion &viewRegion);
+ void eraseResizeLines (const QRegion &viewRegion);
@@ -519,7 +519,7 @@ diff -u -p -r1.3 kpviewscrollablecontainer.h
virtual void viewportPaintEvent (QPaintEvent *e);
virtual void paintEvent (QPaintEvent *e);
-+protected Q_SLOTS:
++protected slots:
+ void windowActivationChanged ();
+protected:
+ virtual void windowActivationChange (bool wasActive);
@@ -534,7 +534,7 @@ diff -u -p -r1.3 kpviewscrollablecontainer.h
int m_resizeRoundedLastViewDX, m_resizeRoundedLastViewDY;
+ int m_resizeLinesDontPaintClever;
bool m_haveMovedFromOriginalDocSize;
- QString m_gripStatusMessage;
+ TQString m_gripStatusMessage;
};
Index: kpwidgetmapper.cpp
===================================================================
@@ -551,11 +551,11 @@ diff -u -p -r1.1 kpwidgetmapper.cpp
#include <qwidget.h>
-@@ -54,6 +55,17 @@ QRect fromGlobal (const QWidget *widget,
+@@ -54,6 +55,17 @@ QRect fromGlobal (const TQWidget *widget,
return QRect (topLeft.x (), topLeft.y (), rect.width (), rect.height ());
}
-+QRegion fromGlobal (const QWidget *widget, const QRegion &region)
++QRegion fromGlobal (const TQWidget *widget, const QRegion &region)
+{
+ if (!widget || region.isEmpty ())
+ return region;
@@ -567,13 +567,13 @@ diff -u -p -r1.1 kpwidgetmapper.cpp
+}
+
- QPoint toGlobal (const QWidget *widget, const QPoint &point)
+ QPoint toGlobal (const TQWidget *widget, const QPoint &point)
{
-@@ -72,5 +84,16 @@ QRect toGlobal (const QWidget *widget, c
+@@ -72,5 +84,16 @@ QRect toGlobal (const TQWidget *widget, c
return QRect (topLeft.x (), topLeft.y (), rect.width (), rect.height ());
}
-+QRegion toGlobal (const QWidget *widget, const QRegion &region)
++QRegion toGlobal (const TQWidget *widget, const QRegion &region)
+{
+ if (!widget || region.isEmpty ())
+ return region;
@@ -594,7 +594,7 @@ diff -u -p -r1.1 kpwidgetmapper.h
--- kpwidgetmapper.h 10 Jul 2004 11:38:09 -0000 1.1
+++ kpwidgetmapper.h 30 Jul 2004 11:37:21 -0000
@@ -32,15 +32,18 @@
- class QWidget;
+ class TQWidget;
class QPoint;
class QRect;
+class QRegion;
@@ -602,13 +602,13 @@ diff -u -p -r1.1 kpwidgetmapper.h
namespace kpWidgetMapper
{
- QPoint fromGlobal (const QWidget *widget, const QPoint &point);
- QRect fromGlobal (const QWidget *widget, const QRect &rect);
-+ QRegion fromGlobal (const QWidget *widget, const QRegion &region);
+ QPoint fromGlobal (const TQWidget *widget, const QPoint &point);
+ QRect fromGlobal (const TQWidget *widget, const QRect &rect);
++ QRegion fromGlobal (const TQWidget *widget, const QRegion &region);
- QPoint toGlobal (const QWidget *widget, const QPoint &point);
- QRect toGlobal (const QWidget *widget, const QRect &rect);
-+ QRegion toGlobal (const QWidget *widget, const QRegion &region);
+ QPoint toGlobal (const TQWidget *widget, const QPoint &point);
+ QRect toGlobal (const TQWidget *widget, const QRect &rect);
++ QRegion toGlobal (const TQWidget *widget, const QRegion &region);
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-31 03:46:47 +0000