From 656e74dad5d31c4cc3eebdab9f58c679cfcc1ab0 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 7 Jul 2011 21:14:06 +0000
Subject: [PATCH] Rename incorrect instances of tqrepaint[...] to repaint[...]

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmplayer@1240369 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/kmplayer_smil.cpp |  4 ++--
 src/kmplayer_smil.h   |  2 +-
 src/viewarea.cpp      | 32 ++++++++++++++++----------------
 src/viewarea.h        |  4 ++--
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/kmplayer_smil.cpp b/src/kmplayer_smil.cpp
index 2db8c34..68734f9 100644
--- a/src/kmplayer_smil.cpp
+++ b/src/kmplayer_smil.cpp
@@ -2867,9 +2867,9 @@ KDE_NO_EXPORT void SMIL::MediaType::boundsUpdate () {
     SMIL::RegionBase *rb = convertNode <SMIL::RegionBase> (region_node);
     if (rb && sub_surface) {
         SRect new_bounds = calculateBounds ();
-        SRect tqrepaint_rect = sub_surface->bounds.unite (new_bounds);
+        SRect repaint_rect = sub_surface->bounds.unite (new_bounds);
         sub_surface->bounds = new_bounds;
-        rb->tqrepaint (tqrepaint_rect);
+        rb->tqrepaint (repaint_rect);
     }
 }
 
diff --git a/src/kmplayer_smil.h b/src/kmplayer_smil.h
index 2e84e09..2a79e52 100644
--- a/src/kmplayer_smil.h
+++ b/src/kmplayer_smil.h
@@ -442,7 +442,7 @@ public:
     void deactivate ();
     virtual void parseParam (const TrieString & name, const TQString & value);
     /**
-     * tqrepaints region, calls scheduleRepaint(x,y,w,h) on view
+     * repaints region, calls scheduleRepaint(x,y,w,h) on view
      */
     void tqrepaint ();
     void tqrepaint (const SRect & rect);
diff --git a/src/viewarea.cpp b/src/viewarea.cpp
index 10f015c..3e5085e 100644
--- a/src/viewarea.cpp
+++ b/src/viewarea.cpp
@@ -1345,7 +1345,7 @@ KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (TQWidget * tqparent, View * view)
    m_collection (new KActionCollection (this)),
    surface (new ViewSurface (this)),
    m_mouse_invisible_timer (0),
-   m_tqrepaint_timer (0),
+   m_repaint_timer (0),
    m_fullscreen_scale (100),
    scale_lbl_id (-1),
    scale_slider_id (-1),
@@ -1364,7 +1364,7 @@ KDE_NO_CDTOR_EXPORT ViewArea::~ViewArea () {
 
 KDE_NO_EXPORT void ViewArea::fullScreen () {
     TQT_TQOBJECT(this)->killTimers ();
-    m_mouse_invisible_timer = m_tqrepaint_timer = 0;
+    m_mouse_invisible_timer = m_repaint_timer = 0;
     if (m_fullscreen) {
         showNormal ();
         reparent (m_parent, 0, TQPoint (0, 0), true);
@@ -1414,7 +1414,7 @@ KDE_NO_EXPORT void ViewArea::fullScreen () {
 void ViewArea::minimalMode () {
     m_minimal = !m_minimal;
     TQT_TQOBJECT(this)->killTimers ();
-    m_mouse_invisible_timer = m_tqrepaint_timer = 0;
+    m_mouse_invisible_timer = m_repaint_timer = 0;
     if (m_minimal) {
         m_view->setViewOnly ();
         m_view->setControlPanelMode (KMPlayer::View::CP_AutoHide);
@@ -1483,9 +1483,9 @@ KDE_NO_EXPORT void ViewArea::syncVisual (const IRect & rect) {
 #else
     tqrepaint (TQRect(rect.x, rect.y, rect.w, rect.h), false);
 #endif
-    if (m_tqrepaint_timer) {
-        killTimer (m_tqrepaint_timer);
-        m_tqrepaint_timer = 0;
+    if (m_repaint_timer) {
+        killTimer (m_repaint_timer);
+        m_repaint_timer = 0;
     }
     //XFlush (qt_xdisplay ());
 }
@@ -1651,11 +1651,11 @@ KDE_NO_EXPORT void ViewArea::mouseMoved () {
 }
 
 KDE_NO_EXPORT void ViewArea::scheduleRepaint (const IRect &rect) {
-    if (m_tqrepaint_timer) {
-        m_tqrepaint_rect = m_tqrepaint_rect.unite (rect);
+    if (m_repaint_timer) {
+        m_repaint_rect = m_repaint_rect.unite (rect);
     } else {
-        m_tqrepaint_rect = rect;
-        m_tqrepaint_timer = startTimer (10); // 100 per sec should do
+        m_repaint_rect = rect;
+        m_repaint_timer = startTimer (10); // 100 per sec should do
     }
 }
 
@@ -1665,13 +1665,13 @@ KDE_NO_EXPORT void ViewArea::timerEvent (TQTimerEvent * e) {
         m_mouse_invisible_timer = 0;
         if (m_fullscreen)
             setCursor (BlankCursor);
-    } else if (e->timerId () == m_tqrepaint_timer) {
-        killTimer (m_tqrepaint_timer);
-        m_tqrepaint_timer = 0;
-        //tqrepaint (m_tqrepaint_rect, false);
-        syncVisual (m_tqrepaint_rect.intersect (IRect (0, 0, width (), height ())));
+    } else if (e->timerId () == m_repaint_timer) {
+        killTimer (m_repaint_timer);
+        m_repaint_timer = 0;
+        //tqrepaint (m_repaint_rect, false);
+        syncVisual (m_repaint_rect.intersect (IRect (0, 0, width (), height ())));
     } else {
-        kdError () << "unknown timer " << e->timerId () << " " << m_tqrepaint_timer << endl;
+        kdError () << "unknown timer " << e->timerId () << " " << m_repaint_timer << endl;
         killTimer (e->timerId ());
     }
 }
diff --git a/src/viewarea.h b/src/viewarea.h
index 4f859ce..24a06be 100644
--- a/src/viewarea.h
+++ b/src/viewarea.h
@@ -74,10 +74,10 @@ private:
     SurfacePtr surface;
     NodePtrW video_node;
     TQRect m_av_tqgeometry;
-    IRect m_tqrepaint_rect;
+    IRect m_repaint_rect;
     TQRect m_topwindow_rect;
     int m_mouse_invisible_timer;
-    int m_tqrepaint_timer;
+    int m_repaint_timer;
     int m_fullscreen_scale;
     int scale_lbl_id;
     int scale_slider_id;