From 17b1cf0a0384cb2851cde023adadfefe76d41045 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 13 Jun 2014 17:53:02 +0200 Subject: loplugin:staticcall Change-Id: I16195f2278ae67f17db55e02bb38fe3c5cd063be --- vcl/unx/generic/gdi/salgdi3.cxx | 4 +- vcl/unx/kde/fpicker/kdecommandthread.cxx | 4 +- vcl/unx/kde/salnativewidgets-kde.cxx | 154 +++++++++++++++---------------- vcl/unx/kde4/KDEData.cxx | 2 +- vcl/unx/kde4/KDESalDisplay.cxx | 2 +- vcl/unx/kde4/KDESalFrame.cxx | 10 +- vcl/unx/kde4/KDESalGraphics.cxx | 74 +++++++-------- vcl/unx/kde4/KDEXLib.cxx | 2 +- vcl/unx/kde4/VCLKDEApplication.cxx | 2 +- 9 files changed, 127 insertions(+), 127 deletions(-) (limited to 'vcl/unx') diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 841aeef8a2ee..943385e2b63d 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -342,7 +342,7 @@ void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout ) size_t nLen = std::distance(aI, aNext); aId.mbVerticalMetrics = nGlyphRotation != 0.0; - cairo_font_face_t* font_face = (cairo_font_face_t*)m_aCairoFontsCache.FindCachedFont(aId); + cairo_font_face_t* font_face = (cairo_font_face_t*)CairoFontsCache::FindCachedFont(aId); if (!font_face) { const ImplFontOptions *pOptions = rFont.GetFontOptions().get(); @@ -351,7 +351,7 @@ void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout ) font_face = cairo_ft_font_face_create_for_pattern(reinterpret_cast(pPattern)); if (!font_face) font_face = cairo_ft_font_face_create_for_ft_face(reinterpret_cast(aFace), rFont.GetLoadFlags()); - m_aCairoFontsCache.CacheFont(font_face, aId); + CairoFontsCache::CacheFont(font_face, aId); } cairo_set_font_face(cr, font_face); diff --git a/vcl/unx/kde/fpicker/kdecommandthread.cxx b/vcl/unx/kde/fpicker/kdecommandthread.cxx index 533950abd9f7..ea47116b9b9a 100644 --- a/vcl/unx/kde/fpicker/kdecommandthread.cxx +++ b/vcl/unx/kde/fpicker/kdecommandthread.cxx @@ -124,14 +124,14 @@ void KDECommandThread::handleCommand( const QString &rString, bool &bQuit ) if ( qCommand == "exit" ) { bQuit = true; - kapp->exit(); + QApplication::exit(); kapp->wakeUpGuiThread(); #if OSL_DEBUG_LEVEL > 1 ::std::cerr << "kdefilepicker: exiting" << ::std::endl; #endif } else - kapp->postEvent( m_pObject, new KDECommandEvent( qCommand, pTokens ) ); + QApplication::postEvent( m_pObject, new KDECommandEvent( qCommand, pTokens ) ); } QStringList* KDECommandThread::tokenize( const QString &rString ) diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 4034d6174b35..847bfc1c2cc0 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -505,7 +505,7 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, pPushButton->setEnabled( nStyle & QStyle::Style_Enabled ); } - kapp->style().drawControl( QStyle::CE_PushButton, + QApplication::style().drawControl( QStyle::CE_PushButton, &qPainter, pWidget, qRect, pWidget->colorGroup(), nStyle ); } @@ -523,19 +523,19 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, 0, 0 ); XFreeGC( dpy, aTmpGC ); - kapp->style().drawControl( QStyle::CE_RadioButton, + QApplication::style().drawControl( QStyle::CE_RadioButton, &qPainter, pWidget, qRect, pWidget->colorGroup(), nStyle ); } else if ( strcmp( QCheckBox_String, pClassName ) == 0 ) { - kapp->style().drawControl( QStyle::CE_CheckBox, + QApplication::style().drawControl( QStyle::CE_CheckBox, &qPainter, pWidget, qRect, pWidget->colorGroup(), nStyle ); } else if ( strcmp( QComboBox_String, pClassName ) == 0 ) { - kapp->style().drawComplexControl( QStyle::CC_ComboBox, + QApplication::style().drawComplexControl( QStyle::CC_ComboBox, &qPainter, pWidget, qRect, pWidget->colorGroup(), nStyle ); @@ -546,14 +546,14 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, QColorGroup::ColorRole eColorRole = ( pComboBox->isEnabled() )? QColorGroup::Base: QColorGroup::Background; qPainter.fillRect( - kapp->style().querySubControlMetrics( QStyle::CC_ComboBox, + QApplication::style().querySubControlMetrics( QStyle::CC_ComboBox, pComboBox, QStyle::SC_ComboBoxEditField ), pComboBox->lineEdit()->colorGroup().brush( eColorRole ) ); } } else if ( strcmp( QLineEdit_String, pClassName ) == 0 ) { - kapp->style().drawPrimitive( QStyle::PE_PanelLineEdit, + QApplication::style().drawPrimitive( QStyle::PE_PanelLineEdit, &qPainter, qRect, pWidget->colorGroup(), nStyle | QStyle::Style_Sunken ); } @@ -594,16 +594,16 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, QColorGroup::ColorRole eColorRole = ( pSpinWidget->isEnabled() )? QColorGroup::Base: QColorGroup::Background; qPainter.fillRect( - kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget, + QApplication::style().querySubControlMetrics( QStyle::CC_SpinWidget, pSpinWidget, QStyle::SC_SpinWidgetEditField ), pSpinWidget->editWidget()->colorGroup().brush( eColorRole ) ); } // Adjust the frame (needed for Motif Plus style) - QRect qFrameRect = kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget, + QRect qFrameRect = QApplication::style().querySubControlMetrics( QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetFrame ); - kapp->style().drawComplexControl( QStyle::CC_SpinWidget, + QApplication::style().drawComplexControl( QStyle::CC_SpinWidget, &qPainter, pWidget, qFrameRect, pWidget->colorGroup(), nStyle, QStyle::SC_All, eActive ); @@ -629,20 +629,20 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, pTab->setRect( qRect ); - kapp->style().drawControl( QStyle::CE_TabBarTab, + QApplication::style().drawControl( QStyle::CE_TabBarTab, &qPainter, pWidget, qRect, pWidget->colorGroup(), nStyle, QStyleOption( pTab ) ); } else if ( strcmp( QTabWidget_String, pClassName ) == 0 ) { - kapp->style().drawPrimitive( QStyle::PE_PanelTabWidget, + QApplication::style().drawPrimitive( QStyle::PE_PanelTabWidget, &qPainter, qRect, pWidget->colorGroup(), nStyle ); } else if ( strcmp( QListView_String, pClassName ) == 0 ) { - kapp->style().drawPrimitive( QStyle::PE_Panel, + QApplication::style().drawPrimitive( QStyle::PE_Panel, &qPainter, qRect, pWidget->colorGroup(), nStyle | QStyle::Style_Sunken ); } @@ -655,7 +655,7 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, { // Workaround for Style_MouseOver-aware themes. // Quite ugly, but I do not know about a better solution. - const char *pStyleName = kapp->style().className(); + const char *pStyleName = QApplication::style().className(); if ( strcmp( QMotifPlusStyle_String, pStyleName ) == 0 ) { nStyle |= QStyle::Style_MouseOver; @@ -705,7 +705,7 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, if ( pScrollBar && pScrollBar->orientation() == Qt::Horizontal ) eHoriz = QStyle::Style_Horizontal; - kapp->style().drawComplexControl( QStyle::CC_ScrollBar, + QApplication::style().drawComplexControl( QStyle::CC_ScrollBar, &qPainter, pWidget, qRect, pWidget->colorGroup(), nStyle | eHoriz, QStyle::SC_All, eActive ); @@ -720,11 +720,11 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, bIsHorizontal = true; } - kapp->style().drawControl( QStyle::CE_DockWindowEmptyArea, + QApplication::style().drawControl( QStyle::CE_DockWindowEmptyArea, &qPainter, pWidget, qRect, pWidget->colorGroup(), nStyle ); - kapp->style().drawPrimitive( QStyle::PE_PanelDockWindow, + QApplication::style().drawPrimitive( QStyle::PE_PanelDockWindow, &qPainter, qRect, pWidget->colorGroup(), nStyle ); if ( nPart == PART_THUMB_HORZ || nPart == PART_THUMB_VERT ) @@ -738,20 +738,20 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, else qThumbRect.addCoords( 2, 0, -3, 0 ); // make the thumb a bit nicer - if ( kapp->style().inherits( "HighColorStyle" ) || - kapp->style().inherits( "HighContrastStyle" ) || - kapp->style().inherits( "KeramikStyle" ) || - kapp->style().inherits( "KThemeStyle" ) || - kapp->style().inherits( "ThinKeramikStyle" ) ) + if ( QApplication::style().inherits( "HighColorStyle" ) || + QApplication::style().inherits( "HighContrastStyle" ) || + QApplication::style().inherits( "KeramikStyle" ) || + QApplication::style().inherits( "KThemeStyle" ) || + QApplication::style().inherits( "ThinKeramikStyle" ) ) { // Workaround for the workaround in KStyle::drawPrimitive() - KStyle *pStyle = static_cast< KStyle * >( &kapp->style() ); + KStyle *pStyle = static_cast< KStyle * >( &QApplication::style() ); pStyle->drawKStylePrimitive( KStyle::KPE_ToolBarHandle, &qPainter, pToolBar, qThumbRect, pWidget->colorGroup(), nStyle ); } else - kapp->style().drawPrimitive( QStyle::PE_DockWindowHandle, + QApplication::style().drawPrimitive( QStyle::PE_DockWindowHandle, &qPainter, qThumbRect, pWidget->colorGroup(), nStyle ); } } @@ -759,7 +759,7 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, { if( (nStyle & QStyle::Style_MouseOver) ) nStyle &= ~QStyle::Style_Off; - kapp->style().drawComplexControl( QStyle::CC_ToolButton, + QApplication::style().drawComplexControl( QStyle::CC_ToolButton, &qPainter, pWidget, qRect, pWidget->colorGroup(), nStyle, QStyle::SC_ToolButton ); @@ -768,7 +768,7 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, { if ( nPart == PART_ENTIRE_CONTROL ) { - kapp->style().drawControl( QStyle::CE_MenuBarEmptyArea, + QApplication::style().drawControl( QStyle::CE_MenuBarEmptyArea, &qPainter, pWidget, qRect, pWidget->colorGroup(), nStyle ); } @@ -778,13 +778,13 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, QMenuItem *pMenuItem = static_cast( pWidget )->findItem( nMenuItem ); if ( ( nStyle & QStyle::Style_MouseOver ) - && kapp->style().styleHint( QStyle::SH_MenuBar_MouseTracking ) ) + && QApplication::style().styleHint( QStyle::SH_MenuBar_MouseTracking ) ) nStyle |= QStyle::Style_Active; if ( nStyle & QStyle::Style_Selected ) nStyle |= QStyle::Style_Active | QStyle::Style_Down | QStyle::Style_HasFocus; - kapp->style().drawControl( QStyle::CE_MenuBarItem, + QApplication::style().drawControl( QStyle::CE_MenuBarItem, &qPainter, pWidget, qRect, pWidget->colorGroup(), nStyle, QStyleOption( pMenuItem ) ); @@ -798,7 +798,7 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, if ( nStyle & QStyle::Style_Selected ) nStyle |= QStyle::Style_Active; - kapp->style().drawControl( QStyle::CE_PopupMenuItem, + QApplication::style().drawControl( QStyle::CE_PopupMenuItem, &qPainter, pWidget, qRect, pWidget->colorGroup(), nStyle, QStyleOption( pMenuItem, 0, 0 ) ); @@ -809,10 +809,10 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget, QProgressBar* pProgress = static_cast(pWidget); pProgress->setProgress( nProgressWidth, qRect.width() ); - kapp->style().drawControl( QStyle::CE_ProgressBarGroove, + QApplication::style().drawControl( QStyle::CE_ProgressBarGroove, &qPainter, pWidget, qRect, pWidget->colorGroup(), nStyle ); - kapp->style().drawControl( QStyle::CE_ProgressBarContents, + QApplication::style().drawControl( QStyle::CE_ProgressBarContents, &qPainter, pWidget, qRect, pWidget->colorGroup(), nStyle ); } @@ -849,13 +849,13 @@ QPushButton *WidgetPainter::pushButton( const Rectangle& rControlRegion, { QSize qContentsSize( 50, 50 ); m_pPushButton->setDefault( false ); - QSize qNormalSize = kapp->style().sizeFromContents( QStyle::CT_PushButton, + QSize qNormalSize = QApplication::style().sizeFromContents( QStyle::CT_PushButton, m_pPushButton, qContentsSize ); m_pPushButton->setDefault( true ); - QSize qDefSize = kapp->style().sizeFromContents( QStyle::CT_PushButton, + QSize qDefSize = QApplication::style().sizeFromContents( QStyle::CT_PushButton, m_pPushButton, qContentsSize ); - int nIndicatorSize = kapp->style().pixelMetric( + int nIndicatorSize = QApplication::style().pixelMetric( QStyle::PM_ButtonDefaultIndicator, m_pPushButton ); if ( qNormalSize.width() == qDefSize.width() ) qRect.addCoords( nIndicatorSize, 0, -nIndicatorSize, 0 ); @@ -879,14 +879,14 @@ QRadioButton *WidgetPainter::radioButton( const Rectangle& rControlRegion ) // Workaround for broken themes which do not honor the given size. // Quite ugly, but I do not know about a better solution. - const char *pStyleName = kapp->style().className(); + const char *pStyleName = QApplication::style().className(); if ( strcmp( "KThemeStyle", pStyleName ) == 0 ) { QRect qOldRect( qRect ); - qRect.setWidth( kapp->style().pixelMetric( + qRect.setWidth( QApplication::style().pixelMetric( QStyle::PM_ExclusiveIndicatorWidth, m_pRadioButton ) ); - qRect.setHeight( kapp->style().pixelMetric( + qRect.setHeight( QApplication::style().pixelMetric( QStyle::PM_ExclusiveIndicatorHeight, m_pRadioButton ) ); qRect.moveBy( ( qOldRect.width() - qRect.width() ) / 2, @@ -908,14 +908,14 @@ QCheckBox *WidgetPainter::checkBox( const Rectangle& rControlRegion ) // Workaround for broken themes which do not honor the given size. // Quite ugly, but I do not know about a better solution. - const char *pStyleName = kapp->style().className(); + const char *pStyleName = QApplication::style().className(); if ( strcmp( "KThemeStyle", pStyleName ) == 0 ) { QRect qOldRect( qRect ); - qRect.setWidth( kapp->style().pixelMetric( + qRect.setWidth( QApplication::style().pixelMetric( QStyle::PM_IndicatorWidth, m_pCheckBox ) ); - qRect.setHeight( kapp->style().pixelMetric( + qRect.setHeight( QApplication::style().pixelMetric( QStyle::PM_IndicatorHeight, m_pCheckBox ) ); qRect.moveBy( ( qOldRect.width() - qRect.width() ) / 2, @@ -1283,9 +1283,9 @@ bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, QScrollBar *pScrollBar = pWidgetPainter->scrollBar( rControlRegion, bHorizontal, ImplControlValue() ); - QRect qRectSubLine = kapp->style().querySubControlMetrics( + QRect qRectSubLine = QApplication::style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubLine ); - QRect qRectAddLine = kapp->style().querySubControlMetrics( + QRect qRectAddLine = QApplication::style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarAddLine ); // There are 2 buttons on the right/bottom side of the scrollbar @@ -1298,22 +1298,22 @@ bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, // It makes the right/down button bigger. if ( bHorizontal ) { - qRectAddLine.setLeft( kapp->style().querySubControlMetrics( + qRectAddLine.setLeft( QApplication::style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarAddPage ).right() + 1 ); if ( qRectAddLine.width() > qRectSubLine.width() ) bTwoSubButtons = true; - if ( qRectSubLine.left() > kapp->style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).left() ) + if ( qRectSubLine.left() > QApplication::style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).left() ) bPlatinumStyle = true; } else { - qRectAddLine.setTop( kapp->style().querySubControlMetrics( + qRectAddLine.setTop( QApplication::style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarAddPage ).bottom() + 1 ); if ( qRectAddLine.height() > qRectSubLine.height() ) bTwoSubButtons = true; - if ( qRectSubLine.top() > kapp->style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).top() ) + if ( qRectSubLine.top() > QApplication::style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).top() ) bPlatinumStyle = true; } @@ -1543,7 +1543,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar if ( nState & CTRL_STATE_DEFAULT ) { - int nIndicatorSize = kapp->style().pixelMetric( + int nIndicatorSize = QApplication::style().pixelMetric( QStyle::PM_ButtonDefaultIndicator, pWidget ); qBoundingRect.addCoords( -nIndicatorSize, -nIndicatorSize, nIndicatorSize, nIndicatorSize ); @@ -1559,8 +1559,8 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar if ( nPart == PART_ENTIRE_CONTROL ) { - qRect.setWidth( kapp->style().pixelMetric( QStyle::PM_ExclusiveIndicatorWidth, pWidget ) ); - qRect.setHeight( kapp->style().pixelMetric( QStyle::PM_ExclusiveIndicatorHeight, pWidget ) ); + qRect.setWidth( QApplication::style().pixelMetric( QStyle::PM_ExclusiveIndicatorWidth, pWidget ) ); + qRect.setHeight( QApplication::style().pixelMetric( QStyle::PM_ExclusiveIndicatorHeight, pWidget ) ); bReturn = true; } @@ -1572,8 +1572,8 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar if ( nPart == PART_ENTIRE_CONTROL ) { - qRect.setWidth( kapp->style().pixelMetric( QStyle::PM_IndicatorWidth, pWidget ) ); - qRect.setHeight( kapp->style().pixelMetric( QStyle::PM_IndicatorHeight, pWidget ) ); + qRect.setWidth( QApplication::style().pixelMetric( QStyle::PM_IndicatorWidth, pWidget ) ); + qRect.setHeight( QApplication::style().pixelMetric( QStyle::PM_IndicatorHeight, pWidget ) ); bReturn = true; } @@ -1586,9 +1586,9 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar switch ( nPart ) { case PART_BUTTON_DOWN: - qRect = kapp->style().querySubControlMetrics( + qRect = QApplication::style().querySubControlMetrics( QStyle::CC_ComboBox, pWidget, QStyle::SC_ComboBoxArrow ); - qRect.setLeft( kapp->style().querySubControlMetrics( + qRect.setLeft( QApplication::style().querySubControlMetrics( QStyle::CC_ComboBox, pWidget, QStyle::SC_ComboBoxEditField ).right() + 1 ); qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); @@ -1596,7 +1596,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar break; case PART_SUB_EDIT: - qRect = kapp->style().querySubControlMetrics( + qRect = QApplication::style().querySubControlMetrics( QStyle::CC_ComboBox, pWidget, QStyle::SC_ComboBoxEditField ); qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); bReturn = true; @@ -1610,21 +1610,21 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar switch ( nPart ) { case PART_BUTTON_UP: - qRect = kapp->style().querySubControlMetrics( + qRect = QApplication::style().querySubControlMetrics( QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetUp ); bReturn = true; qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); break; case PART_BUTTON_DOWN: - qRect = kapp->style().querySubControlMetrics( + qRect = QApplication::style().querySubControlMetrics( QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetDown ); bReturn = true; qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); break; case PART_SUB_EDIT: - qRect = kapp->style().querySubControlMetrics( + qRect = QApplication::style().querySubControlMetrics( QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetEditField ); qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); bReturn = true; @@ -1641,14 +1641,14 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar { case PART_BUTTON_LEFT: case PART_BUTTON_UP: - qRect = kapp->style().querySubControlMetrics( + qRect = QApplication::style().querySubControlMetrics( QStyle::CC_ScrollBar, pWidget, QStyle::SC_ScrollBarSubLine ); // Workaround for Platinum style scroll bars. It makes the // left/up button invisible. if ( nPart == PART_BUTTON_LEFT ) { - if ( qRect.left() > kapp->style().querySubControlMetrics( + if ( qRect.left() > QApplication::style().querySubControlMetrics( QStyle::CC_ScrollBar, pWidget, QStyle::SC_ScrollBarSubPage ).left() ) { @@ -1658,7 +1658,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar } else { - if ( qRect.top() > kapp->style().querySubControlMetrics( + if ( qRect.top() > QApplication::style().querySubControlMetrics( QStyle::CC_ScrollBar, pWidget, QStyle::SC_ScrollBarSubPage ).top() ) { @@ -1674,17 +1674,17 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar case PART_BUTTON_RIGHT: case PART_BUTTON_DOWN: - qRect = kapp->style().querySubControlMetrics( + qRect = QApplication::style().querySubControlMetrics( QStyle::CC_ScrollBar, pWidget, QStyle::SC_ScrollBarAddLine ); // Workaround for Platinum and 3 button style scroll bars. // It makes the right/down button bigger. if ( nPart == PART_BUTTON_RIGHT ) - qRect.setLeft( kapp->style().querySubControlMetrics( + qRect.setLeft( QApplication::style().querySubControlMetrics( QStyle::CC_ScrollBar, pWidget, QStyle::SC_ScrollBarAddPage ).right() + 1 ); else - qRect.setTop( kapp->style().querySubControlMetrics( + qRect.setTop( QApplication::style().querySubControlMetrics( QStyle::CC_ScrollBar, pWidget, QStyle::SC_ScrollBarAddPage ).bottom() + 1 ); @@ -1884,7 +1884,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) } // General settings - QColorGroup qColorGroup = kapp->palette().active(); + QColorGroup qColorGroup = QApplication::palette().active(); Color aFore = toColor( qColorGroup.foreground() ); Color aBack = toColor( qColorGroup.background() ); @@ -1932,7 +1932,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetHighlightTextColor( toColor( qColorGroup.highlightedText() ) ); // Font - Font aFont = toFont( kapp->font(), rSettings.GetUILanguageTag().getLocale() ); + Font aFont = toFont( QApplication::font(), rSettings.GetUILanguageTag().getLocale() ); aStyleSettings.SetAppFont( aFont ); aStyleSettings.SetHelpFont( aFont ); @@ -1968,10 +1968,10 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) // Menu text and background color, theme specific Color aMenuFore = toColor( qMenuCG.foreground() ); Color aMenuBack = toColor( qMenuCG.background() ); - if ( kapp->style().inherits( "LightStyleV2" ) || - kapp->style().inherits( "LightStyleV3" ) || - ( kapp->style().inherits( QMotifStyle_String ) && !kapp->style().inherits( QSGIStyle_String ) ) || - kapp->style().inherits( QWindowsStyle_String ) ) + if ( QApplication::style().inherits( "LightStyleV2" ) || + QApplication::style().inherits( "LightStyleV3" ) || + ( QApplication::style().inherits( QMotifStyle_String ) && !QApplication::style().inherits( QSGIStyle_String ) ) || + QApplication::style().inherits( QWindowsStyle_String ) ) { aMenuFore = toColor( qMenuCG.buttonText() ); aMenuBack = toColor( qMenuCG.button() ); @@ -1984,11 +1984,11 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetMenuHighlightColor( toColor ( qMenuCG.highlight() ) ); // Menu items higlight text color, theme specific - if ( kapp->style().inherits( "HighContrastStyle" ) || - kapp->style().inherits( "KeramikStyle" ) || - kapp->style().inherits( QWindowsStyle_String ) || - kapp->style().inherits( "ThinKeramikStyle" ) || - kapp->style().inherits( "PlastikStyle" ) ) + if ( QApplication::style().inherits( "HighContrastStyle" ) || + QApplication::style().inherits( "KeramikStyle" ) || + QApplication::style().inherits( QWindowsStyle_String ) || + QApplication::style().inherits( "ThinKeramikStyle" ) || + QApplication::style().inherits( "PlastikStyle" ) ) { aStyleSettings.SetMenuHighlightTextColor( toColor ( qMenuCG.highlightedText() ) ); } @@ -1996,13 +1996,13 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetMenuHighlightTextColor( aMenuFore ); // set special menubar higlight text color - if ( kapp->style().inherits( "HighContrastStyle" ) ) + if ( QApplication::style().inherits( "HighContrastStyle" ) ) ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = toColor( qMenuCG.highlightedText() ); else ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = aMenuFore; // set menubar rollover color - if ( kapp->style().styleHint( QStyle::SH_MenuBar_MouseTracking ) ) + if ( QApplication::style().styleHint( QStyle::SH_MenuBar_MouseTracking ) ) { aStyleSettings.SetMenuBarRolloverColor( toColor ( qMenuCG.highlight() ) ); aStyleSettings.SetMenuBarRolloverTextColor( ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor ); @@ -2027,7 +2027,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) } // Scroll bar size - aStyleSettings.SetScrollBarSize( kapp->style().pixelMetric( QStyle::PM_ScrollBarExtent ) ); + aStyleSettings.SetScrollBarSize( QApplication::style().pixelMetric( QStyle::PM_ScrollBarExtent ) ); rSettings.SetStyleSettings( aStyleSettings ); } @@ -2120,7 +2120,7 @@ void KDEData::deInitNWF() pWidgetPainter = NULL; // We have to destroy the style early - kapp->setStyle( NULL ); + QApplication::setStyle( NULL ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/kde4/KDEData.cxx b/vcl/unx/kde4/KDEData.cxx index dff67e3e870e..fbf1d8e7d844 100644 --- a/vcl/unx/kde4/KDEData.cxx +++ b/vcl/unx/kde4/KDEData.cxx @@ -50,7 +50,7 @@ void KDEData::initNWF() pSVData->maNWFData.mbFlatMenu = true; // Styled menus need additional space - QStyle *style = kapp->style(); + QStyle *style = QApplication::style(); pSVData->maNWFData.mnMenuFormatBorderX = style->pixelMetric( QStyle::PM_MenuPanelWidth ) + style->pixelMetric( QStyle::PM_MenuHMargin ); diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx index e55169f5bd28..4c268b11570a 100644 --- a/vcl/unx/kde4/KDESalDisplay.cxx +++ b/vcl/unx/kde4/KDESalDisplay.cxx @@ -79,7 +79,7 @@ bool SalKDEDisplay::checkDirectInputEvent( XEvent* ev ) if( ev->xany.type == XLIB_KeyPress || ev->xany.type == KeyRelease || ( ev->xany.type == ClientMessage && ev->xclient.message_type == xim_protocol )) { - if( qApp->activeWindow() == NULL ) + if( QApplication::activeWindow() == NULL ) { Dispatch(ev); return true; diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index bd99e2d5a1fc..9306439ccf2a 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -166,7 +166,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) bool bSetTitleFont = false; // General settings - QPalette pal = kapp->palette(); + QPalette pal = QApplication::palette(); style.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE ); @@ -260,7 +260,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) style.SetHelpTextColor( toColor( QToolTip::palette().color( QPalette::Active, QPalette::ToolTipText ))); // Font - Font aFont = toFont( kapp->font(), rSettings.GetUILanguageTag().getLocale() ); + Font aFont = toFont( QApplication::font(), rSettings.GetUILanguageTag().getLocale() ); style.SetAppFont( aFont ); @@ -306,7 +306,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) style.SetMenuHighlightTextColor( aMenuFore ); // set special menubar higlight text color - if ( kapp->style()->inherits( "HighContrastStyle" ) ) + if ( QApplication::style()->inherits( "HighContrastStyle" ) ) ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = toColor( qMenuCG.color( QPalette::HighlightedText ) ); else ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = aMenuFore; @@ -331,8 +331,8 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) delete pMenuBar; // Scroll bar size - style.SetScrollBarSize( kapp->style()->pixelMetric( QStyle::PM_ScrollBarExtent ) ); - style.SetMinThumbSize( kapp->style()->pixelMetric( QStyle::PM_ScrollBarSliderMin )); + style.SetScrollBarSize( QApplication::style()->pixelMetric( QStyle::PM_ScrollBarExtent ) ); + style.SetMinThumbSize( QApplication::style()->pixelMetric( QStyle::PM_ScrollBarSliderMin )); rSettings.SetStyleSettings( style ); } diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index 173479622103..05b08a1da386 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -146,7 +146,7 @@ namespace option->rect = !rect.isNull() ? rect : image->rect(); QPainter painter(image); - kapp->style()->drawControl(element, option, &painter); + QApplication::style()->drawControl(element, option, &painter); } void draw( QStyle::PrimitiveElement element, QStyleOption* option, QImage* image, QStyle::State state, QRect rect = QRect()) @@ -155,7 +155,7 @@ namespace option->rect = !rect.isNull() ? rect : image->rect(); QPainter painter(image); - kapp->style()->drawPrimitive(element, option, &painter); + QApplication::style()->drawPrimitive(element, option, &painter); } void draw( QStyle::ComplexControl element, QStyleOptionComplex* option, QImage* image, QStyle::State state ) @@ -164,7 +164,7 @@ namespace option->rect = image->rect(); QPainter painter(image); - kapp->style()->drawComplexControl(element, option, &painter); + QApplication::style()->drawComplexControl(element, option, &painter); } void lcl_drawFrame(QStyle::PrimitiveElement element, QImage* image, QStyle::State state) @@ -279,7 +279,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, { QStyleOptionMenuItem option; if ( ( nControlState & CTRL_STATE_ROLLOVER ) - && kapp->style()->styleHint( QStyle::SH_MenuBar_MouseTracking ) ) + && QApplication::style()->styleHint( QStyle::SH_MenuBar_MouseTracking ) ) option.state |= QStyle::State_Selected; if ( nControlState & CTRL_STATE_SELECTED ) // Passing State_Sunken is currently not documented. @@ -325,13 +325,13 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, // with at least Plastique style, so clip only to the separator itself // (QSize( 2, 2 ) is hardcoded in Qt) option.rect = m_image->rect(); - QSize size = kapp->style()->sizeFromContents( QStyle::CT_MenuItem, &option, QSize( 2, 2 )); + QSize size = QApplication::style()->sizeFromContents( QStyle::CT_MenuItem, &option, QSize( 2, 2 )); QRect rect = m_image->rect(); QPoint center = rect.center(); rect.setHeight( size.height()); rect.moveCenter( center ); // don't paint over popup frame border (like the hack above, but here it can be simpler) - int fw = kapp->style()->pixelMetric( QStyle::PM_MenuPanelWidth ); + int fw = QApplication::style()->pixelMetric( QStyle::PM_MenuPanelWidth ); clipRegion = new QRegion( rect.translated( widgetRect.topLeft()).adjusted( fw, 0, -fw, 0 )); draw( QStyle::CE_MenuItem, &option, m_image, vclStateValue2StateFlag(nControlState, value), rect ); @@ -394,7 +394,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, } else if ( (type == CTRL_TOOLBAR) && (part == PART_THUMB_VERT) ) { // reduce paint area only to the handle area - const int width = kapp->style()->pixelMetric(QStyle::PM_ToolBarHandleExtent); + const int width = QApplication::style()->pixelMetric(QStyle::PM_ToolBarHandleExtent); QRect rect( 0, 0, width, widgetRect.height()); clipRegion = new QRegion( widgetRect.x(), widgetRect.y(), width, widgetRect.height()); @@ -677,7 +677,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, if ( controlState & CTRL_STATE_DEFAULT ) { - int size = kapp->style()->pixelMetric( + int size = QApplication::style()->pixelMetric( QStyle::PM_ButtonDefaultIndicator, &styleOption ); boundingRect.adjust( -size, -size, size, size ); @@ -688,12 +688,12 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, break; case CTRL_EDITBOX: { - int nFontHeight = kapp->fontMetrics().height(); - //int nFrameSize = kapp->style()->pixelMetric(QStyle::PM_DefaultFrameWidth); - int nLayoutTop = kapp->style()->pixelMetric(QStyle::PM_LayoutTopMargin); - int nLayoutBottom = kapp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin); - int nLayoutLeft = kapp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin); - int nLayoutRight = kapp->style()->pixelMetric(QStyle::PM_LayoutRightMargin); + int nFontHeight = QApplication::fontMetrics().height(); + //int nFrameSize = QApplication::style()->pixelMetric(QStyle::PM_DefaultFrameWidth); + int nLayoutTop = QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin); + int nLayoutBottom = QApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin); + int nLayoutLeft = QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin); + int nLayoutRight = QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin); int nMinHeight = (nFontHeight + nLayoutTop + nLayoutBottom); if( boundingRect.height() < nMinHeight ) @@ -712,15 +712,15 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, { styleOption.state = vclStateValue2StateFlag(controlState, val); - contentRect.setWidth(kapp->style()->pixelMetric( + contentRect.setWidth(QApplication::style()->pixelMetric( QStyle::PM_IndicatorWidth, &styleOption)); - contentRect.setHeight(kapp->style()->pixelMetric( + contentRect.setHeight(QApplication::style()->pixelMetric( QStyle::PM_IndicatorHeight, &styleOption)); contentRect.adjust(0, 0, - 2 * kapp->style()->pixelMetric( + 2 * QApplication::style()->pixelMetric( QStyle::PM_FocusFrameHMargin, &styleOption), - 2 * kapp->style()->pixelMetric( + 2 * QApplication::style()->pixelMetric( QStyle::PM_FocusFrameVMargin, &styleOption) ); @@ -742,13 +742,13 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, { case PART_ENTIRE_CONTROL: { - int size = kapp->style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2; + int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2; // find out the minimum size that should be used // assume contents is a text ling - int nHeight = kapp->fontMetrics().height(); + int nHeight = QApplication::fontMetrics().height(); QSize aContentSize( contentRect.width(), nHeight ); - QSize aMinSize = kapp->style()-> + QSize aMinSize = QApplication::style()-> sizeFromContents( QStyle::CT_ComboBox, &cbo, aContentSize ); if( aMinSize.height() > contentRect.height() ) contentRect.adjust( 0, 0, 0, aMinSize.height() - contentRect.height() ); @@ -762,7 +762,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, break; } case PART_BUTTON_DOWN: - contentRect = kapp->style()->subControlRect( + contentRect = QApplication::style()->subControlRect( QStyle::CC_ComboBox, &cbo, QStyle::SC_ComboBoxArrow ); contentRect.translate( boundingRect.left(), boundingRect.top() ); @@ -770,7 +770,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, retVal = true; break; case PART_SUB_EDIT: - contentRect = kapp->style()->subControlRect( + contentRect = QApplication::style()->subControlRect( QStyle::CC_ComboBox, &cbo, QStyle::SC_ComboBoxEditField ); contentRect.translate( boundingRect.left(), boundingRect.top() ); @@ -793,7 +793,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, switch ( part ) { case PART_BUTTON_UP: - contentRect = kapp->style()->subControlRect( + contentRect = QApplication::style()->subControlRect( QStyle::CC_SpinBox, &sbo, QStyle::SC_SpinBoxUp ); contentRect.translate( boundingRect.left(), boundingRect.top() ); retVal = true; @@ -801,7 +801,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, break; case PART_BUTTON_DOWN: - contentRect = kapp->style()->subControlRect( + contentRect = QApplication::style()->subControlRect( QStyle::CC_SpinBox, &sbo, QStyle::SC_SpinBoxDown ); retVal = true; contentRect.translate( boundingRect.left(), boundingRect.top() ); @@ -809,7 +809,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, break; case PART_SUB_EDIT: - contentRect = kapp->style()->subControlRect( + contentRect = QApplication::style()->subControlRect( QStyle::CC_SpinBox, &sbo, QStyle::SC_SpinBoxEditField ); retVal = true; contentRect.translate( boundingRect.left(), boundingRect.top() ); @@ -824,13 +824,13 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, int h, w; switch ( part ) { case PART_MENU_ITEM_CHECK_MARK: - h = kapp->style()->pixelMetric(QStyle::PM_IndicatorHeight); - w = kapp->style()->pixelMetric(QStyle::PM_IndicatorWidth); + h = QApplication::style()->pixelMetric(QStyle::PM_IndicatorHeight); + w = QApplication::style()->pixelMetric(QStyle::PM_IndicatorWidth); retVal = true; break; case PART_MENU_ITEM_RADIO_MARK: - h = kapp->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorHeight); - w = kapp->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth); + h = QApplication::style()->pixelMetric(QStyle::PM_ExclusiveIndicatorHeight); + w = QApplication::style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth); retVal = true; break; } @@ -859,14 +859,14 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, } case CTRL_RADIOBUTTON: { - const int h = kapp->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorHeight); - const int w = kapp->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth); + const int h = QApplication::style()->pixelMetric(QStyle::PM_ExclusiveIndicatorHeight); + const int w = QApplication::style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth); contentRect = QRect(boundingRect.left(), boundingRect.top(), w, h); contentRect.adjust(0, 0, - 2 * kapp->style()->pixelMetric( + 2 * QApplication::style()->pixelMetric( QStyle::PM_FocusFrameHMargin, &styleOption), - 2 * kapp->style()->pixelMetric( + 2 * QApplication::style()->pixelMetric( QStyle::PM_FocusFrameVMargin, &styleOption) ); boundingRect = contentRect; @@ -876,7 +876,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, } case CTRL_SLIDER: { - const int w = kapp->style()->pixelMetric(QStyle::PM_SliderLength); + const int w = QApplication::style()->pixelMetric(QStyle::PM_SliderLength); if( part == PART_THUMB_HORZ ) { contentRect = QRect(boundingRect.left(), boundingRect.top(), w, boundingRect.height()); @@ -916,7 +916,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, QRect rect = contentRect; rect.moveTo( 0, 0 ); option.rect = rect; - rect = kapp->style()->subControlRect( QStyle::CC_ScrollBar, &option, + rect = QApplication::style()->subControlRect( QStyle::CC_ScrollBar, &option, QStyle::SC_ScrollBarGroove ); rect.translate( contentRect.topLeft()); // reverse the workaround above contentRect = boundingRect = rect; @@ -980,7 +980,7 @@ bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, options.minimum = 0; options.sliderPosition = options.sliderValue = 4; options.pageStep = 2; - QStyle::SubControl control = kapp->style()->hitTestComplexControl( QStyle::CC_ScrollBar, &options, pos ); + QStyle::SubControl control = QApplication::style()->hitTestComplexControl( QStyle::CC_ScrollBar, &options, pos ); if( nPart == PART_BUTTON_UP || nPart == PART_BUTTON_LEFT ) rIsInside = ( control == QStyle::SC_ScrollBarSubLine ); else // DOWN, RIGHT diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 9d2949e693ec..1ee9a67d618c 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -245,7 +245,7 @@ void KDEXLib::setupEventLoop() old_gpoll = g_main_context_get_poll_func( NULL ); g_main_context_set_poll_func( NULL, gpoll_wrapper ); if( m_allowKdeDialogs ) - m_pApplication->clipboard()->setProperty( "useEventLoopWhenWaiting", true ); + QApplication::clipboard()->setProperty( "useEventLoopWhenWaiting", true ); return; } #endif diff --git a/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx index 1b1119faa0ba..4b02bbce3d39 100644 --- a/vcl/unx/kde4/VCLKDEApplication.cxx +++ b/vcl/unx/kde4/VCLKDEApplication.cxx @@ -55,7 +55,7 @@ void VCLKDEApplication::preDialogSetup() // (see the KDE VCL plug), then this won't happen. // We cannot simply release SolarMutex here, because the event loop started // by the file dialog would also call back to LO code. - assert( qApp->clipboard()->property( "useEventLoopWhenWaiting" ).toBool() == true ); + assert( QApplication::clipboard()->property( "useEventLoopWhenWaiting" ).toBool() == true ); } // various hacks to be performed after a Qt dialog has been closed -- cgit