[Libreoffice-commits] core.git: vcl/inc vcl/qt5 vcl/unx
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Nov 16 14:25:07 UTC 2018
vcl/inc/qt5/Qt5AccessibleWidget.hxx | 4 ++--
vcl/inc/qt5/Qt5Graphics.hxx | 10 ++++++----
vcl/inc/qt5/Qt5Graphics_Controls.hxx | 18 +++++++++---------
vcl/inc/qt5/Qt5Menu.hxx | 4 ++--
vcl/qt5/Qt5Menu.cxx | 2 +-
vcl/unx/kde5/KDE5SalGraphics.hxx | 10 ++++++----
6 files changed, 26 insertions(+), 22 deletions(-)
New commits:
commit 53a78e9fc37187fe7f76839e28b56c853c4d860e
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Nov 16 15:24:37 2018 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Nov 16 15:24:37 2018 +0100
loplugin:staticmethods
Change-Id: I8d26503d68ed3dcc37574e247de3eae02b4e0f53
diff --git a/vcl/inc/qt5/Qt5AccessibleWidget.hxx b/vcl/inc/qt5/Qt5AccessibleWidget.hxx
index ff4dab306a58..19478586ea42 100644
--- a/vcl/inc/qt5/Qt5AccessibleWidget.hxx
+++ b/vcl/inc/qt5/Qt5AccessibleWidget.hxx
@@ -73,8 +73,8 @@ public:
void doAction(const QString& actionName) override;
QStringList keyBindingsForAction(const QString& actionName) const override;
- QAccessibleValueInterface* valueInterface();
- QAccessibleTextInterface* textInterface();
+ static QAccessibleValueInterface* valueInterface();
+ static QAccessibleTextInterface* textInterface();
// QAccessibleTextInterface
void addSelection(int startOffset, int endOffset) override;
diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index d60a42c8c496..480f2f4a4bf5 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -219,14 +219,15 @@ inline bool Qt5Graphics::IsNativeControlSupported(ControlType nType, ControlPart
{
if (Qt5Data::noNativeControls())
return false;
- return m_aControl.IsNativeControlSupported(nType, nPart);
+ return Qt5Graphics_Controls::IsNativeControlSupported(nType, nPart);
}
inline bool Qt5Graphics::hitTestNativeControl(ControlType nType, ControlPart nPart,
const tools::Rectangle& rControlRegion,
const Point& aPos, bool& rIsInside)
{
- return m_aControl.hitTestNativeControl(nType, nPart, rControlRegion, aPos, rIsInside);
+ return Qt5Graphics_Controls::hitTestNativeControl(nType, nPart, rControlRegion, aPos,
+ rIsInside);
}
inline bool Qt5Graphics::getNativeControlRegion(ControlType nType, ControlPart nPart,
@@ -236,8 +237,9 @@ inline bool Qt5Graphics::getNativeControlRegion(ControlType nType, ControlPart n
tools::Rectangle& rNativeBoundingRegion,
tools::Rectangle& rNativeContentRegion)
{
- return m_aControl.getNativeControlRegion(nType, nPart, rControlRegion, nState, aValue, aCaption,
- rNativeBoundingRegion, rNativeContentRegion);
+ return Qt5Graphics_Controls::getNativeControlRegion(nType, nPart, rControlRegion, nState,
+ aValue, aCaption, rNativeBoundingRegion,
+ rNativeContentRegion);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/qt5/Qt5Graphics_Controls.hxx b/vcl/inc/qt5/Qt5Graphics_Controls.hxx
index e888a1cd587b..c83d3ef458f1 100644
--- a/vcl/inc/qt5/Qt5Graphics_Controls.hxx
+++ b/vcl/inc/qt5/Qt5Graphics_Controls.hxx
@@ -44,18 +44,18 @@ public:
QImage& getImage() { return *m_image; }
- bool IsNativeControlSupported(ControlType nType, ControlPart nPart);
- bool hitTestNativeControl(ControlType nType, ControlPart nPart,
- const tools::Rectangle& rControlRegion, const Point& aPos,
- bool& rIsInside);
+ static bool IsNativeControlSupported(ControlType nType, ControlPart nPart);
+ static bool hitTestNativeControl(ControlType nType, ControlPart nPart,
+ const tools::Rectangle& rControlRegion, const Point& aPos,
+ bool& rIsInside);
bool drawNativeControl(ControlType nType, ControlPart nPart,
const tools::Rectangle& rControlRegion, ControlState nState,
const ImplControlValue& aValue, const OUString& aCaption);
- bool getNativeControlRegion(ControlType nType, ControlPart nPart,
- const tools::Rectangle& rControlRegion, ControlState nState,
- const ImplControlValue& aValue, const OUString& aCaption,
- tools::Rectangle& rNativeBoundingRegion,
- tools::Rectangle& rNativeContentRegion);
+ static bool getNativeControlRegion(ControlType nType, ControlPart nPart,
+ const tools::Rectangle& rControlRegion, ControlState nState,
+ const ImplControlValue& aValue, const OUString& aCaption,
+ tools::Rectangle& rNativeBoundingRegion,
+ tools::Rectangle& rNativeContentRegion);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index 366b68307182..e31c44fa8b55 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -29,7 +29,7 @@ private:
QMenuBar* mpQMenuBar;
void DoFullMenuUpdate(Menu* pMenuBar, QMenu* pParentMenu = nullptr);
- void NativeItemText(OUString& rItemText);
+ static void NativeItemText(OUString& rItemText);
public:
Qt5Menu(bool bMenuBar);
@@ -63,7 +63,7 @@ Q_SIGNALS:
void setFrameSignal(const SalFrame* pFrame);
private slots:
- void slotMenuTriggered(Qt5MenuItem* pQItem);
+ static void slotMenuTriggered(Qt5MenuItem* pQItem);
};
class Qt5MenuItem : public SalMenuItem
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 5005755e574b..c3228bdd90c0 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -148,7 +148,7 @@ void Qt5Menu::DoFullMenuUpdate(Menu* pMenuBar, QMenu* pParentMenu)
pAction->setVisible(pSalMenuItem->mbVisible);
connect(pAction, &QAction::triggered, this,
- [this, pSalMenuItem] { slotMenuTriggered(pSalMenuItem); });
+ [pSalMenuItem] { slotMenuTriggered(pSalMenuItem); });
}
}
}
diff --git a/vcl/unx/kde5/KDE5SalGraphics.hxx b/vcl/unx/kde5/KDE5SalGraphics.hxx
index e93796db531a..d5b01542e877 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.hxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.hxx
@@ -54,14 +54,15 @@ private:
inline bool KDE5SalGraphics::IsNativeControlSupported(ControlType nType, ControlPart nPart)
{
- return m_aControl.IsNativeControlSupported(nType, nPart);
+ return Qt5Graphics_Controls::IsNativeControlSupported(nType, nPart);
}
inline bool KDE5SalGraphics::hitTestNativeControl(ControlType nType, ControlPart nPart,
const tools::Rectangle& rControlRegion,
const Point& aPos, bool& rIsInside)
{
- return m_aControl.hitTestNativeControl(nType, nPart, rControlRegion, aPos, rIsInside);
+ return Qt5Graphics_Controls::hitTestNativeControl(nType, nPart, rControlRegion, aPos,
+ rIsInside);
}
inline bool KDE5SalGraphics::getNativeControlRegion(
@@ -69,8 +70,9 @@ inline bool KDE5SalGraphics::getNativeControlRegion(
ControlState nState, const ImplControlValue& aValue, const OUString& aCaption,
tools::Rectangle& rNativeBoundingRegion, tools::Rectangle& rNativeContentRegion)
{
- return m_aControl.getNativeControlRegion(nType, nPart, rControlRegion, nState, aValue, aCaption,
- rNativeBoundingRegion, rNativeContentRegion);
+ return Qt5Graphics_Controls::getNativeControlRegion(nType, nPart, rControlRegion, nState,
+ aValue, aCaption, rNativeBoundingRegion,
+ rNativeContentRegion);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list