diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-13 17:53:02 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-13 17:54:36 +0200 |
| commit | 17b1cf0a0384cb2851cde023adadfefe76d41045 (patch) | |
| tree | 7d325fe8cd7697dbbc58325159a8244083d589e3 | |
| parent | f751e4b15256e53413395691f9ac50acaa5598eb (diff) | |
loplugin:staticcall
Change-Id: I16195f2278ae67f17db55e02bb38fe3c5cd063be
30 files changed, 226 insertions, 226 deletions
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx index 41a8741e0428..84dbd42d4aaf 100644 --- a/vcl/generic/print/printerjob.cxx +++ b/vcl/generic/print/printerjob.cxx @@ -107,7 +107,7 @@ PrinterJob::CreateSpoolFile (const OUString& rName, const OUString& rExtension) return NULL; } - pFile->setAttributes (aFileURL, + osl::File::setAttributes (aFileURL, osl_File_Attribute_OwnWrite | osl_File_Attribute_OwnRead); return pFile; } diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index c70bf09a1f4a..0668fc5212b1 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1441,12 +1441,12 @@ void DateFormatter::ImplLoadRes( const ResId& rResId ) if ( DATEFORMATTER_MIN & nMask ) { maMin = Date( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ); - pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) ); + pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) ); } if ( DATEFORMATTER_MAX & nMask ) { maMax = Date( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ); - pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) ); + pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) ); } if ( DATEFORMATTER_LONGFORMAT & nMask ) mbLongFormat = pMgr->ReadShort() != 0; @@ -1457,7 +1457,7 @@ void DateFormatter::ImplLoadRes( const ResId& rResId ) if ( DATEFORMATTER_VALUE & nMask ) { maFieldDate = Date( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ); - pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) ); + pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) ); if ( maFieldDate > maMax ) maFieldDate = maMax; if ( maFieldDate < maMin ) @@ -2422,13 +2422,13 @@ void TimeFormatter::ImplLoadRes( const ResId& rResId ) if ( TIMEFORMATTER_MIN & nMask ) { SetMin( Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) ); - pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) ); + pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) ); } if ( TIMEFORMATTER_MAX & nMask ) { SetMax( Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) ); - pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) ); + pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) ); } if ( TIMEFORMATTER_TIMEFIELDFORMAT & nMask ) @@ -2449,7 +2449,7 @@ void TimeFormatter::ImplLoadRes( const ResId& rResId ) maFieldTime = GetMin(); maLastTime = maFieldTime; - pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) ); + pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) ); } } } diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 2274e83acfb8..e03fb34d0821 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -844,7 +844,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r if ( aPrefMapMode == MAP_PIXEL ) aOriginalSize = Application::GetDefaultDevice()->PixelToLogic( aPrefSize, MAP_100TH_MM ); else - aOriginalSize = Application::GetDefaultDevice()->LogicToLogic( aPrefSize, aPrefMapMode, MAP_100TH_MM ); + aOriginalSize = OutputDevice::LogicToLogic( aPrefSize, aPrefMapMode, MAP_100TH_MM ); if ( !nLogicalWidth ) nLogicalWidth = aOriginalSize.Width(); if ( !nLogicalHeight ) diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index b25bb20ee72d..af017b17415b 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -301,7 +301,7 @@ bool EMFWriter::WriteEMF(const GDIMetaFile& rMtf) mnHorTextAlign = 0; const Size aMtfSizePix( maVDev.LogicToPixel( rMtf.GetPrefSize(), rMtf.GetPrefMapMode() ) ); - const Size aMtfSizeLog( maVDev.LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_100TH_MM ) ); + const Size aMtfSizeLog( OutputDevice::LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_100TH_MM ) ); // seek over header // use [MS-EMF 2.2.11] HeaderExtension2 Object, otherwise resulting EMF cannot be converted with GetWinMetaFileBits() @@ -637,25 +637,25 @@ void EMFWriter::ImplWriteRasterOp( RasterOp eRop ) void EMFWriter::ImplWriteExtent( long nExtent ) { - nExtent = maVDev.LogicToLogic( Size( nExtent, 0 ), maVDev.GetMapMode(), maDestMapMode ).Width(); + nExtent = OutputDevice::LogicToLogic( Size( nExtent, 0 ), maVDev.GetMapMode(), maDestMapMode ).Width(); m_rStm.WriteInt32( (sal_Int32) nExtent ); } void EMFWriter::ImplWritePoint( const Point& rPoint ) { - const Point aPoint( maVDev.LogicToLogic( rPoint, maVDev.GetMapMode(), maDestMapMode )); + const Point aPoint( OutputDevice::LogicToLogic( rPoint, maVDev.GetMapMode(), maDestMapMode )); m_rStm.WriteInt32( (sal_Int32) aPoint.X() ).WriteInt32( (sal_Int32) aPoint.Y() ); } void EMFWriter::ImplWriteSize( const Size& rSize) { - const Size aSize( maVDev.LogicToLogic( rSize, maVDev.GetMapMode(), maDestMapMode )); + const Size aSize( OutputDevice::LogicToLogic( rSize, maVDev.GetMapMode(), maDestMapMode )); m_rStm.WriteInt32( (sal_Int32) aSize.Width() ).WriteInt32( (sal_Int32) aSize.Height() ); } void EMFWriter::ImplWriteRect( const Rectangle& rRect ) { - const Rectangle aRect( maVDev.LogicToLogic ( rRect, maVDev.GetMapMode(), maDestMapMode )); + const Rectangle aRect( OutputDevice::LogicToLogic ( rRect, maVDev.GetMapMode(), maDestMapMode )); m_rStm .WriteInt32( static_cast<sal_Int32>(aRect.Left()) ) .WriteInt32( static_cast<sal_Int32>(aRect.Top()) ) @@ -1251,10 +1251,10 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) ImplEndRecord(); MapMode aMapMode( aSubstitute.GetPrefMapMode() ); - Size aOutSize( maVDev.LogicToLogic( pA->GetSize(), maVDev.GetMapMode(), aMapMode ) ); + Size aOutSize( OutputDevice::LogicToLogic( pA->GetSize(), maVDev.GetMapMode(), aMapMode ) ); aMapMode.SetScaleX( Fraction( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) ); aMapMode.SetScaleY( Fraction( aOutSize.Height(), aSubstitute.GetPrefSize().Height() ) ); - aMapMode.SetOrigin( maVDev.LogicToLogic( pA->GetPoint(), maVDev.GetMapMode(), aMapMode ) ); + aMapMode.SetOrigin( OutputDevice::LogicToLogic( pA->GetPoint(), maVDev.GetMapMode(), aMapMode ) ); maVDev.SetMapMode( aMapMode ); ImplWrite( aSubstitute ); diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index dab173ccb985..9362d2d1fb60 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -210,31 +210,31 @@ void WMFWriter::CountActionsAndBitmaps( const GDIMetaFile & rMTF ) void WMFWriter::WritePointXY(const Point & rPoint) { - Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); + Point aPt( OutputDevice::LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aPt.X() ).WriteInt16( (short)aPt.Y() ); } void WMFWriter::WritePointYX(const Point & rPoint) { - Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); + Point aPt( OutputDevice::LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aPt.Y() ).WriteInt16( (short)aPt.X() ); } sal_Int32 WMFWriter::ScaleWidth( sal_Int32 nDX ) { - Size aSz( pVirDev->LogicToLogic(Size(nDX,0),aSrcMapMode,aTargetMapMode) ); + Size aSz( OutputDevice::LogicToLogic(Size(nDX,0),aSrcMapMode,aTargetMapMode) ); return aSz.Width(); } void WMFWriter::WriteSize(const Size & rSize) { - Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); + Size aSz( OutputDevice::LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aSz.Width() ).WriteInt16( (short)aSz.Height() ); } void WMFWriter::WriteHeightWidth(const Size & rSize) { - Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); + Size aSz( OutputDevice::LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aSz.Height() ).WriteInt16( (short)aSz.Width() ); } @@ -507,7 +507,7 @@ bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const OUString& r + sizeof( nSkipActions ); SvMemoryStream aMemoryStream( nStrmLen ); - Point aPt( pVirDev->LogicToLogic( rPoint, aSrcMapMode, aTargetMapMode ) ); + Point aPt( OutputDevice::LogicToLogic( rPoint, aSrcMapMode, aTargetMapMode ) ); aMemoryStream.WriteInt32( static_cast<sal_Int32>(aPt.X()) ) .WriteInt32( static_cast<sal_Int32>(aPt.Y()) ) .WriteUInt32( nStringLen ); @@ -1642,7 +1642,7 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, bool bPlaceable ) if( bPlaceable ) { sal_uInt16 nCheckSum, nValue; - Size aSize( pVirDev->LogicToLogic(Size(1,1),MapMode(MAP_INCH), aTargetMapMode) ); + Size aSize( OutputDevice::LogicToLogic(Size(1,1),MapMode(MAP_INCH), aTargetMapMode) ); sal_uInt16 nUnitsPerInch = (sal_uInt16) ( ( aSize.Width() + aSize.Height() ) >> 1 ); nCheckSum=0; @@ -1733,7 +1733,7 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, aTargetMapMode.SetScaleX( aFrac ); aTargetMapMode.SetScaleY( aFrac ); - aTargetSize = pVirDev->LogicToLogic( rMTF.GetPrefSize(), aSrcMapMode, aTargetMapMode ); + aTargetSize = OutputDevice::LogicToLogic( rMTF.GetPrefSize(), aSrcMapMode, aTargetMapMode ); } pVirDev->SetMapMode( aTargetMapMode ); @@ -1816,7 +1816,7 @@ sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode, Fraction aDivFrac(2, 1); sal_uInt16 nDivisor = 1; - Size aSize = pVirDev->LogicToLogic( rPrefSize, aSrcMapMode, rMapMode ); + Size aSize = OutputDevice::LogicToLogic( rPrefSize, aSrcMapMode, rMapMode ); while( nDivisor <= 64 && (aSize.Width() > 32767 || aSize.Height() > 32767) ) { @@ -1828,7 +1828,7 @@ sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode, aFrac *= aDivFrac; rMapMode.SetScaleY(aFrac); nDivisor <<= 1; - aSize = pVirDev->LogicToLogic( rPrefSize, aSrcMapMode, rMapMode ); + aSize = OutputDevice::LogicToLogic( rPrefSize, aSrcMapMode, rMapMode ); } return nDivisor; diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx index a98a60df1114..3cba47056f81 100644 --- a/vcl/source/font/PhysicalFontFamily.cxx +++ b/vcl/source/font/PhysicalFontFamily.cxx @@ -217,7 +217,7 @@ void PhysicalFontFamily::InitMatchData( const utl::FontSubstConfiguration& rFont OUString aShortName; OUString aMatchFamilyName(maMatchFamilyName); // get font attributes from the decorated font name - rFontSubst.getMapName( rSearchName, aShortName, aMatchFamilyName, + utl::FontSubstConfiguration::getMapName( rSearchName, aShortName, aMatchFamilyName, meMatchWeight, meMatchWidth, mnMatchType ); maMatchFamilyName = aMatchFamilyName; const utl::FontNameAttr* pFontAttr = rFontSubst.getSubstInfo( rSearchName ); diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx index 1eca07e2833e..5706022a6bf2 100644 --- a/vcl/source/gdi/embeddedfontshelper.cxx +++ b/vcl/source/gdi/embeddedfontshelper.cxx @@ -182,7 +182,7 @@ void EmbeddedFontsHelper::activateFont( const OUString& fontName, const OUString { OutputDevice *pDevice = Application::GetDefaultDevice(); pDevice->AddTempDevFont( fileUrl, fontName ); - pDevice->ImplUpdateAllFontData( true ); + OutputDevice::ImplUpdateAllFontData( true ); } // Check if it's (legally) allowed to embed the font file into a document diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index cebb19c959e6..7158d4db80c3 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -743,7 +743,7 @@ void GDIMetaFile::Move( long nX, long nY ) ( META_POP_ACTION == nType ) ) { pModAct->Execute( &aMapVDev ); - aOffset = aMapVDev.LogicToLogic( aBaseOffset, GetPrefMapMode(), aMapVDev.GetMapMode() ); + aOffset = OutputDevice::LogicToLogic( aBaseOffset, GetPrefMapMode(), aMapVDev.GetMapMode() ); } pModAct->Move( aOffset.Width(), aOffset.Height() ); @@ -786,7 +786,7 @@ void GDIMetaFile::Move( long nX, long nY, long nDPIX, long nDPIY ) aOffset.Height() = static_cast<long>(aOffset.Height() * (double)aMap.GetScaleY()); } else - aOffset = aMapVDev.LogicToLogic( aBaseOffset, GetPrefMapMode(), aMapVDev.GetMapMode() ); + aOffset = OutputDevice::LogicToLogic( aBaseOffset, GetPrefMapMode(), aMapVDev.GetMapMode() ); } pModAct->Move( aOffset.Width(), aOffset.Height() ); @@ -836,7 +836,7 @@ void GDIMetaFile::Clip( const Rectangle& i_rClipRect ) ( META_POP_ACTION == nType ) ) { pAct->Execute( &aMapVDev ); - aCurRect = aMapVDev.LogicToLogic( i_rClipRect, GetPrefMapMode(), aMapVDev.GetMapMode() ); + aCurRect = OutputDevice::LogicToLogic( i_rClipRect, GetPrefMapMode(), aMapVDev.GetMapMode() ); } else if( nType == META_CLIPREGION_ACTION ) { @@ -1354,8 +1354,8 @@ void GDIMetaFile::Rotate( long nAngle10 ) ( META_PUSH_ACTION == nActionType ) || ( META_POP_ACTION == nActionType ) ) { - aRotAnchor = aMapVDev.LogicToLogic( aOrigin, aPrefMapMode, aMapVDev.GetMapMode() ); - aRotOffset = aMapVDev.LogicToLogic( aOffset, aPrefMapMode, aMapVDev.GetMapMode() ); + aRotAnchor = OutputDevice::LogicToLogic( aOrigin, aPrefMapMode, aMapVDev.GetMapMode() ); + aRotOffset = OutputDevice::LogicToLogic( aOffset, aPrefMapMode, aMapVDev.GetMapMode() ); } } break; @@ -1424,7 +1424,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaPixelAction* pAct = (MetaPixelAction*) pAction; ImplActionBounds( aBound, - Rectangle( aMapVDev.LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ), + Rectangle( OutputDevice::LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aMapVDev.PixelToLogic( Size( 1, 1 ), GetPrefMapMode() ) ), aClipStack, pUseHairline ); } @@ -1434,7 +1434,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaPointAction* pAct = (MetaPointAction*) pAction; ImplActionBounds( aBound, - Rectangle( aMapVDev.LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ), + Rectangle( OutputDevice::LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aMapVDev.PixelToLogic( Size( 1, 1 ), GetPrefMapMode() ) ), aClipStack, pUseHairline ); } @@ -1455,28 +1455,28 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai pUseHairline = 0; } - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); } break; case( META_RECT_ACTION ): { MetaRectAction* pAct = (MetaRectAction*) pAction; - ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); } break; case( META_ROUNDRECT_ACTION ): { MetaRoundRectAction* pAct = (MetaRoundRectAction*) pAction; - ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); } break; case( META_ELLIPSE_ACTION ): { MetaEllipseAction* pAct = (MetaEllipseAction*) pAction; - ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); } break; @@ -1485,7 +1485,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai MetaArcAction* pAct = (MetaArcAction*) pAction; // FIXME: this is imprecise // e.g. for small arcs the whole rectangle is WAY too large - ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); } break; @@ -1494,7 +1494,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai MetaPieAction* pAct = (MetaPieAction*) pAction; // FIXME: this is imprecise // e.g. for small arcs the whole rectangle is WAY too large - ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); } break; @@ -1503,7 +1503,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai MetaChordAction* pAct = (MetaChordAction*) pAction; // FIXME: this is imprecise // e.g. for small arcs the whole rectangle is WAY too large - ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); } break; @@ -1520,7 +1520,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai pUseHairline = 0; } - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); } break; @@ -1528,7 +1528,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaPolygonAction* pAct = (MetaPolygonAction*) pAction; Rectangle aRect( pAct->GetPolygon().GetBoundRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); } break; @@ -1536,7 +1536,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaPolyPolygonAction* pAct = (MetaPolyPolygonAction*) pAction; Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, pUseHairline ); } break; @@ -1548,7 +1548,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen() ); Point aPt( pAct->GetPoint() ); aRect.Move( aPt.X(), aPt.Y() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1561,7 +1561,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai 0, pAct->GetDXArray() ); Point aPt( pAct->GetPoint() ); aRect.Move( aPt.X(), aPt.Y() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1574,7 +1574,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai pAct->GetWidth(), NULL ); Point aPt( pAct->GetPoint() ); aRect.Move( aPt.X(), aPt.Y() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1590,7 +1590,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai Point aPt( pAct->GetStartPoint() ); aRect.Move( aPt.X(), aPt.Y() ); aRect.Right() = aRect.Left() + pAct->GetWidth(); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1598,7 +1598,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaBmpScaleAction* pAct = (MetaBmpScaleAction*) pAction; Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1606,7 +1606,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaBmpScalePartAction* pAct = (MetaBmpScalePartAction*) pAction; Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1614,7 +1614,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaBmpExScaleAction* pAct = (MetaBmpExScaleAction*) pAction; Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1622,7 +1622,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaBmpExScalePartAction* pAct = (MetaBmpExScalePartAction*) pAction; Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1630,7 +1630,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaGradientAction* pAct = (MetaGradientAction*) pAction; Rectangle aRect( pAct->GetRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1638,7 +1638,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaGradientExAction* pAct = (MetaGradientExAction*) pAction; Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1652,7 +1652,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaHatchAction* pAct = (MetaHatchAction*) pAction; Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1660,7 +1660,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaTransparentAction* pAct = (MetaTransparentAction*) pAction; Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1670,7 +1670,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai // MetaFloatTransparentAction is defined limiting it's content Metafile // to it's geometry definition(Point, Size), so use these directly const Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1678,7 +1678,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaEPSAction* pAct = (MetaEPSAction*) pAction; Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1686,7 +1686,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaClipRegionAction* pAct = (MetaClipRegionAction*) pAction; if( pAct->IsClipping() ) - aClipStack.back() = aMapVDev.LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ); + aClipStack.back() = OutputDevice::LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ); else aClipStack.back() = Rectangle(); } @@ -1695,7 +1695,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai case( META_ISECTRECTCLIPREGION_ACTION ): { MetaISectRectClipRegionAction* pAct = (MetaISectRectClipRegionAction*) pAction; - Rectangle aRect( aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) ); + Rectangle aRect( OutputDevice::LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) ); if( aClipStack.back().IsEmpty() ) aClipStack.back() = aRect; else @@ -1706,7 +1706,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai case( META_ISECTREGIONCLIPREGION_ACTION ): { MetaISectRegionClipRegionAction* pAct = (MetaISectRegionClipRegionAction*) pAction; - Rectangle aRect( aMapVDev.LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) ); + Rectangle aRect( OutputDevice::LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) ); if( aClipStack.back().IsEmpty() ) aClipStack.back() = aRect; else @@ -1718,7 +1718,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaBmpAction* pAct = (MetaBmpAction*) pAction; Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmap().GetSizePixel() ) ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1726,7 +1726,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaBmpExAction* pAct = (MetaBmpExAction*) pAction; Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmapEx().GetSizePixel() ) ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1734,7 +1734,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaMaskAction* pAct = (MetaMaskAction*) pAction; Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmap().GetSizePixel() ) ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1742,7 +1742,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction; Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1750,7 +1750,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction; Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1758,7 +1758,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaWallpaperAction* pAct = (MetaWallpaperAction*) pAction; Rectangle aRect( pAct->GetRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1766,7 +1766,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai { MetaTextRectAction* pAct = (MetaTextRectAction*) pAction; Rectangle aRect( pAct->GetRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); + ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); } break; @@ -1776,7 +1776,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai if( ! aClipStack.back().IsEmpty() ) { Size aDelta( pAct->GetHorzMove(), pAct->GetVertMove() ); - aDelta = aMapVDev.LogicToLogic( aDelta, aMapVDev.GetMapMode(), GetPrefMapMode() ); + aDelta = OutputDevice::LogicToLogic( aDelta, aMapVDev.GetMapMode(), GetPrefMapMode() ); aClipStack.back().Move( aDelta.Width(), aDelta.Width() ); } } diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 163e8ef0e991..478f04979a75 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -64,7 +64,7 @@ Image::Image( const ResId& rResId ) : if( nObjMask & RSC_IMAGE_IMAGEBITMAP ) { aBmpEx = BitmapEx( ResId( (RSHEADER_TYPE*)pResMgr->GetClass(), *pResMgr ) ); - pResMgr->Increment( pResMgr->GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) ); + pResMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) ); } if( nObjMask & RSC_IMAGE_MASKBITMAP ) @@ -75,7 +75,7 @@ Image::Image( const ResId& rResId ) : aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aMaskBitmap ); } - pResMgr->Increment( pResMgr->GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) ); + pResMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) ); } if( nObjMask & RSC_IMAGE_MASKCOLOR ) @@ -86,7 +86,7 @@ Image::Image( const ResId& rResId ) : aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aMaskColor ); } - pResMgr->Increment( pResMgr->GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) ); + pResMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) ); } if( ! aBmpEx.IsEmpty() ) ImplInit( aBmpEx ); @@ -306,7 +306,7 @@ ImageList::ImageList( const ResId& rResId ) : if( nObjMask & RSC_IMAGE_MASKCOLOR ) spMaskColor.reset( new Color( ResId( (RSHEADER_TYPE*)pResMgr->GetClass(), *pResMgr ) ) ); - pResMgr->Increment( pResMgr->GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) ); + pResMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) ); if( nObjMask & RSC_IMAGELIST_IDLIST ) { diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index 394bdd2d0a88..bf870819c408 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -42,7 +42,7 @@ ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut, mbHMirr ( maSz.Width() < 0L ), mbVMirr ( maSz.Height() < 0L ) { - mpParent->ImplIncAnimCount(); + Animation::ImplIncAnimCount(); // Mirrored horizontally? if( mbHMirr ) @@ -97,7 +97,7 @@ ImplAnimView::~ImplAnimView() delete mpBackground; delete mpRestore; - mpParent->ImplDecAnimCount(); + Animation::ImplDecAnimCount(); } bool ImplAnimView::ImplMatches( OutputDevice* pOut, long nExtraData ) const diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 3e083e2351cd..4a4d745b324c 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -7715,7 +7715,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool aLine.setLength( 0 ); aLine.append( "q\n" ); - nEmphMark = m_pReferenceDevice->ImplGetEmphasisMarkStyle( m_aCurrentPDFState.m_aFont ); + nEmphMark = OutputDevice::ImplGetEmphasisMarkStyle( m_aCurrentPDFState.m_aFont ); if ( nEmphMark & EMPHASISMARK_POS_BELOW ) nEmphHeight = m_pReferenceDevice->mnEmphasisDescent; else @@ -7902,7 +7902,7 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const OUString& rOrigStr, OUString aStr = rOrigStr; if ( nStyle & TEXT_DRAW_MNEMONIC ) - aStr = m_pReferenceDevice->GetNonMnemonicString( aStr, nMnemonicPos ); + aStr = OutputDevice::GetNonMnemonicString( aStr, nMnemonicPos ); // multiline text if ( nStyle & TEXT_DRAW_MULTILINE ) diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 502e120386b2..60563f974315 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -496,10 +496,10 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa pDummyVDev->Push(); MapMode aMapMode( aSubstitute.GetPrefMapMode() ); - Size aOutSize( pDummyVDev->LogicToLogic( pA->GetSize(), pDummyVDev->GetMapMode(), aMapMode ) ); + Size aOutSize( OutputDevice::LogicToLogic( pA->GetSize(), pDummyVDev->GetMapMode(), aMapMode ) ); aMapMode.SetScaleX( Fraction( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) ); aMapMode.SetScaleY( Fraction( aOutSize.Height(), aSubstitute.GetPrefSize().Height() ) ); - aMapMode.SetOrigin( pDummyVDev->LogicToLogic( pA->GetPoint(), pDummyVDev->GetMapMode(), aMapMode ) ); + aMapMode.SetOrigin( OutputDevice::LogicToLogic( pA->GetPoint(), pDummyVDev->GetMapMode(), aMapMode ) ); m_rOuterFace.SetMapMode( aMapMode ); pDummyVDev->SetMapMode( aMapMode ); diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index e6e1e365223d..6c8bdc449264 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -1799,7 +1799,7 @@ void Printer::updatePrinters() { DataChangedEvent aDCEvt( DATACHANGED_PRINTER ); pApp->DataChanged( aDCEvt ); - pApp->NotifyAllWindows( aDCEvt ); + Application::NotifyAllWindows( aDCEvt ); } } else diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 35010b17ae97..e891e1713292 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -143,7 +143,7 @@ namespace vcl // now that the Zoom is part of the map mode, reset the target device's font to the "unzoomed" version Font aDrawFont( m_aUnzoomedPointFont ); - aDrawFont.SetSize( m_rTargetDevice.LogicToLogic( aDrawFont.GetSize(), MAP_POINT, eTargetMapUnit ) ); + aDrawFont.SetSize( OutputDevice::LogicToLogic( aDrawFont.GetSize(), MAP_POINT, eTargetMapUnit ) ); _rTargetDevice.SetFont( aDrawFont ); // transfer font to the reference device diff --git a/vcl/source/helper/evntpost.cxx b/vcl/source/helper/evntpost.cxx index 28ede4a926d6..06ba4a37390d 100644 --- a/vcl/source/helper/evntpost.cxx +++ b/vcl/source/helper/evntpost.cxx @@ -36,14 +36,14 @@ EventPoster::~EventPoster() { DBG_TESTSOLARMUTEX(); if ( m_nId ) - GetpApp()->RemoveUserEvent( m_nId ); + Application::RemoveUserEvent( m_nId ); } void EventPoster::Post( UserEvent* pEvent ) { DBG_TESTSOLARMUTEX(); - m_nId = GetpApp()->PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ), pEvent ); + m_nId = Application::PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ), pEvent ); } IMPL_LINK( EventPoster, DoEvent_Impl, UserEvent*, pEvent ) diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 7104caa95a13..5c0333f3e5ad 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -648,7 +648,7 @@ void OutputDevice::EndFontSubstitution() Application* pApp = GetpApp(); DataChangedEvent aDCEvt( DATACHANGED_FONTSUBSTITUTION ); pApp->DataChanged( aDCEvt ); - pApp->NotifyAllWindows( aDCEvt ); + Application::NotifyAllWindows( aDCEvt ); pSVData->maGDIData.mbFontSubChanged = false; } } diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 66e2d74fd06a..b7176cbf9af4 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -213,7 +213,7 @@ void Window::CallEventListeners( sal_uLong nEvent, void* pData ) ImplDelData aDelData; ImplAddDel( &aDelData ); - ImplGetSVData()->mpApp->ImplCallEventListeners( &aEvent ); + Application::ImplCallEventListeners( &aEvent ); if ( aDelData.IsDead() ) return; @@ -243,7 +243,7 @@ void Window::CallEventListeners( sal_uLong nEvent, void* pData ) void Window::FireVclEvent( VclSimpleEvent* pEvent ) { - ImplGetSVData()->mpApp->ImplCallEventListeners(pEvent); + Application::ImplCallEventListeners(pEvent); } void Window::AddEventListener( const Link& rEventListener ) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 1996b4659d96..4f82d32ce11d 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1180,7 +1180,7 @@ void Menu::ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ) // This is needed by atk accessibility bridge if ( nEvent == VCLEVENT_MENU_HIGHLIGHT ) { - ImplGetSVData()->mpApp->ImplCallEventListeners( &aEvent ); + Application::ImplCallEventListeners( &aEvent ); } if ( !aDelData.isDeleted() ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index a3146d965c19..396b66ef778f 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -271,7 +271,7 @@ Window::~Window() aTempStr.append(aErrorStr.toString()); OSL_FAIL(aTempStr.getStr()); // abort in debug builds, must be fixed! - GetpApp()->Abort(OStringToOUString( + Application::Abort(OStringToOUString( aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); } } @@ -294,7 +294,7 @@ Window::~Window() aTempStr.append(") with live SystemWindows destroyed: "); aTempStr.append(aErrorStr.toString()); OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed! + Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed! } if ( mpWindowImpl->mpFirstChild ) @@ -309,7 +309,7 @@ Window::~Window() pTempWin = pTempWin->mpWindowImpl->mpNext; } OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed! + Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed! } if ( mpWindowImpl->mpFirstOverlap ) @@ -324,7 +324,7 @@ Window::~Window() pTempWin = pTempWin->mpWindowImpl->mpNext; } OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed! + Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed! } Window* pMyParent = this; @@ -342,7 +342,7 @@ Window::~Window() aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") still in TaskPanelList!"); OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed! + Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed! } } #endif @@ -411,7 +411,7 @@ Window::~Window() RTL_TEXTENCODING_UTF8)). append(") with focussed child window destroyed ! THIS WILL LEAD TO CRASHES AND MUST BE FIXED !"); OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8 )); // abort in debug build version, this must be fixed! + Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8 )); // abort in debug build version, this must be fixed! #endif } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 93ff18b82687..1a343a67b8ac 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -904,7 +904,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, nVCLEvent = 0; break; } - if( nVCLEvent && pSVData->mpApp->HandleKey( nVCLEvent, pWindow, &aKeyEvent ) ) + if( nVCLEvent && Application::HandleKey( nVCLEvent, pWindow, &aKeyEvent ) ) return true; } @@ -2060,10 +2060,10 @@ static void ImplHandleSalSettings( sal_uInt16 nEvent ) if ( nEvent == SALEVENT_SETTINGSCHANGED ) { - AllSettings aSettings = pApp->GetSettings(); - pApp->MergeSystemSettings( aSettings ); + AllSettings aSettings = Application::GetSettings(); + Application::MergeSystemSettings( aSettings ); pApp->OverrideSystemSettings( aSettings ); - pApp->SetSettings( aSettings ); + Application::SetSettings( aSettings ); } else { @@ -2099,7 +2099,7 @@ static void ImplHandleSalSettings( sal_uInt16 nEvent ) { DataChangedEvent aDCEvt( nType ); pApp->DataChanged( aDCEvt ); - pApp->NotifyAllWindows( aDCEvt ); + Application::NotifyAllWindows( aDCEvt ); } } } diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index d1cd7f35f6e9..cf06c7c46f0d 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -250,7 +250,7 @@ bool WorkWindow::Close() // Ist es das Applikationsfenster, dann beende die Applikation if ( bCanClose && ( ImplGetSVData()->maWinData.mpAppWin == this ) ) - GetpApp()->Quit(); + Application::Quit(); return bCanClose; } 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<FcPattern*>(pPattern)); if (!font_face) font_face = cairo_ft_font_face_create_for_ft_face(reinterpret_cast<FT_Face>(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<QMenuBar*>( 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<QProgressBar*>(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 |