diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp index 219cbd4..79029a0 100644 --- a/kcm_gtk/kcmgtk.cpp +++ b/kcm_gtk/kcmgtk.cpp @@ -268,7 +268,7 @@ void KcmGtk::updateFontPreview() { widget->fontPreview->setFont(font); widget->fontPreview->setText( - i18n("%1 (size %2)").tqarg(font.family()).tqarg(TQString::number(font.pointSize()))); + i18n("%1 (size %2)").arg(font.family()).arg(TQString::number(font.pointSize()))); widget->fontPreview2->setFont(font); } @@ -627,7 +627,7 @@ void KcmGtk::writeFirefoxCSS(const TQString& path, const TQString& data) if (!file.open(IO_WriteOnly | IO_Truncate)) { - KMessageBox::error(this, i18n("Could not write to %1").tqarg(path), i18n("Mozilla profile")); + KMessageBox::error(this, i18n("Could not write to %1").arg(path), i18n("Mozilla profile")); return; } TQTextStream stream(&file); diff --git a/kcm_gtk/kcmgtkwidget.ui b/kcm_gtk/kcmgtkwidget.ui index 826ae84..feb5eae 100644 --- a/kcm_gtk/kcmgtkwidget.ui +++ b/kcm_gtk/kcmgtkwidget.ui @@ -367,7 +367,7 @@ Preview line 1 - + AlignVCenter @@ -550,7 +550,7 @@ Scrollbar buttons may sometimes be displayed incorrectly in Firefox and Thunderbird. This can be fixed by installing some files into your Mozilla profile. - + WordBreak|AlignVCenter @@ -600,7 +600,7 @@ Note that changes made here will only affect GTK applications when KDE is running. To change the styles and fonts used by applications in GNOME, use the GNOME configuration tools. - + WordBreak|AlignVCenter diff --git a/kcm_gtk/searchpaths.ui b/kcm_gtk/searchpaths.ui index abe83ef..c94a3b6 100644 --- a/kcm_gtk/searchpaths.ui +++ b/kcm_gtk/searchpaths.ui @@ -26,7 +26,7 @@ The control center module could not find the GTK-Qt theme engine in its list of search paths. If you have installed it elsewhere, you will need to add the correct path to the list below. - + WordBreak|AlignVCenter diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c index 885a836..681f7fb 100644 --- a/src/qt_theme_draw.c +++ b/src/qt_theme_draw.c @@ -578,7 +578,7 @@ draw_arrow(GtkStyle* style, ay = y; aw = width; ah = height; - calculate_arrow_tqgeometry (arrow_type, &ax, &ay, &aw, &ah); + calculate_arrow_geometry (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 tqalignment of tabs. So if were to do this not only do we have to + an option for alignment 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.