summaryrefslogtreecommitdiffstats
path: root/kolourpaint
diff options
context:
space:
mode:
Diffstat (limited to 'kolourpaint')
-rw-r--r--kolourpaint/kpdocumentsaveoptionswidget.cpp4
-rw-r--r--kolourpaint/kpdocumentsaveoptionswidget.h2
-rw-r--r--kolourpaint/kpview.h8
-rw-r--r--kolourpaint/kpviewmanager.h2
-rw-r--r--kolourpaint/kpviewscrollablecontainer.cpp20
-rw-r--r--kolourpaint/kpviewscrollablecontainer.h4
-rw-r--r--kolourpaint/patches/doc_resize_no_flicker.diff38
-rw-r--r--kolourpaint/pixmapfx/kpeffectbalance.cpp2
8 files changed, 40 insertions, 40 deletions
diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp
index 223bac5a..4309fbf1 100644
--- a/kolourpaint/kpdocumentsaveoptionswidget.cpp
+++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp
@@ -705,11 +705,11 @@ void kpDocumentSaveOptionsWidget::setMode (Mode mode)
// we change the height of "this", causing the text on the labels
// to move but the first instance of the text doesn't get erased.
// TQt bug.
- TQTimer::singleShot (0, this, TQT_SLOT (tqrepaintLabels ()));
+ TQTimer::singleShot (0, this, TQT_SLOT (repaintLabels ()));
}
// protected slot
-void kpDocumentSaveOptionsWidget::tqrepaintLabels ()
+void kpDocumentSaveOptionsWidget::repaintLabels ()
{
if (mode () != Quality)
m_colorDepthLabel->tqrepaint ();
diff --git a/kolourpaint/kpdocumentsaveoptionswidget.h b/kolourpaint/kpdocumentsaveoptionswidget.h
index a01e8784..49d4bc20 100644
--- a/kolourpaint/kpdocumentsaveoptionswidget.h
+++ b/kolourpaint/kpdocumentsaveoptionswidget.h
@@ -161,7 +161,7 @@ protected:
void setMode (Mode mode);
protected slots:
- void tqrepaintLabels ();
+ void repaintLabels ();
protected slots:
diff --git a/kolourpaint/kpview.h b/kolourpaint/kpview.h
index 66471489..44674123 100644
--- a/kolourpaint/kpview.h
+++ b/kolourpaint/kpview.h
@@ -344,10 +344,10 @@ protected:
public:
/**
* Adds a region (in view coordinates) to the dirty area that is
- * tqrepainted when the tqparent @ref kpViewManager is set not to queue
+ * repainted when the tqparent @ref kpViewManager is set not to queue
* updates.
*
- * @param region Region (in view coordinates) that needs tqrepainting.
+ * @param region Region (in view coordinates) that needs repainting.
*/
void addToQueuedArea (const TQRegion &region);
@@ -355,10 +355,10 @@ public:
* Convenience function. Same as above.
*
* Adds a rectangle (in view coordinates) to the dirty area that is
- * tqrepainted when the tqparent @ref kpViewManager is set not to queue
+ * repainted when the tqparent @ref kpViewManager is set not to queue
* updates.
*
- * @param rect Rectangle (in view coordinates) that needs tqrepainting.
+ * @param rect Rectangle (in view coordinates) that needs repainting.
*/
void addToQueuedArea (const TQRect &rect);
diff --git a/kolourpaint/kpviewmanager.h b/kolourpaint/kpviewmanager.h
index db2724ce..be3e3065 100644
--- a/kolourpaint/kpviewmanager.h
+++ b/kolourpaint/kpviewmanager.h
@@ -157,7 +157,7 @@ public:
//
// This is better than TQWidget::setUpdatesEnabled() because
// restoreQueueUpdates() automatically restores only the regions
- // of the views that need to be tqrepainted, per view.
+ // of the views that need to be repainted, per view.
bool queueUpdates () const;
void setQueueUpdates ();
void restoreQueueUpdates ();
diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp
index feeb5a1b..7ffecf92 100644
--- a/kolourpaint/kpviewscrollablecontainer.cpp
+++ b/kolourpaint/kpviewscrollablecontainer.cpp
@@ -644,7 +644,7 @@ TQRect kpViewScrollableContainer::mapViewToGlobal (const TQRect &viewRect)
// protected
-void kpViewScrollableContainer::tqrepaintWidgetAtResizeLineViewRect (
+void kpViewScrollableContainer::repaintWidgetAtResizeLineViewRect (
TQWidget *widget, const TQRect &resizeLineViewRect)
{
const TQRect resizeLineGlobalRect = mapViewToGlobal (resizeLineViewRect);
@@ -668,11 +668,11 @@ void kpViewScrollableContainer::tqrepaintWidgetAtResizeLineViewRect (
}
// protected
-void kpViewScrollableContainer::tqrepaintWidgetAtResizeLines (TQWidget *widget)
+void kpViewScrollableContainer::repaintWidgetAtResizeLines (TQWidget *widget)
{
- tqrepaintWidgetAtResizeLineViewRect (widget, rightResizeLineRect ());
- tqrepaintWidgetAtResizeLineViewRect (widget, bottomResizeLineRect ());
- tqrepaintWidgetAtResizeLineViewRect (widget, bottomRightResizeLineRect ());
+ repaintWidgetAtResizeLineViewRect (widget, rightResizeLineRect ());
+ repaintWidgetAtResizeLineViewRect (widget, bottomResizeLineRect ());
+ repaintWidgetAtResizeLineViewRect (widget, bottomRightResizeLineRect ());
}
// protected
@@ -680,12 +680,12 @@ void kpViewScrollableContainer::eraseResizeLines ()
{
if (m_resizeRoundedLastViewX >= 0 && m_resizeRoundedLastViewY >= 0)
{
- tqrepaintWidgetAtResizeLines (viewport ());
- tqrepaintWidgetAtResizeLines (m_view);
+ repaintWidgetAtResizeLines (viewport ());
+ repaintWidgetAtResizeLines (m_view);
- tqrepaintWidgetAtResizeLines (m_bottomGrip);
- tqrepaintWidgetAtResizeLines (m_rightGrip);
- tqrepaintWidgetAtResizeLines (m_bottomRightGrip);
+ repaintWidgetAtResizeLines (m_bottomGrip);
+ repaintWidgetAtResizeLines (m_rightGrip);
+ repaintWidgetAtResizeLines (m_bottomRightGrip);
}
}
diff --git a/kolourpaint/kpviewscrollablecontainer.h b/kolourpaint/kpviewscrollablecontainer.h
index 08f79b1e..a41b85dd 100644
--- a/kolourpaint/kpviewscrollablecontainer.h
+++ b/kolourpaint/kpviewscrollablecontainer.h
@@ -171,9 +171,9 @@ protected:
TQRect mapViewportToGlobal (const TQRect &viewportRect);
TQRect mapViewToGlobal (const TQRect &viewRect);
- void tqrepaintWidgetAtResizeLineViewRect (TQWidget *widget,
+ void repaintWidgetAtResizeLineViewRect (TQWidget *widget,
const TQRect &resizeLineViewRect);
- void tqrepaintWidgetAtResizeLines (TQWidget *widget);
+ void repaintWidgetAtResizeLines (TQWidget *widget);
void eraseResizeLines ();
void drawResizeLines ();
diff --git a/kolourpaint/patches/doc_resize_no_flicker.diff b/kolourpaint/patches/doc_resize_no_flicker.diff
index 3e763f95..821d418e 100644
--- a/kolourpaint/patches/doc_resize_no_flicker.diff
+++ b/kolourpaint/patches/doc_resize_no_flicker.diff
@@ -117,9 +117,9 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
+
// protected
--void kpViewScrollableContainer::tqrepaintWidgetAtResizeLineViewRect (
+-void kpViewScrollableContainer::repaintWidgetAtResizeLineViewRect (
- QWidget *widget, const QRect &resizeLineViewRect)
-+void kpViewScrollableContainer::tqrepaintWidgetRegion (
++void kpViewScrollableContainer::repaintWidgetRegion (
+ QWidget *widget,
+ const QRegion &viewRegion)
{
@@ -153,12 +153,12 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
}
// protected
--void kpViewScrollableContainer::tqrepaintWidgetAtResizeLines (QWidget *widget)
+-void kpViewScrollableContainer::repaintWidgetAtResizeLines (QWidget *widget)
+void kpViewScrollableContainer::eraseResizeLines (const QRegion &viewRegion)
{
-- tqrepaintWidgetAtResizeLineViewRect (widget, rightResizeLineRect ());
-- tqrepaintWidgetAtResizeLineViewRect (widget, bottomResizeLineRect ());
-- tqrepaintWidgetAtResizeLineViewRect (widget, bottomRightResizeLineRect ());
+- repaintWidgetAtResizeLineViewRect (widget, rightResizeLineRect ());
+- repaintWidgetAtResizeLineViewRect (widget, bottomResizeLineRect ());
+- repaintWidgetAtResizeLineViewRect (widget, bottomRightResizeLineRect ());
-}
+ if (viewRegion.isEmpty ())
+ return;
@@ -168,19 +168,19 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
-{
- if (m_resizeRoundedLastViewX >= 0 && m_resizeRoundedLastViewY >= 0)
- {
-- tqrepaintWidgetAtResizeLines (viewport ());
-- tqrepaintWidgetAtResizeLines (m_view);
+- repaintWidgetAtResizeLines (viewport ());
+- repaintWidgetAtResizeLines (m_view);
-- tqrepaintWidgetAtResizeLines (m_bottomGrip);
-- tqrepaintWidgetAtResizeLines (m_rightGrip);
-- tqrepaintWidgetAtResizeLines (m_bottomRightGrip);
+- repaintWidgetAtResizeLines (m_bottomGrip);
+- repaintWidgetAtResizeLines (m_rightGrip);
+- repaintWidgetAtResizeLines (m_bottomRightGrip);
- }
-+ tqrepaintWidgetRegion (viewport (), viewRegion);
-+ tqrepaintWidgetRegion (m_view, viewRegion);
++ repaintWidgetRegion (viewport (), viewRegion);
++ repaintWidgetRegion (m_view, viewRegion);
+
-+ tqrepaintWidgetRegion (m_bottomGrip, viewRegion);
-+ tqrepaintWidgetRegion (m_rightGrip, viewRegion);
-+ tqrepaintWidgetRegion (m_bottomRightGrip, viewRegion);
++ repaintWidgetRegion (m_bottomGrip, viewRegion);
++ repaintWidgetRegion (m_rightGrip, viewRegion);
++ repaintWidgetRegion (m_bottomRightGrip, viewRegion);
}
@@ -502,11 +502,11 @@ diff -u -p -r1.3 kpviewscrollablecontainer.h
QRect mapViewToGlobal (const QRect &viewRect);
+ QRegion mapViewToGlobal (const QRegion &viewRegion);
-- void tqrepaintWidgetAtResizeLineViewRect (QWidget *widget,
+- void repaintWidgetAtResizeLineViewRect (QWidget *widget,
- const QRect &resizeLineViewRect);
-- void tqrepaintWidgetAtResizeLines (QWidget *widget);
+- void repaintWidgetAtResizeLines (QWidget *widget);
- void eraseResizeLines ();
-+ void tqrepaintWidgetRegion (QWidget *widget,
++ void repaintWidgetRegion (QWidget *widget,
+ const QRegion &viewRegion);
+ void eraseResizeLines (const QRegion &viewRegion);
diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp
index c19c352b..8f07a26e 100644
--- a/kolourpaint/pixmapfx/kpeffectbalance.cpp
+++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp
@@ -499,7 +499,7 @@ void kpEffectBalanceWidget::resetAll ()
return;
// Prevent multiple settingsChanged() which would normally result in
- // redundant, expensive preview tqrepaints
+ // redundant, expensive preview repaints
blockSignals (true);
resetBrightness ();