diff options
Diffstat (limited to 'styles')
| -rw-r--r-- | styles/dotnet/dotnet.cpp | 10 | ||||
| -rw-r--r-- | styles/phase/phasestyle.cpp | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp index 0a6e8027..defe823d 100644 --- a/styles/dotnet/dotnet.cpp +++ b/styles/dotnet/dotnet.cpp @@ -765,21 +765,21 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, if (flags & Style_Enabled) { a.translate((r.x() + r.width()/2), (r.y() + r.height()/2)); - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { p->setPen(cg.buttonText()); } p->drawLineSegments(a, 0, 3); p->drawPoint(a[6]); } else { a.translate((r.x() + r.width()/2)+1, (r.y() + r.height()/2)+1); - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { p->setPen(cg.highlightedText()); } p->drawLineSegments(a, 0, 3); p->drawPoint(a[6]); a.translate(-1,-1); - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { p->setPen(cg.mid()); } p->drawLineSegments(a, 0, 3); @@ -1357,11 +1357,11 @@ void dotNETstyle::drawControl(TQ_ControlElement element, } else if (mi->pixmap()) { TQPixmap *pixmap = mi->pixmap(); if (pixmap->depth() == 1) { - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); } p->drawPixmap(xpos, y, *pixmap); if (pixmap->depth() == 1) { - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } } } diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp index 6e75e953..1185048d 100644 --- a/styles/phase/phasestyle.cpp +++ b/styles/phase/phasestyle.cpp @@ -633,7 +633,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, widget =dynamic_cast<TQWidget*>(painter->device()); if (header) { - horiz = (header->orientation() ==Qt::Horizontal); + horiz = (header->orientation() ==TQt::Horizontal); } else { horiz = true; } @@ -1481,13 +1481,13 @@ void PhaseStyle::drawControl(TQ_ControlElement element, else if (mi->pixmap()) { // pixmap as label pixmap = *mi->pixmap(); if (pixmap.depth() == 1) - painter->setBackgroundMode(Qt::OpaqueMode); + painter->setBackgroundMode(TQt::OpaqueMode); dx = ((w - pixmap.width()) / 2) + ((w - pixmap.width()) % 2); painter->drawPixmap(x+dx, y+ITEMFRAME, pixmap); if (pixmap.depth() == 1) - painter->setBackgroundMode(Qt::TransparentMode); + painter->setBackgroundMode(TQt::TransparentMode); } } @@ -1874,7 +1874,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control, if ((extension = ::tqqt_cast<TQWidget*>(btn->parent()))) { toolbar = ::tqqt_cast<TQToolBar*>(extension->parent()); if (toolbar) { - horiz = (toolbar->orientation() == Qt::Horizontal); + horiz = (toolbar->orientation() == TQt::Horizontal); if (normal) { // draw background drawPhaseGradient(painter, rect, group.background(), !horiz, 0, 0, toolbar->width()-3, @@ -2295,7 +2295,7 @@ bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co TQRect prect = parent->rect(); toolbar = ::tqqt_cast<TQToolBar*>(parent); - horiz = (toolbar) ? (toolbar->orientation() == Qt::Horizontal) + horiz = (toolbar) ? (toolbar->orientation() == TQt::Horizontal) : (prect.height() < prect.width()); TQPainter painter(widget); if (flatToolbar(ceData, elementFlags, toolbar)) { @@ -2320,7 +2320,7 @@ bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co else if (object && object->isWidgetType() && object->parent() && (toolbar = ::tqqt_cast<TQToolBar*>(object->parent()))) { if (0 == (widget = ::tqqt_cast<TQWidget*>(object))) return false; - horiz = (toolbar->orientation() == Qt::Horizontal); + horiz = (toolbar->orientation() == TQt::Horizontal); TQPainter painter(widget); ceData.rect.rect(&x, &y, &w, &h); // draw the extension |