Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1

NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 6 insertions, 6 deletions

diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h
index 17f279d7b..741e56f4e 100644
--- a/khtml/rendering/render_canvas.h
+++ b/khtml/rendering/render_canvas.h
@@ -50,7 +50,7 @@ public:
     virtual bool isCanvas() const { return true; }
 
     virtual void setStyle(RenderStyle *style);
-    virtual void layout();
+    virtual void tqlayout();
     virtual void calcWidth();
     virtual void calcHeight();
     virtual void calcMinMaxWidth();
@@ -61,9 +61,9 @@ public:
 
     KHTMLView *view() const { return m_view; }
 
-    virtual void repaint(Priority p=NormalPriority);
-    virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
-    void repaintViewRectangle(int x, int y, int w, int h, bool asap=false);
+    virtual void tqrepaint(Priority p=NormalPriority);
+    virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
+    void tqrepaintViewRectangle(int x, int y, int w, int h, bool asap=false);
     bool needsFullRepaint() const;
     void deferredRepaint( RenderObject* o );
     void scheduleDeferredRepaints();
@@ -137,7 +137,7 @@ protected:
     void updateDocumentSize();
 
     // internal setters for cached values of document width/height
-    // Setting to -1/-1 invalidates the cache.
+    // Setting to -1/-1 tqinvalidates the cache.
     void setCachedDocWidth(int w ) { m_cachedDocWidth = w; }
     void setCachedDocHeight(int h) { m_cachedDocHeight = h; }
 
@@ -170,7 +170,7 @@ protected:
     bool m_staticMode;
     // Canvas is paged
     bool m_pagedMode;
-    // Canvas contains overlaid widgets
+    // Canvas tqcontains overlaid widgets
     bool m_needsWidgetMasks;
 
     short m_pageNr;