From 0a404f40f6dafde84ba50c0cfbfa8ef787aa4406 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gtk-qt-engine@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcm_gtk/emacsdetails.ui | 2 +- kcm_gtk/kcmgtkwidget.ui | 2 +- kcm_gtk/mozillaprofile.ui | 2 +- kcm_gtk/searchpaths.ui | 2 +- src/qt_qt_wrapper.cpp | 4 ++-- src/qt_rc_style.c | 6 +++--- src/qt_rc_style.h | 4 ++-- src/qt_style.h | 4 ++-- src/qt_theme_draw.c | 36 ++++++++++++++++++------------------ 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/kcm_gtk/emacsdetails.ui b/kcm_gtk/emacsdetails.ui index bf13062..3686640 100644 --- a/kcm_gtk/emacsdetails.ui +++ b/kcm_gtk/emacsdetails.ui @@ -229,5 +229,5 @@ When enabled, they will override the standard keyboard shortcuts in GTK applicat close() - + diff --git a/kcm_gtk/kcmgtkwidget.ui b/kcm_gtk/kcmgtkwidget.ui index 289506c..f2b69bf 100644 --- a/kcm_gtk/kcmgtkwidget.ui +++ b/kcm_gtk/kcmgtkwidget.ui @@ -636,7 +636,7 @@ emacsDetails firefoxFix - + kurllabel.h ksqueezedtextlabel.h diff --git a/kcm_gtk/mozillaprofile.ui b/kcm_gtk/mozillaprofile.ui index d34112f..b6ece9e 100644 --- a/kcm_gtk/mozillaprofile.ui +++ b/kcm_gtk/mozillaprofile.ui @@ -67,7 +67,7 @@ - + klistview.h diff --git a/kcm_gtk/searchpaths.ui b/kcm_gtk/searchpaths.ui index 8256b08..d208ea9 100644 --- a/kcm_gtk/searchpaths.ui +++ b/kcm_gtk/searchpaths.ui @@ -148,5 +148,5 @@ reject() - + diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp index 9eb3c47..40f74c7 100644 --- a/src/qt_qt_wrapper.cpp +++ b/src/qt_qt_wrapper.cpp @@ -2138,8 +2138,8 @@ void addIconThemeDir(const TQString& theme) iconThemeDirs.append(icondir); // Do it again for any tqparent themes - TQStringList tqparents = iconInheritsDirs(icondir); - for ( TQStringList::Iterator it=tqparents.begin() ; it!=tqparents.end(); ++it) + TQStringList parents = iconInheritsDirs(icondir); + for ( TQStringList::Iterator it=parents.begin() ; it!=parents.end(); ++it) addIconThemeDir((*it).stripWhiteSpace()); } diff --git a/src/qt_rc_style.c b/src/qt_rc_style.c index ba03a7f..bacf00e 100644 --- a/src/qt_rc_style.c +++ b/src/qt_rc_style.c @@ -15,7 +15,7 @@ static void qtengine_rc_style_merge (GtkRcStyle *dest, static GtkStyle *qtengine_rc_style_create_style (GtkRcStyle *rc_style); -static GtkRcStyleClass *tqparent_class; +static GtkRcStyleClass *parent_class; GType qtengine_type_rc_style = 0; @@ -47,7 +47,7 @@ static void qtengine_rc_style_class_init (TQtEngineRcStyleClass *klass) GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass); - tqparent_class = g_type_class_peek_parent (klass); + parent_class = g_type_class_peek_parent (klass); rc_style_class->parse = qtengine_rc_style_parse; rc_style_class->merge = qtengine_rc_style_merge; @@ -88,7 +88,7 @@ static void qtengine_rc_style_merge (GtkRcStyle * dest, GtkRcStyle * src) { - tqparent_class->merge(dest, src); + parent_class->merge(dest, src); } /* Create an empty style suitable to this RC style diff --git a/src/qt_rc_style.h b/src/qt_rc_style.h index e88a167..f1ff906 100644 --- a/src/qt_rc_style.h +++ b/src/qt_rc_style.h @@ -14,12 +14,12 @@ extern GType qtengine_type_rc_style; struct _TQtEngineRcStyle { - GtkRcStyle tqparent_instance; + GtkRcStyle parent_instance; }; struct _TQtEngineRcStyleClass { - GtkRcStyleClass tqparent_class; + GtkRcStyleClass parent_class; }; void qtengine_rc_style_register_type (GTypeModule *module); diff --git a/src/qt_style.h b/src/qt_style.h index 425215f..5cd920a 100644 --- a/src/qt_style.h +++ b/src/qt_style.h @@ -14,14 +14,14 @@ extern GType qtengine_type_style; struct _TQtEngineStyle { - GtkStyle tqparent_instance; + GtkStyle parent_instance; GdkPixmap* menuBackground; }; struct _TQtEngineStyleClass { - GtkStyleClass tqparent_class; + GtkStyleClass parent_class; }; void qtengine_style_register_type (GTypeModule *module); diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c index 49a63ab..cc97963 100644 --- a/src/qt_theme_draw.c +++ b/src/qt_theme_draw.c @@ -32,7 +32,7 @@ static void qtengine_style_class_init (TQtEngineStyleClass *klass); static GtkNotebook *notebook = NULL; static int nb_num_pages = 0; -static GtkStyleClass *tqparent_class = NULL; +static GtkStyleClass *parent_class = NULL; static PangoLayout* get_insensitive_layout (GdkDrawable *drawable, @@ -641,7 +641,7 @@ draw_box(GtkStyle * style, if (DETAIL("menubar")) { if (openOfficeFix == 1) - tqparent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); + parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); else drawMenubar(window,style,state_type,x,y,width,height); return; @@ -649,7 +649,7 @@ draw_box(GtkStyle * style, if (DETAIL("menu")) { if (openOfficeFix == 1) - tqparent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); + parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); else { if ((x >= 0) && (y >= 0)) /* Work around weirdness in firefox */ @@ -811,7 +811,7 @@ draw_box(GtkStyle * style, if (DETAIL("toolbar")) { if (openOfficeFix == 1) - tqparent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); + parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); else drawToolbar(window,style,state_type,x,y,width,height); return; @@ -1308,7 +1308,7 @@ void draw_layout (GtkStyle *style, /* In baghira -- even highlight the menu bar items */ if ((GTK_IS_MENU_ITEM(tqparent) && (!GTK_IS_MENU_BAR(tqparent1) || isBaghira || isPolyester)) || GTK_IS_TREE_VIEW(widget)) { - PangoAttrList *tqlayoutattr; + PangoAttrList *layoutattr; const gchar *text; gint text_length = 0; @@ -1324,19 +1324,19 @@ void draw_layout (GtkStyle *style, textcolorattr->start_index = 0; textcolorattr->end_index = text_bytelen; - tqlayoutattr = pango_layout_get_attributes(tqlayout); + layoutattr = pango_layout_get_attributes(tqlayout); - if (tqlayoutattr == NULL) + if (layoutattr == NULL) { - tqlayoutattr = pango_attr_list_new(); - pango_attr_list_insert(tqlayoutattr, pango_attribute_copy(textcolorattr)); - pango_layout_set_attributes(tqlayout,tqlayoutattr); - pango_attr_list_unref(tqlayoutattr); + layoutattr = pango_attr_list_new(); + pango_attr_list_insert(layoutattr, pango_attribute_copy(textcolorattr)); + pango_layout_set_attributes(tqlayout,layoutattr); + pango_attr_list_unref(layoutattr); } else { - pango_attr_list_change(tqlayoutattr, pango_attribute_copy(textcolorattr)); - pango_layout_set_attributes(tqlayout,tqlayoutattr); + pango_attr_list_change(layoutattr, pango_attribute_copy(textcolorattr)); + pango_layout_set_attributes(tqlayout,layoutattr); } pango_attribute_destroy(textcolorattr); } @@ -1845,7 +1845,7 @@ static void set_background (GtkStyle *style, GdkWindow *window, GtkStateType state_type) { GdkPixmap *pixmap; - gint tqparent_relative; + gint parent_relative; GdkPixmap* pix_test; /* What kind of horrible person would store a pointer to a widget here... */ @@ -1863,17 +1863,17 @@ set_background (GtkStyle *style, GdkWindow *window, GtkStateType state_type) if (pix_test == (GdkPixmap*) GDK_PARENT_RELATIVE) { pixmap = NULL; - tqparent_relative = TRUE; + parent_relative = TRUE; } else { pixmap = pix_test; - tqparent_relative = FALSE; + parent_relative = FALSE; gdk_drawable_set_colormap(pixmap, style->colormap); } if (pixmap && !gdk_drawable_get_colormap (pixmap)) gdk_drawable_set_colormap (pixmap, gdk_drawable_get_colormap (window)); - gdk_window_set_back_pixmap (window, pixmap, tqparent_relative); + gdk_window_set_back_pixmap (window, pixmap, parent_relative); } else gdk_window_set_background (window, &style->bg[state_type]); @@ -1884,7 +1884,7 @@ qtengine_style_class_init (TQtEngineStyleClass *klass) { GtkStyleClass *style_class = GTK_STYLE_CLASS (klass); - tqparent_class = g_type_class_peek_parent (klass); + parent_class = g_type_class_peek_parent (klass); style_class->draw_hline = draw_hline; style_class->draw_vline = draw_vline; -- cgit v1.2.3