summaryrefslogtreecommitdiffstats
path: root/kpresenter/KPrPageEffects.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:56:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:56:31 -0600
commitc9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (patch)
tree1ee1912ac4bb966475f0db0f2a78678661b4b4a5 /kpresenter/KPrPageEffects.cpp
parent94844816550ad672ccfcdc25659c625546239998 (diff)
downloadkoffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.tar.gz
koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 94844816550ad672ccfcdc25659c625546239998.
Diffstat (limited to 'kpresenter/KPrPageEffects.cpp')
-rw-r--r--kpresenter/KPrPageEffects.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/kpresenter/KPrPageEffects.cpp b/kpresenter/KPrPageEffects.cpp
index b358fd55..a7c3093b 100644
--- a/kpresenter/KPrPageEffects.cpp
+++ b/kpresenter/KPrPageEffects.cpp
@@ -440,7 +440,7 @@ bool KPrPageEffects::effectSurround1() const
int repaint_w = w;
bool finished = false;
- bool repaint= false;
+ bool tqrepaint= false;
int rh = 0;
int rw = 0;
int repaint_rh = 0;
@@ -454,7 +454,7 @@ bool KPrPageEffects::effectSurround1() const
h = stepSize;
if ( step + stepSize >= m_height )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = m_height - repaint_h;
repaint_rw = step - m_height + repaint_w;
@@ -469,7 +469,7 @@ bool KPrPageEffects::effectSurround1() const
w = stepSize;
if ( step + stepSize >= m_height + m_width - repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = m_height - ( step - m_height + repaint_h - m_width + repaint_w + stepSize );
repaint_rw = m_width - repaint_w;
@@ -484,7 +484,7 @@ bool KPrPageEffects::effectSurround1() const
h = stepSize;
if ( step + stepSize >= 2 * m_height - repaint_h + m_width - repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = 0;
repaint_rw = m_width - ( step - 2 * m_height + repaint_h - m_width + 2 * repaint_w + stepSize );
@@ -499,7 +499,7 @@ bool KPrPageEffects::effectSurround1() const
w = stepSize;
if ( step + stepSize >= 2 * m_height - repaint_h + 2 * m_width - 3 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = step - 2 * m_height + 2 * repaint_h - 2 * m_width + 3 * repaint_w;
repaint_rw = repaint_w;
@@ -514,7 +514,7 @@ bool KPrPageEffects::effectSurround1() const
h = stepSize;
if ( step + stepSize >= 3 * m_height - 3 * repaint_h + 2 * m_width - 3 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = m_height - 2 * repaint_h;
repaint_rw = step - 3 * m_height + 3 * repaint_h - 2 * m_width + 5 * repaint_w;
@@ -529,7 +529,7 @@ bool KPrPageEffects::effectSurround1() const
w = stepSize;
if ( step + stepSize >= 3 * m_height - 3 * repaint_h + 3 * m_width - 6 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = m_height - ( step - 3 * m_height + 5 * repaint_h - 3 * m_width + 6 * repaint_w + stepSize );
repaint_rw = m_width - 2 * repaint_w;
@@ -544,7 +544,7 @@ bool KPrPageEffects::effectSurround1() const
h = stepSize;
if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 3 * m_width - 6 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = repaint_h;
repaint_rw = m_width - ( step - 4 * m_height + 6 * repaint_h - 3 * m_width + 8 * repaint_w + stepSize );
@@ -559,7 +559,7 @@ bool KPrPageEffects::effectSurround1() const
w = stepSize;
if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 4 * m_width - 10 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = step - 4 * m_height + 8 * repaint_h - 4 * m_width + 10 * repaint_w;
repaint_rw = 2 * repaint_w;
@@ -574,7 +574,7 @@ bool KPrPageEffects::effectSurround1() const
h = stepSize;
if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 4 * m_width - 10 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = m_height - 3 * repaint_h;
repaint_rw = step - 5 * m_height + 10 * repaint_h - 4 * m_width + 13 * repaint_w;
@@ -589,7 +589,7 @@ bool KPrPageEffects::effectSurround1() const
w = stepSize;
if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 5 * m_width - 15 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = m_height - ( step - 5 * m_height + 13 * repaint_h - 5 * m_width + 15 * repaint_w + stepSize );
repaint_rw = m_width - 3 * repaint_w;
@@ -604,7 +604,7 @@ bool KPrPageEffects::effectSurround1() const
h = stepSize;
if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 5 * m_width - 15 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = 2 * repaint_h;
repaint_rw = m_width - ( step - 6 * m_height + 15 * repaint_h - 5 * m_width + 18 * repaint_w + stepSize );
@@ -619,7 +619,7 @@ bool KPrPageEffects::effectSurround1() const
w = stepSize;
if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 6 * m_width - 21 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = step - 6 * m_height + 18 * repaint_h - 6 * m_width + 21 * repaint_w;
repaint_rw = 3 * repaint_w;
@@ -634,7 +634,7 @@ bool KPrPageEffects::effectSurround1() const
h = stepSize;
if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 6 * m_width - 21 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = m_height - 4 * repaint_h;
repaint_rw = step - 7 * m_height + 21 * repaint_h - 6 * m_width + 25 * repaint_w;
@@ -649,7 +649,7 @@ bool KPrPageEffects::effectSurround1() const
w = stepSize;
if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 7 * m_width - 28 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = m_height - ( step - 7 * m_height + 25 * repaint_h - 7 * m_width + 28 * repaint_w + stepSize );
repaint_rw = m_width - 4 * repaint_w;
@@ -664,7 +664,7 @@ bool KPrPageEffects::effectSurround1() const
h = stepSize;
if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 7 * m_width - 28 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = 3 * repaint_h;
repaint_rw = m_width - ( step - 8 * m_height + 28 * repaint_h - 7 * m_width + 32 * repaint_w + stepSize );
@@ -679,7 +679,7 @@ bool KPrPageEffects::effectSurround1() const
w = stepSize;
if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 8 * m_width - 36 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = step - 8 * m_height + 32 * repaint_h - 8 * m_width + 36 * repaint_w;
repaint_rw = 4 * repaint_w;
@@ -694,7 +694,7 @@ bool KPrPageEffects::effectSurround1() const
h = stepSize;
if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 8 * m_width - 36 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = m_height - 5 * repaint_h;
repaint_rw = step - 9 * m_height + 36 * repaint_h - 8 * m_width + 41 * repaint_w;
@@ -709,7 +709,7 @@ bool KPrPageEffects::effectSurround1() const
w = stepSize;
if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 9 * m_width - 45 * repaint_w )
{
- repaint = true;
+ tqrepaint = true;
repaint_rh = m_height - ( step - 9 * m_height + 41 * repaint_h - 9 * m_width + 45 * repaint_w + stepSize );
repaint_rw = m_width - 5 * repaint_w;
@@ -737,7 +737,7 @@ bool KPrPageEffects::effectSurround1() const
bitBlt( m_dst, rw, rh, &m_pageTo, rw, rh, w, h );
- if ( repaint )
+ if ( tqrepaint )
{
bitBlt( m_dst, repaint_rw, repaint_rh, &m_pageTo, repaint_rw, repaint_rh, repaint_w, repaint_h );
}