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

This reverts commit 7225c815f485e09d2d967c4e97913cf676029103.

1 files changed, 13 insertions, 13 deletions

diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c
index d337014..885a836 100644
--- a/src/qt_theme_draw.c
+++ b/src/qt_theme_draw.c
@@ -41,7 +41,7 @@ static GtkStyleClass *parent_class = NULL;
 
 static PangoLayout*
 get_insensitive_layout (GdkDrawable *drawable,
-                        PangoLayout *layout);
+                        PangoLayout *tqlayout);
 
 
 static GtkShadowType
@@ -578,7 +578,7 @@ draw_arrow(GtkStyle* style,
 		ay = y;
 		aw = width;
 		ah = height;
-		calculate_arrow_geometry (arrow_type, &ax, &ay, &aw, &ah);
+		calculate_arrow_tqgeometry (arrow_type, &ax, &ay, &aw, &ah);
 		
 		half_width = width / 2;
 		half_height = height / 2;
@@ -844,7 +844,7 @@ draw_box(GtkStyle * style,
 			/* THIS IS WHAT WORKS NOW --
 				Tabs and tabbarbase will be drawn properly according to the QT style
 				But the tabs won't be aligned according to QT. GTK+ does not have 
-				an option for alignment of tabs. So if were to do this not only do we have to 
+				an option for tqalignment of tabs. So if were to do this not only do we have to 
 				calculate the x,y position of the tab ourselves, which is difficult in Qt unless
 				we are displaying the tab (can be done by subclassing TQTabBar/TQTabWidget)
 				but also have to position the tab bar label ourselves in gtk. 
@@ -1351,7 +1351,7 @@ void  draw_layout  (GtkStyle *style,
                         const gchar *detail,
                         gint x,
                         gint y,
-                        PangoLayout *layout)
+                        PangoLayout *tqlayout)
 {
 	gboolean paint_layout = TRUE;
 
@@ -1395,7 +1395,7 @@ void  draw_layout  (GtkStyle *style,
 			const gchar *text;
 			gint text_length = 0;
 			gint text_bytelen = 0;
-			text = pango_layout_get_text (layout);
+			text = pango_layout_get_text (tqlayout);
 			if (text != 0)
 			{
 				PangoAttribute *textcolorattr;
@@ -1406,19 +1406,19 @@ void  draw_layout  (GtkStyle *style,
 				textcolorattr->start_index = 0;
 				textcolorattr->end_index = text_bytelen; 
 				
-				layoutattr = pango_layout_get_attributes(layout); 
+				layoutattr = pango_layout_get_attributes(tqlayout); 
 				
 				if (layoutattr == NULL)
 				{
 					layoutattr = pango_attr_list_new();
 					pango_attr_list_insert(layoutattr, pango_attribute_copy(textcolorattr));
-					pango_layout_set_attributes(layout,layoutattr);
+					pango_layout_set_attributes(tqlayout,layoutattr);
 					pango_attr_list_unref(layoutattr);
 				}
 				else
 				{
 					pango_attr_list_change(layoutattr, pango_attribute_copy(textcolorattr));
-					pango_layout_set_attributes(layout,layoutattr);
+					pango_layout_set_attributes(tqlayout,layoutattr);
 				}
 				pango_attribute_destroy(textcolorattr);
 			}
@@ -1437,13 +1437,13 @@ void  draw_layout  (GtkStyle *style,
   	if (state_type == GTK_STATE_INSENSITIVE)
     	{
       		PangoLayout *ins;
-      		ins = get_insensitive_layout (window, layout);
+      		ins = get_insensitive_layout (window, tqlayout);
       		gdk_draw_layout (window, gc, x, y, ins);
       		g_object_unref (ins);
     	}
   	else
     	{
-      		gdk_draw_layout (window, gc, x, y, layout);
+      		gdk_draw_layout (window, gc, x, y, tqlayout);
     	}
 
   	if (area)
@@ -1472,7 +1472,7 @@ range_new (guint start,
 
 static PangoLayout*
 get_insensitive_layout (GdkDrawable *drawable,
-                        PangoLayout *layout)
+                        PangoLayout *tqlayout)
 {
   GSList *embossed_ranges = NULL;
   GSList *stippled_ranges = NULL;
@@ -1482,7 +1482,7 @@ get_insensitive_layout (GdkDrawable *drawable,
   PangoAttrList *attrs;
   GdkBitmap *stipple = NULL;
 
-  iter = pango_layout_get_iter (layout);
+  iter = pango_layout_get_iter (tqlayout);
 
   do
     {
@@ -1529,7 +1529,7 @@ get_insensitive_layout (GdkDrawable *drawable,
 
   pango_layout_iter_free (iter);
 
-  new_layout = pango_layout_copy (layout);
+  new_layout = pango_layout_copy (tqlayout);
 
   attrs = pango_layout_get_attributes (new_layout);