Replaced various '#define' with actual strings - part 4

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/16/head
Michele Calgaro 6 months ago
parent fe842b62ac
commit 0fc192d282
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -592,33 +592,33 @@ void KlearlookStyle::polish( const TQStyleControlElementData &ceData, ControlEle
if (ceData.widgetObjectTypes.contains("TQWidget")) { if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
if ( ::tqqt_cast<TQRadioButton *>( widget ) if ( ::tqt_cast<TQRadioButton *>( widget )
|| ::tqqt_cast<TQCheckBox *>( widget ) || ::tqt_cast<TQCheckBox *>( widget )
|| ::tqqt_cast<TQSpinWidget *>( widget ) || ::tqt_cast<TQSpinWidget *>( widget )
|| widget->inherits( "TQSplitterHandle" ) ) { || widget->inherits( "TQSplitterHandle" ) ) {
widget->setMouseTracking( true ); widget->setMouseTracking( true );
installObjectEventHandler(ceData, elementFlags, ptr, this); installObjectEventHandler(ceData, elementFlags, ptr, this);
} else if ( ::tqqt_cast<TQButton *>( widget ) || ::tqqt_cast<TQComboBox *>( widget ) || } else if ( ::tqt_cast<TQButton *>( widget ) || ::tqt_cast<TQComboBox *>( widget ) ||
widget->inherits( "TQToolBarExtensionWidget" ) ) { widget->inherits( "TQToolBarExtensionWidget" ) ) {
widget->setBackgroundMode( TQWidget::PaletteBackground ); widget->setBackgroundMode( TQWidget::PaletteBackground );
installObjectEventHandler(ceData, elementFlags, ptr, this); installObjectEventHandler(ceData, elementFlags, ptr, this);
} else if ( ::tqqt_cast<TQMenuBar *>( widget ) } else if ( ::tqt_cast<TQMenuBar *>( widget )
|| ::tqqt_cast<TQToolBar *>( widget ) || ::tqt_cast<TQToolBar *>( widget )
|| ::tqqt_cast<TQPopupMenu *>( widget ) ) || ::tqt_cast<TQPopupMenu *>( widget ) )
widget->setBackgroundMode( TQWidget::PaletteBackground ); widget->setBackgroundMode( TQWidget::PaletteBackground );
else if ( widget->inherits( "TDEToolBarSeparator" ) ) { else if ( widget->inherits( "TDEToolBarSeparator" ) ) {
widget->setBackgroundMode( TQWidget::NoBackground ); widget->setBackgroundMode( TQWidget::NoBackground );
installObjectEventHandler(ceData, elementFlags, ptr, this); installObjectEventHandler(ceData, elementFlags, ptr, this);
} else if ( ::tqqt_cast<TQScrollBar *>( widget ) ) { } else if ( ::tqt_cast<TQScrollBar *>( widget ) ) {
widget->setMouseTracking( true ); widget->setMouseTracking( true );
installObjectEventHandler(ceData, elementFlags, ptr, this); installObjectEventHandler(ceData, elementFlags, ptr, this);
widget->setBackgroundMode( TQWidget::NoBackground ); widget->setBackgroundMode( TQWidget::NoBackground );
} else if ( ::tqqt_cast<TQSlider *>( widget ) || ::tqqt_cast<TQHeader *>( widget ) ) { } else if ( ::tqt_cast<TQSlider *>( widget ) || ::tqt_cast<TQHeader *>( widget ) ) {
widget->setMouseTracking( true ); widget->setMouseTracking( true );
installObjectEventHandler(ceData, elementFlags, ptr, this); installObjectEventHandler(ceData, elementFlags, ptr, this);
@ -635,34 +635,34 @@ void KlearlookStyle::unPolish( const TQStyleControlElementData &ceData, ControlE
if (ceData.widgetObjectTypes.contains("TQWidget")) { if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
if ( ::tqqt_cast<TQRadioButton *>( widget ) || if ( ::tqt_cast<TQRadioButton *>( widget ) ||
::tqqt_cast<TQCheckBox *>( widget ) || ::tqt_cast<TQCheckBox *>( widget ) ||
::tqqt_cast<TQSpinWidget *>( widget ) || ::tqt_cast<TQSpinWidget *>( widget ) ||
widget->inherits( "TQSplitterHandle" ) ) { widget->inherits( "TQSplitterHandle" ) ) {
widget->setMouseTracking( false ); widget->setMouseTracking( false );
removeObjectEventHandler(ceData, elementFlags, ptr, this); removeObjectEventHandler(ceData, elementFlags, ptr, this);
} else if ( ::tqqt_cast<TQButton *>( widget ) || ::tqqt_cast<TQComboBox *>( widget ) || } else if ( ::tqt_cast<TQButton *>( widget ) || ::tqt_cast<TQComboBox *>( widget ) ||
widget->inherits( "TQToolBarExtensionWidget" ) ) { widget->inherits( "TQToolBarExtensionWidget" ) ) {
widget->setBackgroundMode( TQWidget::PaletteButton ); widget->setBackgroundMode( TQWidget::PaletteButton );
removeObjectEventHandler(ceData, elementFlags, ptr, this); removeObjectEventHandler(ceData, elementFlags, ptr, this);
} else if ( ::tqqt_cast<TQMenuBar *>( widget ) || } else if ( ::tqt_cast<TQMenuBar *>( widget ) ||
::tqqt_cast<TQToolBar *>( widget ) || ::tqt_cast<TQToolBar *>( widget ) ||
::tqqt_cast<TQPopupMenu *>( widget ) ) ::tqt_cast<TQPopupMenu *>( widget ) )
widget->setBackgroundMode( TQWidget::PaletteBackground ); widget->setBackgroundMode( TQWidget::PaletteBackground );
else if ( widget->inherits( "TDEToolBarSeparator" ) ) { else if ( widget->inherits( "TDEToolBarSeparator" ) ) {
widget->setBackgroundMode( PaletteBackground ); widget->setBackgroundMode( PaletteBackground );
removeObjectEventHandler(ceData, elementFlags, ptr, this); removeObjectEventHandler(ceData, elementFlags, ptr, this);
} else if ( ::tqqt_cast<TQScrollBar *>( widget ) ) { } else if ( ::tqt_cast<TQScrollBar *>( widget ) ) {
widget->setMouseTracking( false ); widget->setMouseTracking( false );
removeObjectEventHandler(ceData, elementFlags, ptr, this); removeObjectEventHandler(ceData, elementFlags, ptr, this);
widget->setBackgroundMode( TQWidget::PaletteButton ); widget->setBackgroundMode( TQWidget::PaletteButton );
} else if ( ::tqqt_cast<TQSlider *>( widget ) || } else if ( ::tqt_cast<TQSlider *>( widget ) ||
::tqqt_cast<TQHeader *>( widget ) ) { ::tqt_cast<TQHeader *>( widget ) ) {
widget->setMouseTracking( false ); widget->setMouseTracking( false );
removeObjectEventHandler(ceData, elementFlags, ptr, this); removeObjectEventHandler(ceData, elementFlags, ptr, this);
@ -2229,7 +2229,7 @@ void KlearlookStyle::drawControl(
bool cornerWidget = false, bool cornerWidget = false,
firstTab = 0 == tb->indexOf( data.tab() ->identifier() ); firstTab = 0 == tb->indexOf( data.tab() ->identifier() );
if ( ::tqqt_cast<const TQTabWidget *>( tb->parent() ) ) { if ( ::tqt_cast<const TQTabWidget *>( tb->parent() ) ) {
const TQTabWidget * tw = ( const TQTabWidget* ) tb->parent(); const TQTabWidget * tw = ( const TQTabWidget* ) tb->parent();
// is there a corner widget in the (top) left edge? // is there a corner widget in the (top) left edge?
@ -3107,11 +3107,11 @@ void KlearlookStyle::drawComplexControl(
} }
bool onControlButtons = false, bool onControlButtons = false,
onToolbar = widget->parentWidget() && ::tqqt_cast<TQToolBar *>( widget->parentWidget() ), onToolbar = widget->parentWidget() && ::tqt_cast<TQToolBar *>( widget->parentWidget() ),
onExtender = !onToolbar && onExtender = !onToolbar &&
widget->parentWidget() && widget->parentWidget() &&
widget->parentWidget() ->inherits( "TQToolBarExtensionWidget" ) && widget->parentWidget() ->inherits( "TQToolBarExtensionWidget" ) &&
::tqqt_cast<TQToolBar *>( widget->parentWidget() ->parentWidget() ); ::tqt_cast<TQToolBar *>( widget->parentWidget() ->parentWidget() );
if ( !onToolbar && !onExtender && widget->parentWidget() && if ( !onToolbar && !onExtender && widget->parentWidget() &&
!qstrcmp( widget->parentWidget() ->name(), "qt_maxcontrols" ) ) !qstrcmp( widget->parentWidget() ->name(), "qt_maxcontrols" ) )
@ -3147,7 +3147,7 @@ void KlearlookStyle::drawComplexControl(
p->drawTiledPixmap( r, p->drawTiledPixmap( r,
*( toolbutton->parentWidget() ->backgroundPixmap() ), toolbutton->pos() ); *( toolbutton->parentWidget() ->backgroundPixmap() ), toolbutton->pos() );
} else if ( widget->parent() ) { } else if ( widget->parent() ) {
if ( ::tqqt_cast<const TQToolBar *>( widget->parent() ) ) { if ( ::tqt_cast<const TQToolBar *>( widget->parent() ) ) {
TQToolBar * parent = ( TQToolBar* ) widget->parent(); TQToolBar * parent = ( TQToolBar* ) widget->parent();
#ifdef TQTC_GRADIENT_TOOLBARS_AND_MENUBARS #ifdef TQTC_GRADIENT_TOOLBARS_AND_MENUBARS
@ -3425,7 +3425,7 @@ int KlearlookStyle::pixelMetric( PixelMetric metric, const TQStyleControlElement
return 5; return 5;
case PM_TabBarTabShiftVertical: { case PM_TabBarTabShiftVertical: {
const TQTabBar *tb = ::tqqt_cast<const TQTabBar *>( widget ); const TQTabBar *tb = ::tqt_cast<const TQTabBar *>( widget );
return TQTabBar::RoundedAbove == tb->shape() || TQTabBar::TriangularAbove == tb->shape() return TQTabBar::RoundedAbove == tb->shape() || TQTabBar::TriangularAbove == tb->shape()
? 1 ? 1
@ -3450,9 +3450,9 @@ int KlearlookStyle::pixelMetric( PixelMetric metric, const TQStyleControlElement
case PM_ButtonDefaultIndicator: case PM_ButtonDefaultIndicator:
return IND_BORDER == defBtnIndicator ? 1 : 0; return IND_BORDER == defBtnIndicator ? 1 : 0;
case PM_DefaultFrameWidth: case PM_DefaultFrameWidth:
return borderFrame && widget && ( ::tqqt_cast<const TQTabBar *>( widget ) || return borderFrame && widget && ( ::tqt_cast<const TQTabBar *>( widget ) ||
::tqqt_cast<const TQWidgetStack *>( widget ) || ::tqt_cast<const TQWidgetStack *>( widget ) ||
::tqqt_cast<const TQPopupMenu *>( widget ) ) ::tqt_cast<const TQPopupMenu *>( widget ) )
? 2 ? 2
: TQTC_DEF_FRAME_WIDTH; : TQTC_DEF_FRAME_WIDTH;
case PM_SpinBoxFrameWidth: case PM_SpinBoxFrameWidth:
@ -3576,7 +3576,7 @@ TQSize KlearlookStyle::sizeFromContents( ContentsType t,
} }
case CT_ToolButton: { case CT_ToolButton: {
if ( widget->parent() && ::tqqt_cast<TQToolBar*>( widget->parent() ) ) if ( widget->parent() && ::tqt_cast<TQToolBar*>( widget->parent() ) )
return TQSize( s.width() + 2 * 4, s.height() + 2 * 4 ); return TQSize( s.width() + 2 * 4, s.height() + 2 * 4 );
else { else {
return TDEStyle::sizeFromContents ( t, ceData, elementFlags, s, opt, widget ); return TDEStyle::sizeFromContents ( t, ceData, elementFlags, s, opt, widget );

Loading…
Cancel
Save