Fix gtk-qt-engine loading failure

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gtk-qt-engine@1244319 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 26 insertions, 26 deletions

diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c
index cc97963..6ceae7e 100644
--- a/src/qt_theme_draw.c
+++ b/src/qt_theme_draw.c
@@ -26,8 +26,8 @@
 #define min(x,y) ((x)<=(y)?(x):(y))
 #endif
 
-static void qtengine_style_init       (TQtEngineStyle      *style);
-static void qtengine_style_class_init (TQtEngineStyleClass *klass);
+static void qtengine_style_init       (QtEngineStyle      *style);
+static void qtengine_style_class_init (QtEngineStyleClass *klass);
 
 static GtkNotebook *notebook = NULL;
 static int nb_num_pages = 0;
@@ -81,7 +81,7 @@ draw_hline(GtkStyle* style,
            gint x2,
            gint y)
 {
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("HLINE (%d,%d,%d) Widget: %s  Detail: %s\n",x1,y1,y,gtk_widget_get_name(widget),detail);
 
 	if (DETAIL("vscale"))
@@ -102,7 +102,7 @@ draw_vline(GtkStyle* style,
            gint yDest,
            gint x)
 {
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("VLINE (%d,%d,%d) Widget: %s  Detail: %s\n",ySource ,yDest ,x,gtk_widget_get_name(widget),detail);
 
 
@@ -135,7 +135,7 @@ draw_shadow(GtkStyle     *style,
 	
 	sanitize_size(window, &width, &height);
 	
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Shadow (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);
 
 	
@@ -159,9 +159,9 @@ draw_shadow(GtkStyle     *style,
 	}
 	
 	/* The remainder of this function was borrowed from the "Metal" theme/
-	   I don't really want to use TQt to draw these frames as there are too
+	   I don't really want to use Qt to draw these frames as there are too
 	   many of them (it would slow down the theme engine even more).
-	   TODO: Make them use the TQt color palette */
+	   TODO: Make them use the Qt color palette */
 	 
 	switch (shadow_type)
 	{
@@ -459,7 +459,7 @@ draw_arrow(GtkStyle* style,
 {
 	sanitize_size(window, &width, &height);
 	
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Arrow (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
 	
 	if (DETAIL("hscrollbar") || DETAIL("vscrollbar"))
@@ -615,7 +615,7 @@ draw_box(GtkStyle * style,
 	int nbpages;
 	sanitize_size(window, &width, &height);
 	
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Box (%d,%d,%d,%d) Widget: %s  Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);
 
 	if (GTK_IS_SCROLLBAR(widget))
@@ -782,7 +782,7 @@ draw_box(GtkStyle * style,
 				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 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 TQt unless
+				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. 
 			*/
@@ -852,7 +852,7 @@ draw_flat_box(GtkStyle * style,
 {
 	sanitize_size(window, &width, &height);
 	
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Flat Box (%d,%d,%d,%d) Widget: %s  Detail: %s %d %d\n",x,y,width,height,gtk_widget_get_name(widget),detail, state_type, GTK_STATE_SELECTED);
 
 	if (DETAIL("tooltip"))
@@ -908,7 +908,7 @@ draw_check(GtkStyle * style,
            gint width,
            gint height)
 {
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Check (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
 	
 	if (GTK_IS_MENU_ITEM(widget))
@@ -945,7 +945,7 @@ draw_option(GtkStyle * style,
             gint width,
             gint height)
 {
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Option (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
 	
 	if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget)))
@@ -979,7 +979,7 @@ draw_tab(GtkStyle * style,
          gint width,
          gint height)
 {
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Tab (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
 	
 	gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
@@ -1011,7 +1011,7 @@ draw_shadow_gap(GtkStyle * style,
 	sanitize_size (window, &width, &height);
 	shadow_type = get_shadow_type (style, detail, shadow_type);
 	
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Shadow_Gap (%d,%d,%d,%d) Widget: %s  Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);
 	
 	switch (shadow_type) {
@@ -1154,7 +1154,7 @@ draw_box_gap(GtkStyle* style,
 	
 	if (width<0 || height<0) return;  /* Eclipse really can be this stupid! */
 	
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Box_gap (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
 	
 	if (DETAIL("notebook"))
@@ -1181,7 +1181,7 @@ draw_extension(GtkStyle * style,
 	
 	sanitize_size (window, &width, &height);
 	
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Extension (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
 	
 	gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail,
@@ -1201,7 +1201,7 @@ draw_focus (GtkStyle     *style,
 	    gint          width,
 	    gint          height)
 {
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Focus Rect (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
 
 	GtkWidget* tqparent = gtk_widget_get_parent(widget);
@@ -1229,7 +1229,7 @@ draw_slider(GtkStyle * style,
             gint height,
             GtkOrientation orientation)
 {
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Slider (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
 	
 	if (DETAIL("slider"))
@@ -1270,7 +1270,7 @@ draw_handle(GtkStyle * style,
 	
 	sanitize_size(window, &width, &height);
 	
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Handle (%d,%d,%d,%d) Widget: %s  Detail: %s \n",x,y,width,height,gtk_widget_get_name(widget),detail, state_type);
 	
 	drawSplitter(window,style,state_type,orientation,x,y,width,height);
@@ -1294,7 +1294,7 @@ void  draw_layout  (GtkStyle *style,
 	GdkGC *gc;
 	getTextColor(&color, state_type);
 	
-	if (gtkTQtDebug)
+	if (gtkQtDebug)
 		printf("Layout (%d,%d) Widget: %s  Detail: %s %d \n",x,y,gtk_widget_get_name(widget),detail, state_type);
 
 	if (DETAIL("accellabel") || DETAIL("label") || DETAIL("cellrenderertext"))
@@ -1526,25 +1526,25 @@ qtengine_style_register_type (GTypeModule *module)
 {
 	static const GTypeInfo object_info =
 	{
-	sizeof (TQtEngineStyleClass),
+	sizeof (QtEngineStyleClass),
 	(GBaseInitFunc) NULL,
 	(GBaseFinalizeFunc) NULL,
 	(GClassInitFunc) qtengine_style_class_init,
 	NULL,           /* class_finalize */
 	NULL,           /* class_data */
-	sizeof (TQtEngineStyle),
+	sizeof (QtEngineStyle),
 	0,              /* n_preallocs */
 	(GInstanceInitFunc) qtengine_style_init,
 	};
 	
 	qtengine_type_style = g_type_module_register_type (module,
 						    GTK_TYPE_STYLE,
-						    "TQtEngineStyle",
+						    "QtEngineStyle",
 						    &object_info, 0);
 }
 
 static void
-qtengine_style_init (TQtEngineStyle *style)
+qtengine_style_init (QtEngineStyle *style)
 {
 }
 
@@ -1880,7 +1880,7 @@ set_background (GtkStyle *style, GdkWindow *window, GtkStateType state_type)
 }
 
 static void
-qtengine_style_class_init (TQtEngineStyleClass *klass)
+qtengine_style_class_init (QtEngineStyleClass *klass)
 {
 	GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);