Kaydet (Commit) 3fc8179c authored tarafından Noel Grandin's avatar Noel Grandin

various loplugin in qt5

loplugin:includeform
loplugin:staticaccess
loplugin:loopvartoosmall
loplugin:redundantcast

Change-Id: Ibd4848f0c6076d5ae95fff2853e1f6e0ba1c083b
üst 27ec8e8a
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <QtGui/QFont> #include <QtGui/QFont>
#include <Qt5FontFace.hxx> #include "Qt5FontFace.hxx"
class Qt5Font final : public QFont, public LogicalFontInstance class Qt5Font final : public QFont, public LogicalFontInstance
{ {
......
...@@ -146,7 +146,7 @@ bool Qt5Bitmap::Create(const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount) ...@@ -146,7 +146,7 @@ bool Qt5Bitmap::Create(const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount)
sal_uInt32 nWidth = pBitmap->m_aSize.Height() / 2; sal_uInt32 nWidth = pBitmap->m_aSize.Height() / 2;
bool isOdd(0 != pBitmap->m_aSize.Height() % 2); bool isOdd(0 != pBitmap->m_aSize.Height() % 2);
for (sal_uInt32 h = 0; h < pBitmap->m_aSize.Height(); ++h) for (long h = 0; h < pBitmap->m_aSize.Height(); ++h)
{ {
sal_uInt8* buffer_data = buffer_data_pos; sal_uInt8* buffer_data = buffer_data_pos;
buffer_data_pos += pBitmap->m_nScanline; buffer_data_pos += pBitmap->m_nScanline;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <Qt5Graphics.hxx> #include <Qt5Graphics.hxx>
#include "Qt5Font.hxx" #include <Qt5Font.hxx>
#include <Qt5Frame.hxx> #include <Qt5Frame.hxx>
#include <Qt5Painter.hxx> #include <Qt5Painter.hxx>
......
...@@ -407,7 +407,7 @@ void Qt5Graphics::copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics) ...@@ -407,7 +407,7 @@ void Qt5Graphics::copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics)
SalTwoRect aPosAry = rPosAry; SalTwoRect aPosAry = rPosAry;
if (!pSrcGraphics || this == pSrcGraphics) if (!pSrcGraphics || this == pSrcGraphics)
{ {
pImage = static_cast<Qt5Graphics*>(this)->m_pQImage; pImage = m_pQImage;
aImage aImage
= pImage->copy(rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth, rPosAry.mnSrcHeight); = pImage->copy(rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth, rPosAry.mnSrcHeight);
pImage = &aImage; pImage = &aImage;
......
...@@ -112,7 +112,7 @@ void Qt5Graphics::GetDevFontList(PhysicalFontCollection* pPFC) ...@@ -112,7 +112,7 @@ void Qt5Graphics::GetDevFontList(PhysicalFontCollection* pPFC)
continue; continue;
QString aFilename = toQString( QString aFilename = toQString(
OStringToOUString(rMgr.getFontFileSysPath(aInfo.m_nID), RTL_TEXTENCODING_UTF8)); OStringToOUString(rMgr.getFontFileSysPath(aInfo.m_nID), RTL_TEXTENCODING_UTF8));
aFDB.addApplicationFont(aFilename); QFontDatabase::addApplicationFont(aFilename);
} }
SalGenericInstance::RegisterFontSubstitutors(pPFC); SalGenericInstance::RegisterFontSubstitutors(pPFC);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment