Kaydet (Commit) 03b79b22 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix various Clang and loplugin warnings in --enable-kde5

Change-Id: Ia79f97ca589720dbdfd14ea03560713fd2d22db9
Reviewed-on: https://gerrit.libreoffice.org/55195Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst e1ab0444
......@@ -25,7 +25,7 @@ class KDE5SalData : public Qt5Data
{
public:
KDE5SalData(SalInstance* pInstance);
virtual ~KDE5SalData();
virtual ~KDE5SalData() override;
static void initNWF();
};
......
......@@ -55,8 +55,7 @@ void SalKDE5Display::Yield()
if (XEventsQueued(pDisp_, QueuedAfterReading) == 0)
return;
DBG_ASSERT(GetSalData()->m_pInstance->GetYieldMutex()->IsCurrentThread()
== osl::Thread::getCurrentIdentifier(),
DBG_ASSERT(GetSalData()->m_pInstance->GetYieldMutex()->IsCurrentThread(),
"will crash soon since solar mutex not locked in SalKDE5Display::Yield");
/*XEvent event;
......
......@@ -39,7 +39,7 @@
#include <vcl/font.hxx>
#include <vcl/settings.hxx>
#include "unx/fontmanager.hxx"
#include <unx/fontmanager.hxx>
#include <svdata.hxx>
......
......@@ -519,17 +519,17 @@ bool KDE5SalGraphics::drawNativeControl(ControlType type, ControlPart part,
if (value.getType() == ControlType::SpinButtons)
{
const SpinbuttonValue* pSpinVal = static_cast<const SpinbuttonValue*>(&value);
if ((pSpinVal->mnUpperState & ControlState::PRESSED))
if (pSpinVal->mnUpperState & ControlState::PRESSED)
option.activeSubControls |= QStyle::SC_SpinBoxUp;
if ((pSpinVal->mnLowerState & ControlState::PRESSED))
if (pSpinVal->mnLowerState & ControlState::PRESSED)
option.activeSubControls |= QStyle::SC_SpinBoxDown;
if ((pSpinVal->mnUpperState & ControlState::ENABLED))
if (pSpinVal->mnUpperState & ControlState::ENABLED)
option.stepEnabled |= QAbstractSpinBox::StepUpEnabled;
if ((pSpinVal->mnLowerState & ControlState::ENABLED))
if (pSpinVal->mnLowerState & ControlState::ENABLED)
option.stepEnabled |= QAbstractSpinBox::StepDownEnabled;
if ((pSpinVal->mnUpperState & ControlState::ROLLOVER))
if (pSpinVal->mnUpperState & ControlState::ROLLOVER)
option.state = QStyle::State_MouseOver;
if ((pSpinVal->mnLowerState & ControlState::ROLLOVER))
if (pSpinVal->mnLowerState & ControlState::ROLLOVER)
option.state = QStyle::State_MouseOver;
}
......@@ -601,7 +601,9 @@ bool KDE5SalGraphics::drawNativeControl(ControlType type, ControlPart part,
}
else if (type == ControlType::Progress && part == ControlPart::Entire)
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
QStyleOptionProgressBarV2 option;
SAL_WNODEPRECATED_DECLARATIONS_POP
option.minimum = 0;
option.maximum = widgetRect.width();
option.progress = value.getNumericVal();
......
......@@ -29,7 +29,7 @@ class KDE5SalInstance : public Qt5Instance
{
public:
explicit KDE5SalInstance(SalYieldMutex* pMutex);
virtual SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle);
virtual SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle) override;
virtual bool hasNativeFileSelection() const override { return true; }
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _VCLKDE5APPLICATION_HXX_
#define _VCLKDE5APPLICATION_HXX_
#ifndef INCLUDED_VCL_UNX_KDE5_VCLKDE5APPLICATION_HXX
#define INCLUDED_VCL_UNX_KDE5_VCLKDE5APPLICATION_HXX
#pragma once
......
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