diff options
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/simplestyle.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/plugin/simplestyle.cpp b/plugin/simplestyle.cpp index 56c72a6..a7c309b 100644 --- a/plugin/simplestyle.cpp +++ b/plugin/simplestyle.cpp @@ -1671,7 +1671,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge m_tqt3progressbar_widget->setGeometry(0, 0, qt4progressbar_widget->width(), qt4progressbar_widget->height()); m_tqt3progressbar_widget->setEnabled(qt4progressbar_widget->isEnabled()); m_tqt3progressbar_widget->setProgress(qt4progressbar_widget->value()-qt4progressbar_widget->minimum(),qt4progressbar_widget->maximum()-qt4progressbar_widget->minimum()); - if (qt4progressbar_widget->orientation() != Qt::Horizontal) { + if (qt4progressbar_widget->orientation() != TQt::Horizontal) { // Qt3 cannot draw vertical progress bars if (enable_debug_warnings) { printf("No rules to draw vertical Qt4 progress bar\n"); fflush(stdout); @@ -2012,7 +2012,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge // Construct an internal TQTitleBar widget from the options and widget provided by Qt4 m_tqt3titlebar_widget->setGeometry(qt4styleoptions->rect.x(), qt4styleoptions->rect.y(), qt4styleoptions->rect.width(), qt4styleoptions->rect.height()); m_tqt3titlebar_widget->setCaption(convertQt4ToTQt3String(qt4titlebar_options->text)); - m_tqt3titlebar_widget->setActive(qt4titlebar_options->titleBarState & Qt::WindowActive); + m_tqt3titlebar_widget->setActive(qt4titlebar_options->titleBarState & TQt::WindowActive); // HACK // TQt3 does not know how to handle transparent icons in title bars, @@ -2064,11 +2064,11 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge m_tqt3toolbutton_widget->setEnabled(qt4toolbutton_widget->isEnabled()); m_tqt3toolbutton_widget->setIconSet(convertQt4ToTQt3IconSet(qt4toolbutton_widget->icon(), m_tqt3IconSize_Small, m_tqt3IconSize_Large, m_internalTQt3PixmapCache)); // m_tqt3toolbutton_widget->setUsesBigPixmap(qt4toolbutton_widget->); - m_tqt3toolbutton_widget->setUsesTextLabel(((qt4toolbutton_widget->toolButtonStyle() != Qt::ToolButtonIconOnly) && (qt4toolbutton_widget->toolButtonStyle() != Qt::ToolButtonFollowStyle))); + m_tqt3toolbutton_widget->setUsesTextLabel(((qt4toolbutton_widget->toolButtonStyle() != TQt::ToolButtonIconOnly) && (qt4toolbutton_widget->toolButtonStyle() != TQt::ToolButtonFollowStyle))); m_tqt3toolbutton_widget->setTextLabel(convertQt4ToTQt3String(qt4toolbutton_widget->text())); m_tqt3toolbutton_widget->setToggleButton(qt4toolbutton_widget->isCheckable()); m_tqt3toolbutton_widget->setOn(qt4toolbutton_widget->isChecked()); - if (qt4toolbutton_widget->toolButtonStyle() == Qt::ToolButtonTextBesideIcon) { + if (qt4toolbutton_widget->toolButtonStyle() == TQt::ToolButtonTextBesideIcon) { m_tqt3toolbutton_widget->setTextPosition(TQToolButton::BesideIcon); } m_tqt3toolbutton_widget->setAutoRaise(qt4toolbutton_widget->autoRaise()); @@ -2338,13 +2338,13 @@ void Qt4TDEStyle::drawComplexControl(ComplexControl control, const QStyleOptionC // This logic is taken from Qt4 (qcommonstyle.cpp) // It will need to be kept in sync with whatever Nokia does - drawCloseButton = (tbopt->subControls & SC_TitleBarCloseButton && tbopt->titleBarFlags & Qt::WindowSystemMenuHint); - drawMaxButton = (tbopt->subControls & SC_TitleBarMaxButton && tbopt->titleBarFlags & Qt::WindowMaximizeButtonHint && !(tbopt->titleBarState & Qt::WindowMaximized)); - drawMinButton = (tbopt->subControls & SC_TitleBarMinButton && tbopt->titleBarFlags & Qt::WindowMinimizeButtonHint && !(tbopt->titleBarState & Qt::WindowMinimized)); - drawNormalButton = (tbopt->subControls & SC_TitleBarNormalButton) && (((tbopt->titleBarFlags & Qt::WindowMinimizeButtonHint) && (tbopt->titleBarState & Qt::WindowMinimized)) || ((tbopt->titleBarFlags & Qt::WindowMaximizeButtonHint) && (tbopt->titleBarState & Qt::WindowMaximized))); - drawShadeButton = (tbopt->subControls & SC_TitleBarShadeButton && tbopt->titleBarFlags & Qt::WindowShadeButtonHint && !(tbopt->titleBarState & Qt::WindowMinimized)); - drawUnshadeButton = (tbopt->subControls & SC_TitleBarUnshadeButton && tbopt->titleBarFlags & Qt::WindowShadeButtonHint && tbopt->titleBarState & Qt::WindowMinimized); - drawSysMenuButton = (tbopt->subControls & SC_TitleBarSysMenu && tbopt->titleBarFlags & Qt::WindowSystemMenuHint); + drawCloseButton = (tbopt->subControls & SC_TitleBarCloseButton && tbopt->titleBarFlags & TQt::WindowSystemMenuHint); + drawMaxButton = (tbopt->subControls & SC_TitleBarMaxButton && tbopt->titleBarFlags & TQt::WindowMaximizeButtonHint && !(tbopt->titleBarState & TQt::WindowMaximized)); + drawMinButton = (tbopt->subControls & SC_TitleBarMinButton && tbopt->titleBarFlags & TQt::WindowMinimizeButtonHint && !(tbopt->titleBarState & TQt::WindowMinimized)); + drawNormalButton = (tbopt->subControls & SC_TitleBarNormalButton) && (((tbopt->titleBarFlags & TQt::WindowMinimizeButtonHint) && (tbopt->titleBarState & TQt::WindowMinimized)) || ((tbopt->titleBarFlags & TQt::WindowMaximizeButtonHint) && (tbopt->titleBarState & TQt::WindowMaximized))); + drawShadeButton = (tbopt->subControls & SC_TitleBarShadeButton && tbopt->titleBarFlags & TQt::WindowShadeButtonHint && !(tbopt->titleBarState & TQt::WindowMinimized)); + drawUnshadeButton = (tbopt->subControls & SC_TitleBarUnshadeButton && tbopt->titleBarFlags & TQt::WindowShadeButtonHint && tbopt->titleBarState & TQt::WindowMinimized); + drawSysMenuButton = (tbopt->subControls & SC_TitleBarSysMenu && tbopt->titleBarFlags & TQt::WindowSystemMenuHint); // End logic taken from Qt4 // FIXME @@ -2368,7 +2368,7 @@ void Qt4TDEStyle::drawComplexControl(ComplexControl control, const QStyleOptionC if (tbopt->subControls & SC_TitleBarLabel) { subControl = subControl | TQStyle::SC_TitleBarLabel; } - if (drawNormalButton && !(tbopt->titleBarState & Qt::WindowMaximized)) { + if (drawNormalButton && !(tbopt->titleBarState & TQt::WindowMaximized)) { subControl = subControl | TQStyle::SC_TitleBarNormalButton; } if (drawShadeButton) { @@ -3116,7 +3116,7 @@ void Qt4TDEStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QP BASE_QT4_STYLE_CLASS::drawPrimitive(pe, opt, p, w); } else { - p->fillRect(opt->rect, Qt::transparent); + p->fillRect(opt->rect, TQt::transparent); } } |