vcl/unx/kde5/KDE5SalData.hxx | 2 +-
vcl/unx/kde5/KDE5SalDisplay.cxx | 3 +--
vcl/unx/kde5/KDE5SalFrame.cxx | 2 +-
vcl/unx/kde5/KDE5SalGraphics.cxx | 14 ++++++++------
vcl/unx/kde5/KDE5SalInstance.hxx | 2 +-
vcl/unx/kde5/VCLKDE5Application.hxx | 4 ++--
6 files changed, 14 insertions(+), 13 deletions(-)
New commits:
commit 03b79b227fa8ec728bbfb923e8ba8307ffa519a2
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Jun 1 17:47:39 2018 +0200
Fix various Clang and loplugin warnings in --enable-kde5
Change-Id: Ia79f97ca589720dbdfd14ea03560713fd2d22db9
Reviewed-on: https://gerrit.libreoffice.org/55195
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/unx/kde5/KDE5SalData.hxx b/vcl/unx/kde5/KDE5SalData.hxx
index 32b24da1f4ea..500aab2da24f 100644
--- a/vcl/unx/kde5/KDE5SalData.hxx
+++ b/vcl/unx/kde5/KDE5SalData.hxx
@@ -25,7 +25,7 @@ class KDE5SalData : public Qt5Data
{
public:
KDE5SalData(SalInstance* pInstance);
- virtual ~KDE5SalData();
+ virtual ~KDE5SalData() override;
static void initNWF();
};
diff --git a/vcl/unx/kde5/KDE5SalDisplay.cxx b/vcl/unx/kde5/KDE5SalDisplay.cxx
index e6cec3677ba3..fa5e40f56ff9 100644
--- a/vcl/unx/kde5/KDE5SalDisplay.cxx
+++ b/vcl/unx/kde5/KDE5SalDisplay.cxx
@@ -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;
diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx
index 8caa9b9f30ec..d282a083959a 100644
--- a/vcl/unx/kde5/KDE5SalFrame.cxx
+++ b/vcl/unx/kde5/KDE5SalFrame.cxx
@@ -39,7 +39,7 @@
#include <vcl/font.hxx>
#include <vcl/settings.hxx>
-#include "unx/fontmanager.hxx"
+#include <unx/fontmanager.hxx>
#include <svdata.hxx>
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index 1ef53d0e35ae..6ec1e6e385ea 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -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();
diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx
index 9afe49c15c86..cc7d7ad7cbce 100644
--- a/vcl/unx/kde5/KDE5SalInstance.hxx
+++ b/vcl/unx/kde5/KDE5SalInstance.hxx
@@ -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; }
diff --git a/vcl/unx/kde5/VCLKDE5Application.hxx
b/vcl/unx/kde5/VCLKDE5Application.hxx
index 6c6fb42dcd9f..5503db32c901 100644
--- a/vcl/unx/kde5/VCLKDE5Application.hxx
+++ b/vcl/unx/kde5/VCLKDE5Application.hxx
@@ -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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
