summaryrefslogtreecommitdiffstats
path: root/tdestyles/keramik/keramik.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tdestyles/keramik/keramik.cpp')
-rw-r--r--tdestyles/keramik/keramik.cpp171
1 files changed, 84 insertions, 87 deletions
diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp
index 1f93a5344..c46fd67b6 100644
--- a/tdestyles/keramik/keramik.cpp
+++ b/tdestyles/keramik/keramik.cpp
@@ -93,7 +93,7 @@ public:
}
};
-KDE_Q_EXPORT_PLUGIN( KeramikStylePlugin )
+TDE_EXPORT_PLUGIN( KeramikStylePlugin )
// ---------------------------------------------------
@@ -123,7 +123,7 @@ namespace
namespace
{
- void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::TQ_PrimitiveElement pe, bool down, bool enabled)
+ void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::PrimitiveElement pe, bool down, bool enabled)
{
TQPointArray a;
@@ -179,7 +179,7 @@ void KeramikStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg,
{
TQColor col = cg.button();
-#ifdef Q_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals
+#ifdef TQ_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals
if ( TQPaintDevice::x11AppDepth() >= 24 )
KPixmapEffect::gradient( pix, col.light(120), col.dark(115),
KPixmapEffect::HorizontalGradient );
@@ -251,20 +251,20 @@ TQPixmap KeramikStyle::stylePixmap(StylePixmap stylepixmap,
switch (stylepixmap) {
case SP_TitleBarMinButton:
return Keramik::PixmapLoader::the().pixmap(keramik_title_iconify,
- Qt::black, Qt::black, false, false);
+ TQt::black, TQt::black, false, false);
//return qpixmap_from_bits( iconify_bits, "title-iconify.png" );
case SP_TitleBarMaxButton:
return Keramik::PixmapLoader::the().pixmap(keramik_title_maximize,
- Qt::black, Qt::black, false, false);
+ TQt::black, TQt::black, false, false);
case SP_TitleBarCloseButton:
if (widget && widget->inherits("KDockWidgetHeader"))
return Keramik::PixmapLoader::the().pixmap(keramik_title_close_tiny,
- Qt::black, Qt::black, false, false);
+ TQt::black, TQt::black, false, false);
else return Keramik::PixmapLoader::the().pixmap(keramik_title_close,
- Qt::black, Qt::black, false, false);
+ TQt::black, TQt::black, false, false);
case SP_TitleBarNormalButton:
return Keramik::PixmapLoader::the().pixmap(keramik_title_restore,
- Qt::black, Qt::black, false, false);
+ TQt::black, TQt::black, false, false);
default:
break;
}
@@ -290,7 +290,7 @@ KeramikStyle::KeramikStyle()
if (animateProgressBar)
{
animationTimer = new TQTimer( this );
- connect( animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateProgressPos()) );
+ connect( animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateProgressPos()) );
}
firstComboPopupRelease = false;
@@ -329,7 +329,7 @@ KeramikStyle::~KeramikStyle()
void KeramikStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr)
{
- if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQApplication")) {
TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
if (!qstrcmp(app->argv()[0], "kicker")) {
kickerMode = true;
@@ -339,28 +339,28 @@ void KeramikStyle::applicationPolish(const TQStyleControlElementData &ceData, Co
void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
- if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
// Put in order of highest occurrence to maximise hit rate
- if ( widget->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) || widget->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) )
+ if ( widget->inherits( "TQPushButton" ) || widget->inherits( "TQComboBox" ) || widget->inherits("TQToolButton") )
{
installObjectEventHandler(ceData, elementFlags, ptr, this);
- if ( widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
+ if ( widget->inherits( "TQComboBox" ) )
widget->setBackgroundMode( NoBackground );
}
- else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) || widget->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+ else if ( widget->inherits( "TQMenuBar" ) || widget->inherits( "TQPopupMenu" ) )
widget->setBackgroundMode( NoBackground );
else if ( widget->parentWidget() &&
- ( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) ||
+ ( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) ||
widget->inherits( "TDECompletionBox" ) ) ) {
TQListBox* listbox = (TQListBox*) widget;
listbox->setLineWidth( 4 );
listbox->setBackgroundMode( NoBackground );
installObjectEventHandler(ceData, elementFlags, ptr, this);
- } else if (widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) {
+ } else if (widget->inherits("TQToolBarExtensionWidget")) {
installObjectEventHandler(ceData, elementFlags, ptr, this);
//widget->setBackgroundMode( NoBackground );
}
@@ -369,11 +369,11 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
installObjectEventHandler(ceData, elementFlags, ptr, this);
}
- if (animateProgressBar && ::tqqt_cast<TQProgressBar*>(widget))
+ if (animateProgressBar && ::tqt_cast<TQProgressBar*>(widget))
{
installObjectEventHandler(ceData, elementFlags, ptr, this);
progAnimWidgets[static_cast<TQProgressBar*>(widget)] = 0;
- connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(progressBarDestroyed(TQObject*)));
+ connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(progressBarDestroyed(TQObject*)));
if (!animationTimer->isActive())
animationTimer->start( 50, false );
}
@@ -384,35 +384,35 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
- if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
//### TODO: This needs major cleanup (and so does polish() )
- if ( widget->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
+ if ( widget->inherits( "TQPushButton" ) || widget->inherits( "TQComboBox" ) )
{
- if ( widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
+ if ( widget->inherits( "TQComboBox" ) )
widget->setBackgroundMode( PaletteButton );
removeObjectEventHandler(ceData, elementFlags, ptr, this);
}
- else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) || widget->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+ else if ( widget->inherits( "TQMenuBar" ) || widget->inherits( "TQPopupMenu" ) )
widget->setBackgroundMode( PaletteBackground );
else if ( widget->parentWidget() &&
- ( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) ||
+ ( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) ||
widget->inherits( "TDECompletionBox" ) ) ) {
TQListBox* listbox = (TQListBox*) widget;
listbox->setLineWidth( 1 );
listbox->setBackgroundMode( PaletteBackground );
removeObjectEventHandler(ceData, elementFlags, ptr, this);
widget->clearMask();
- } else if (widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) {
+ } else if (widget->inherits("TQToolBarExtensionWidget")) {
removeObjectEventHandler(ceData, elementFlags, ptr, this);
}
else if ( !qstrcmp( widget->name(), kdeToolbarWidget ) ) {
widget->setBackgroundMode( PaletteBackground );
removeObjectEventHandler(ceData, elementFlags, ptr, this);
}
- else if ( ::tqqt_cast<TQProgressBar*>(widget) )
+ else if ( ::tqt_cast<TQProgressBar*>(widget) )
{
progAnimWidgets.remove(static_cast<TQProgressBar*>(widget));
}
@@ -423,7 +423,7 @@ void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
void KeramikStyle::progressBarDestroyed(TQObject* obj)
{
- progAnimWidgets.remove(static_cast<TQProgressBar*>(TQT_TQWIDGET(obj)));
+ progAnimWidgets.remove(static_cast<TQProgressBar*>(obj));
}
@@ -487,13 +487,13 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr
// Find the top-level toolbar of this widget, since it may be nested in other
// widgets that are on the toolbar.
- TQWidget *parent = (widget)?TQT_TQWIDGET(widget->parentWidget()):(TQWidget*)NULL;
+ TQWidget *parent = (widget)?widget->parentWidget():NULL;
int x_offset = ceData.rect.x(), y_offset = ceData.rect.y();
while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) )
{
x_offset += parent->x();
y_offset += parent->y();
- parent = TQT_TQWIDGET(parent->parent());
+ parent = static_cast<TQWidget*>(parent->parent());
}
TQRect pr = ceData.parentWidgetData.rect;
@@ -543,7 +543,7 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr
}
// This function draws primitive elements as well as their masks.
-void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe,
+void KeramikStyle::drawPrimitive( PrimitiveElement pe,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -969,7 +969,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe,
if (kickerMode)
{
if (p->device() && p->device()->devType() == TQInternal::Widget &&
- TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->device()))->className()) == "FittsLawFrame" )
+ TQCString(static_cast<TQWidget*>(p->device())->className()) == "FittsLawFrame" )
{
int x2 = x + r.width() - 1;
int y2 = y + r.height() - 1;
@@ -1107,7 +1107,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe,
TQWidget* paintWidget = dynamic_cast<TQWidget*>(p->device());
TQToolBar* parent = 0;
if (paintWidget)
- parent = ::tqqt_cast<TQToolBar*>(paintWidget->parentWidget());
+ parent = ::tqt_cast<TQToolBar*>(paintWidget->parentWidget());
renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal) );
if ( !(flags & Style_Horizontal) )
@@ -1267,10 +1267,10 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
if (horizontal)
Keramik::ScaledPainter( keramik_slider ).draw( p, r, disabled ? cg.button() : hl,
- Qt::black, disabled, Keramik::TilePainter::PaintFullBlend );
+ TQt::black, disabled, Keramik::TilePainter::PaintFullBlend );
else
Keramik::ScaledPainter( keramik_vslider ).draw( p, r, disabled ? cg.button() : hl,
- Qt::black, disabled, Keramik::TilePainter::PaintFullBlend );
+ TQt::black, disabled, Keramik::TilePainter::PaintFullBlend );
break;
}
@@ -1283,8 +1283,8 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
TQToolBar* parent = 0;
- if (widget && widget->parent() && widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING))
- parent = static_cast<TQToolBar*>(TQT_TQWIDGET(widget->parent()));
+ if (widget && widget->parent() && widget->parent()->inherits("TQToolBar"))
+ parent = static_cast<TQToolBar*>(widget->parent());
renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal));
if (flags & Style_Horizontal) {
@@ -1380,7 +1380,7 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const C
return false;
}
-void KeramikStyle::drawControl( TQ_ControlElement element,
+void KeramikStyle::drawControl( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1414,7 +1414,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
}
else
{
- if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING))
+ if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar"))
toolbarBlendWidget = widget;
drawPrimitive( PE_ButtonCommand, p, ceData, elementFlags, r, cg, flags );
@@ -1520,7 +1520,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
case CE_ToolButtonLabel:
{
- bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains( TQTOOLBAR_OBJECT_NAME_STRING );
+ bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains( "TQToolBar" );
TQRect nr = r;
if (!onToolbar)
@@ -1588,7 +1588,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
case CE_DockWindowEmptyArea:
{
TQRect pr = r;
- if (ceData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING))
+ if (ceData.widgetObjectTypes.contains("TQToolBar"))
{
const TQToolBar* tb = static_cast<const TQToolBar*>(widget);
if (tb->place() == TQDockWindow::OutsideDock)
@@ -1600,10 +1600,10 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
//toolbar we normally paint over.
}
Keramik::GradientPainter::renderGradient( p, pr, cg.button(),
- tb->orientation() == Qt::Horizontal);
+ tb->orientation() == TQt::Horizontal);
}
else
- TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
+ TDEStyle::drawControl( (ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
r, cg, flags, opt, widget );
break;
}
@@ -1818,20 +1818,20 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
// Draw the pixmap
if ( pixmap->depth() == 1 )
- p->setBackgroundMode( Qt::OpaqueMode );
+ p->setBackgroundMode( TQt::OpaqueMode );
int diffw = ( ( w - pixmap->width() ) / 2 )
+ ( ( w - pixmap->width() ) % 2 );
p->drawPixmap( x+diffw, y+itemFrame, *pixmap );
if ( pixmap->depth() == 1 )
- p->setBackgroundMode( Qt::TransparentMode );
+ p->setBackgroundMode( TQt::TransparentMode );
}
}
// Does the menu item have a submenu?
if ( mi->popup() ) {
- TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
+ PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags) - itemFrame;
TQRect vr = visualRect( TQRect( x + w - arrowHMargin - itemFrame - dim,
y + h / 2 - dim / 2, dim, dim), r );
@@ -1963,7 +1963,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
}
}
-void KeramikStyle::drawControlMask( TQ_ControlElement element,
+void KeramikStyle::drawControlMask( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1995,7 +1995,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQStyleControlElementData &ceDat
}
}
-void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
+void KeramikStyle::drawComplexControl( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -2029,7 +2029,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
if (controls == SC_All)
{
//Double-buffer only when we are in the slower full-blend mode
- if ( ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING) || !qstrcmp(ceData.parentWidgetData.name.ascii(), kdeToolbarWidget) )
+ if ( ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar") || !qstrcmp(ceData.parentWidgetData.name.ascii(), kdeToolbarWidget) )
{
buf = new TQPixmap( r.width(), r.height() );
br.setX(0);
@@ -2100,7 +2100,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
p2->setPen( cg.buttonText() );
p2->drawLineSegments( a );
- Keramik::ScaledPainter( keramik_ripple ).draw( p2, rr, cg.button(), Qt::black, disabled, Keramik::TilePainter::PaintFullBlend );
+ Keramik::ScaledPainter( keramik_ripple ).draw( p2, rr, cg.button(), TQt::black, disabled, Keramik::TilePainter::PaintFullBlend );
}
else //Size-constrained combo -- loose the ripple.
{
@@ -2125,7 +2125,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
p2->fillRect( er, cg.base() );
drawPrimitive( PE_PanelLineEdit, p2, ceData, elementFlags, er, cg );
Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( p2, er, cg.button(),
- Qt::black, false, pmodeFullBlend() );
+ TQt::black, false, pmodeFullBlend() );
}
else if ( elementFlags & CEF_HasFocus )
{
@@ -2164,7 +2164,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
case CC_SpinWidget:
{
const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget );
- TQRect br = visualRect( querySubControlMetrics( (TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags );
+ TQRect br = visualRect( querySubControlMetrics( (ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags );
if ( controls & SC_SpinWidgetButtonField )
{
Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() );
@@ -2257,10 +2257,10 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
// TOOLBUTTON
// -------------------------------------------------------------------
case CC_ToolButton: {
- bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING);
+ bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar");
bool onExtender = !onToolbar &&
- ceData.parentWidgetData.widgetObjectTypes.contains( TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING) &&
- widget && widget->parentWidget()->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING );
+ ceData.parentWidgetData.widgetObjectTypes.contains( "TQToolBarExtensionWidget") &&
+ widget && widget->parentWidget()->parentWidget()->inherits( "TQToolBar" );
bool onControlButtons = false;
if (!onToolbar && !onExtender && !ceData.parentWidgetData.widgetObjectTypes.isEmpty() &&
@@ -2312,8 +2312,8 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
{
// This assumes floating toolbars can't have extenders,
//(so if we're on an extender, we're not floating)
- TQWidget* parent = static_cast<TQWidget*> (TQT_TQWIDGET(widget->parent()));
- TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(parent->parent()));
+ TQWidget* parent = static_cast<TQWidget*> (static_cast<TQWidget*>(widget->parent()));
+ TQToolBar* toolbar = static_cast<TQToolBar*>(parent->parent());
TQRect tr = ceData.parentWidgetData.rect;
bool horiz = ceData.toolBarData.orientation == TQt::Horizontal;
@@ -2361,7 +2361,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
}
}
-void KeramikStyle::drawComplexControlMask( TQ_ComplexControl control,
+void KeramikStyle::drawComplexControlMask( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
@@ -2437,7 +2437,7 @@ int KeramikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce
case PM_TabBarTabShiftVertical:
{
- if (ceData.widgetObjectTypes.contains(TQTABBAR_OBJECT_NAME_STRING))
+ if (ceData.widgetObjectTypes.contains("TQTabBar"))
{
if (ceData.tabBarData.shape == TQTabBar::RoundedBelow ||
ceData.tabBarData.shape == TQTabBar::TriangularBelow)
@@ -2492,7 +2492,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
case CT_ToolButton:
{
- bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING );
+ bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "TQToolBar" );
if (!onToolbar) //Behaves like a button, so scale appropriately to the border
{
int w = contentSize.width();
@@ -2574,7 +2574,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
}
-TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl KeramikStyle::querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQPoint& point,
@@ -2585,7 +2585,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
if ( control == CC_ScrollBar && result == SC_ScrollBarAddLine )
{
TQRect addline = querySubControlMetrics( control, ceData, elementFlags, result, opt, widget );
- if ( static_cast< const TQScrollBar* >( widget )->orientation() == Qt::Horizontal )
+ if ( static_cast< const TQScrollBar* >( widget )->orientation() == TQt::Horizontal )
{
if ( point.x() < addline.center().x() ) result = SC_ScrollBarSubLine;
}
@@ -2594,7 +2594,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
return result;
}
-TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
+TQRect KeramikStyle::querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
@@ -2778,7 +2778,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
#include <config.h>
-#if !defined Q_WS_X11 || defined K_WS_QTONLY
+#if !defined TQ_WS_X11 || defined K_WS_QTONLY
#undef HAVE_X11_EXTENSIONS_SHAPE_H
#endif
@@ -2795,29 +2795,29 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event ))
return true;
- if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQObject")) {
TQObject* object = reinterpret_cast<TQObject*>(source);
if ( !object->isWidgetType() ) return false;
//Combo line edits get special frames
- if ( event->type() == TQEvent::Paint && ::tqqt_cast<TQLineEdit*>(object) )
+ if ( event->type() == TQEvent::Paint && ::tqt_cast<TQLineEdit*>(object) )
{
static bool recursion = false;
if (recursion )
return false;
recursion = true;
- object->event( TQT_TQPAINTEVENT( event ) );
- TQWidget* widget = TQT_TQWIDGET( object );
+ object->event( static_cast<TQPaintEvent*>( event ) );
+ TQWidget* widget = static_cast<TQWidget*>( object );
TQPainter p( widget );
Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect,
- widget->palette().color( TQPalette::Normal, TQColorGroup::Button ),
- Qt::black, false, Keramik::TilePainter::PaintFullBlend);
+ widget->palette().color( TQPalette::Active, TQColorGroup::Button ),
+ TQt::black, false, Keramik::TilePainter::PaintFullBlend);
recursion = false;
return true;
}
- else if ( ::tqqt_cast<TQListBox*>(object) )
+ else if ( ::tqt_cast<TQListBox*>(object) )
{
//Handle combobox drop downs
switch (event->type())
@@ -2826,8 +2826,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
//Combo dropdowns are shaped
case TQEvent::Resize:
{
- TQListBox* listbox = static_cast<TQListBox*>(TQT_TQWIDGET(object));
- TQResizeEvent* resize = TQT_TQRESIZEEVENT(event);
+ TQListBox* listbox = static_cast<TQListBox*>(object);
+ TQResizeEvent* resize = static_cast<TQResizeEvent*>(event);
if (resize->size().height() < 6)
return false;
@@ -2859,8 +2859,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
{
TQPainter p( listbox );
Keramik::RectTilePainter( keramik_combobox_list, false, false ).draw( &p, 0, 0, listbox->width(), listbox->height(),
- listbox->palette().color( TQPalette::Normal, TQColorGroup::Button ),
- listbox->palette().color( TQPalette::Normal, TQColorGroup::Background ) );
+ listbox->palette().color( TQPalette::Active, TQColorGroup::Button ),
+ listbox->palette().color( TQPalette::Active, TQColorGroup::Background ) );
TQPaintEvent newpaint( paint->region().intersect( listbox->contentsRect() ), paint->erased() );
recursion = true;
@@ -2891,8 +2891,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
{
firstComboPopupRelease = false;
- TQMouseEvent* mev = TQT_TQMOUSEEVENT(event);
- TQListBox* box = static_cast<TQListBox*>(TQT_TQWIDGET(object));
+ TQMouseEvent* mev = static_cast<TQMouseEvent*>(event);
+ TQListBox* box = static_cast<TQListBox*>(object);
TQWidget* parent = box->parentWidget();
if (!parent)
@@ -2919,24 +2919,24 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
{
// Draw a gradient background for custom widgets in the toolbar
// that have specified a "tde toolbar widget" name.
- renderToolbarWidgetBackground(0, ceData, elementFlags, TQT_TQWIDGET(object));
+ renderToolbarWidgetBackground(0, ceData, elementFlags, static_cast<TQWidget*>(object));
return false; // Now draw the contents
}
#if 0 // FIXME
// This does not work on modern systems
- // Rather than resorting to hacks like this, which can stop working at any time, the required functionality should simply be added to TQt3!
- else if (event->type() == TQEvent::Paint && object->parent() && ::tqqt_cast<TQToolBar*>(object->parent())
- && !::tqqt_cast<TQPopupMenu*>(object) )
+ // Rather than resorting to hacks like this, which can stop working at any time, the required functionality should simply be added to TQt!
+ else if (event->type() == TQEvent::Paint && object->parent() && ::tqt_cast<TQToolBar*>(object->parent())
+ && !::tqt_cast<TQPopupMenu*>(object) )
{
// We need to override the paint event to draw a
// gradient on a QToolBarExtensionWidget.
- TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(object->parent()));
- TQWidget* widget = TQT_TQWIDGET(object);
+ TQToolBar* toolbar = static_cast<TQToolBar*>(object->parent());
+ TQWidget* widget = static_cast<TQWidget*>(object);
TQRect wr = widget->rect (), tr = toolbar->rect();
TQPainter p( widget );
- if ( toolbar->orientation() == Qt::Horizontal )
+ if ( toolbar->orientation() == TQt::Horizontal )
{
Keramik::GradientPainter::renderGradient( &p, wr, widget->colorGroup().button(),
true /*horizontal*/, false /*not a menu*/,
@@ -2952,7 +2952,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
//Draw terminator line, too
p.setPen( toolbar->colorGroup().mid() );
- if ( toolbar->orientation() == Qt::Horizontal )
+ if ( toolbar->orientation() == TQt::Horizontal )
p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 );
else
p.drawLine( 0, wr.height()-1, wr.width()-1, wr.height()-1 );
@@ -2961,7 +2961,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
}
#endif
// Track show events for progress bars
- if ( animateProgressBar && ::tqqt_cast<TQProgressBar*>(object) )
+ if ( animateProgressBar && ::tqt_cast<TQProgressBar*>(object) )
{
if ((event->type() == TQEvent::Show) && !animationTimer->isActive())
{
@@ -3000,6 +3000,3 @@ int KeramikStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceDat
return ret;
}
-
-// vim: ts=4 sw=4 noet
-// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-26 16:17:07 +0000