diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp index b06161a..9f93449 100644 --- a/src/qt_qt_wrapper.cpp +++ b/src/qt_qt_wrapper.cpp @@ -448,7 +448,7 @@ void createTQApp() if (isDomino) { TQScrollBar sbar(NULL); - sbar.setOrientation(Qt::Horizontal); + sbar.setOrientation(TQt::Horizontal); sbar.setValue(1); sbar.resize(200,25); @@ -1218,13 +1218,13 @@ void drawScrollBarSlider(GdkWindow* window, GtkStyle* style, GtkStateType state, if (orientation == GTK_ORIENTATION_HORIZONTAL) { - bitBlt(TQT_TQPAINTDEVICE(&pixmap), 1, 0, TQT_TQPAINTDEVICE(&leftPix), leftRect.width(), 0, 6, h, Qt::CopyROP, true); - bitBlt(TQT_TQPAINTDEVICE(&pixmap), w-7, 0, TQT_TQPAINTDEVICE(&rightPix), 0, 0, 7, h, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(&pixmap), 1, 0, TQT_TQPAINTDEVICE(&leftPix), leftRect.width(), 0, 6, h, TQt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(&pixmap), w-7, 0, TQT_TQPAINTDEVICE(&rightPix), 0, 0, 7, h, TQt::CopyROP, true); } else { - bitBlt(TQT_TQPAINTDEVICE(&pixmap), 0, 1, TQT_TQPAINTDEVICE(&leftPix), 0, leftRect.height(), w, 6, Qt::CopyROP, true); - bitBlt(TQT_TQPAINTDEVICE(&pixmap), 0, h-7, TQT_TQPAINTDEVICE(&rightPix), 0, 0, w, 7, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(&pixmap), 0, 1, TQT_TQPAINTDEVICE(&leftPix), 0, leftRect.height(), w, 6, TQt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(&pixmap), 0, h-7, TQT_TQPAINTDEVICE(&rightPix), 0, 0, w, 7, TQt::CopyROP, true); } } @@ -1267,7 +1267,7 @@ void drawScrollBar(GdkWindow* window, GtkStyle* style, GtkStateType state, int o // Why oh why couldn't mozilla use native widgets instead of // handling everything in cross platform. - scrollBar->setOrientation(orientation ? Qt::Vertical : Qt::Horizontal); + scrollBar->setOrientation(orientation ? TQt::Vertical : TQt::Horizontal); TQStyle::SFlags sflags = stateToSFlags(state); @@ -1307,9 +1307,9 @@ void drawScrollBar(GdkWindow* window, GtkStyle* style, GtkStateType state, int o &painter2, scrollBar, TQRect(0, 0, w, h+thumbSize), tqApp->palette().active(), sflags); - bitBlt(&pixmap, 0, 0, &tmpPixmap, 0, 0, w, offset, Qt::CopyROP); + bitBlt(&pixmap, 0, 0, &tmpPixmap, 0, 0, w, offset, TQt::CopyROP); bitBlt(&pixmap, 0, offset, &tmpPixmap, 0, offset + thumbSize, - w, h - offset, Qt::CopyROP); + w, h - offset, TQt::CopyROP); } else { TQRect r; r = tqApp->style().querySubControlMetrics(TQStyle::CC_ScrollBar, @@ -1332,9 +1332,9 @@ void drawScrollBar(GdkWindow* window, GtkStyle* style, GtkStateType state, int o &painter2, scrollBar, TQRect(0, 0, w+thumbSize, h), tqApp->palette().active(), sflags); - bitBlt(&pixmap, 0, 0, &tmpPixmap, 0, 0, offset, h, Qt::CopyROP); + bitBlt(&pixmap, 0, 0, &tmpPixmap, 0, 0, offset, h, TQt::CopyROP); bitBlt(&pixmap, offset, 0, &tmpPixmap, offset + thumbSize, 0, - w - offset, h, Qt::CopyROP); + w - offset, h, TQt::CopyROP); } GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle()); @@ -1629,7 +1629,7 @@ void drawSlider(GdkWindow * window, GtkStyle * style, GtkStateType state, GtkAdj meepSlider->setBackgroundOrigin(TQWidget::ParentOrigin); - meepSlider->setOrientation((orientation == GTK_ORIENTATION_HORIZONTAL) ? Qt::Horizontal : Qt::Vertical); + meepSlider->setOrientation((orientation == GTK_ORIENTATION_HORIZONTAL) ? TQt::Horizontal : TQt::Vertical); meepSlider->setEnabled(state != GTK_STATE_INSENSITIVE); meepSlider->setGeometry(x, y, w, h); @@ -1704,7 +1704,7 @@ void drawListViewItem(GdkWindow* window, GtkStyle* style, GtkStateType state, in /* Get the brush corresponding to highlight color */ TQBrush brush = tqApp->palette().brush(TQPalette::Active, TQColorGroup::Highlight); painter.setBrush(brush); - painter.setPen(Qt::NoPen); + painter.setPen(TQt::NoPen); painter.drawRect(0, 0, w, h); GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle()); @@ -2085,7 +2085,7 @@ void setRcProperties(GtkRcStyle* rc_style, int forceRecreate) stream << "# It will be recreated when you change your KDE icon theme or widget style\n\n"; TQScrollBar sbar(NULL); - sbar.setOrientation(Qt::Horizontal); + sbar.setOrientation(TQt::Horizontal); sbar.setValue(1); sbar.resize(200,25);