Rename a number of old tq methods that are no longer tq specific

8 files changed, 22 insertions, 22 deletions

diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cc b/chalk/colorspaces/wet/kis_wet_palette_widget.cc
index 901f2909..f8f3c6ac 100644
--- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc
+++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cc
@@ -21,12 +21,12 @@
 
 #include <tqpushbutton.h>
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqcolor.h>
 #include <tqdrawutil.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqspinbox.h>
 #include <tqstyle.h>
@@ -50,7 +50,7 @@ KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : s
 {
     m_subject = 0;
 
-    TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main tqlayout");
+    TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main layout");
 
     TQGridLayout * l = new TQGridLayout(vl, 2, 8, 2, "color wells grid");
 
diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc
index df0666c4..42c3042b 100644
--- a/chalk/colorspaces/wet/wet_plugin.cc
+++ b/chalk/colorspaces/wet/wet_plugin.cc
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqdockwindow.h>
 #include <tqpoint.h>
 #include <tqlabel.h>
diff --git a/chalk/colorspaces/wetsticky/ws/canvas.c b/chalk/colorspaces/wetsticky/ws/canvas.c
index d6940294..d2e27cd1 100644
--- a/chalk/colorspaces/wetsticky/ws/canvas.c
+++ b/chalk/colorspaces/wetsticky/ws/canvas.c
@@ -31,13 +31,13 @@ CELL canvas[CANVAS_WIDTH][CANVAS_HEIGHT];
 
 /*  This module maintains a list of the addresses of cells that have
     been modified since the last redraw and therefore need updating.
-    Points are added to this list by the need_to_tqrepaint() routine
-    and are removed by the next_cell_for_tqrepaint() function.  The
+    Points are added to this list by the need_to_repaint() routine
+    and are removed by the next_cell_for_repaint() function.  The
     pointer to the current tail of the list is updated by side-effect. */
 
 static POINT need_repainting[REDRAW_LIMIT];
 static int   next_free = 0;
-static int   next_to_tqrepaint = 0;
+static int   next_to_repaint = 0;
 
 /* *********************************************************************** */
 
@@ -50,7 +50,7 @@ int number_of_repaints_needed()
 
 /* *********************************************************************** */
 
-void need_to_tqrepaint(point)
+void need_to_repaint(point)
 /*  The cell at this location needs to be redrawn since it has
     been altered.   Scan the list to see if it is already
     scheduled for a repainting operation and only add it if
@@ -62,7 +62,7 @@ POINT point;
    int k;
 
 
-   /*  If the list is already full then simply ignore the tqrepaint
+   /*  If the list is already full then simply ignore the repaint
        request - it will get done eventually anyway.  */
 
    if (next_free == REDRAW_LIMIT) return;
@@ -85,7 +85,7 @@ POINT point;
 
 /* *********************************************************************** */
 
-void next_cell_for_tqrepaint(cell, locus)
+void next_cell_for_repaint(cell, locus)
 /*  This routine returns the next cell to be repainted, together with its
     location on the canvas.  This is determined by taking the next point 
     from the need_repainting list and accessing its cell.  If the list is 
@@ -97,16 +97,16 @@ void next_cell_for_tqrepaint(cell, locus)
    POINT_PTR locus;
 
 {
-   if (next_to_tqrepaint >= next_free) {
-      next_to_tqrepaint = next_free = 0;
+   if (next_to_repaint >= next_free) {
+      next_to_repaint = next_free = 0;
       *(cell) = NIL;
       return;
    }
 
-   *(cell) = get_cell(need_repainting[next_to_tqrepaint]);
-   locus->x = need_repainting[next_to_tqrepaint].x;
-   locus->y = need_repainting[next_to_tqrepaint].y;
-   next_to_tqrepaint++;
+   *(cell) = get_cell(need_repainting[next_to_repaint]);
+   locus->x = need_repainting[next_to_repaint].x;
+   locus->y = need_repainting[next_to_repaint].y;
+   next_to_repaint++;
 }
 
 /* *********************************************************************** */
diff --git a/chalk/colorspaces/wetsticky/ws/canvas.h b/chalk/colorspaces/wetsticky/ws/canvas.h
index 57453e7b..2df50140 100644
--- a/chalk/colorspaces/wetsticky/ws/canvas.h
+++ b/chalk/colorspaces/wetsticky/ws/canvas.h
@@ -22,11 +22,11 @@ Wet and Sticky is free software; you can redistribute it and/or modify it under
 extern int number_of_repaints_needed();
 /*  Returns the number of cells needing to repainted.  */
 
-extern void need_to_tqrepaint (/* POINT */);
+extern void need_to_repaint (/* POINT */);
 /*  Requests that the cell at the given point be repainted
     at the next update as it has been modified.  */
 
-extern void next_cell_for_tqrepaint (/* *CELL_PTR, POINT_PTR  */);
+extern void next_cell_for_repaint (/* *CELL_PTR, POINT_PTR  */);
 /*  Returns a pointer to a cell that needs to be updated as well
     as the location of that cell on the canvas.   If there are
     no more cells to be redrawn then the pointer will be NIL.  */
diff --git a/chalk/colorspaces/wetsticky/ws/engine.c b/chalk/colorspaces/wetsticky/ws/engine.c
index b3855bda..19097d9f 100644
--- a/chalk/colorspaces/wetsticky/ws/engine.c
+++ b/chalk/colorspaces/wetsticky/ws/engine.c
@@ -192,7 +192,7 @@ int      amount;
 
    }
 
-   need_to_tqrepaint(destLocus);
+   need_to_repaint(destLocus);
 }
 
 /* *********************************************************************** */
diff --git a/chalk/colorspaces/wetsticky/ws/engine3.c b/chalk/colorspaces/wetsticky/ws/engine3.c
index fceb0c05..03a7d4f3 100644
--- a/chalk/colorspaces/wetsticky/ws/engine3.c
+++ b/chalk/colorspaces/wetsticky/ws/engine3.c
@@ -191,7 +191,7 @@ int      amount;
 
    }
 
-   need_to_tqrepaint(destLocus);
+   need_to_repaint(destLocus);
 }
 
 /* *********************************************************************** */
diff --git a/chalk/colorspaces/wetsticky/ws/ogl_interface.c b/chalk/colorspaces/wetsticky/ws/ogl_interface.c
index 953b10c8..76a552a9 100644
--- a/chalk/colorspaces/wetsticky/ws/ogl_interface.c
+++ b/chalk/colorspaces/wetsticky/ws/ogl_interface.c
@@ -255,7 +255,7 @@ void evolve_paint()
 
    for (k=0; k < STEP_LIMIT; k++) single_step();
    while (TRUE) {
-      next_cell_for_tqrepaint(&cell, &p);
+      next_cell_for_repaint(&cell, &p);
       if (cell == NIL) return;
       paint_cell(cell, p.x, p.y);     
 	   glFlush();
diff --git a/chalk/colorspaces/wetsticky/ws/x_interface.c b/chalk/colorspaces/wetsticky/ws/x_interface.c
index 7c36a303..f4cb4901 100644
--- a/chalk/colorspaces/wetsticky/ws/x_interface.c
+++ b/chalk/colorspaces/wetsticky/ws/x_interface.c
@@ -700,7 +700,7 @@ void evolve_paint()
 
    for (k=0; k < STEP_LIMIT; k++) single_step();
    while (TRUE) {
-      next_cell_for_tqrepaint(&cell, &p);
+      next_cell_for_repaint(&cell, &p);
       if (cell == NIL) return;
       paint_cell(cell, p.x, p.y);     
    }