Kaydet (Commit) 88657bf4 authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski Kaydeden (comit) Caolán McNamara

Qt5 constify some functions to fix build

Change-Id: Ic0e85b2077c89a63301cf1d5b1cede7f6a0d7dce
Reviewed-on: https://gerrit.libreoffice.org/62767Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst f8a493ae
...@@ -84,7 +84,7 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public SalFrame ...@@ -84,7 +84,7 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public SalFrame
Size CalcDefaultSize(); Size CalcDefaultSize();
void SetDefaultSize(); void SetDefaultSize();
bool isChild(bool bPlug = true, bool bSysChild = true) bool isChild(bool bPlug = true, bool bSysChild = true) const
{ {
SalFrameStyleFlags nMask = SalFrameStyleFlags::NONE; SalFrameStyleFlags nMask = SalFrameStyleFlags::NONE;
if (bPlug) if (bPlug)
...@@ -94,11 +94,11 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public SalFrame ...@@ -94,11 +94,11 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public SalFrame
return bool(m_nStyle & nMask); return bool(m_nStyle & nMask);
} }
bool isWindow(); bool isWindow() const;
QWindow* windowHandle(); QWindow* windowHandle() const;
QScreen* screen(); QScreen* screen() const;
bool isMinimized(); bool isMinimized() const;
bool isMaximized(); bool isMaximized() const;
void TriggerPaintEvent(); void TriggerPaintEvent();
void TriggerPaintEvent(QRect aRect); void TriggerPaintEvent(QRect aRect);
......
...@@ -236,7 +236,7 @@ bool Qt5Frame::PostEvent(std::unique_ptr<ImplSVEvent> pData) ...@@ -236,7 +236,7 @@ bool Qt5Frame::PostEvent(std::unique_ptr<ImplSVEvent> pData)
return true; return true;
} }
bool Qt5Frame::isWindow() bool Qt5Frame::isWindow() const
{ {
if (m_pTopLevel) if (m_pTopLevel)
return m_pTopLevel->isWindow(); return m_pTopLevel->isWindow();
...@@ -244,7 +244,7 @@ bool Qt5Frame::isWindow() ...@@ -244,7 +244,7 @@ bool Qt5Frame::isWindow()
return m_pQWidget->isWindow(); return m_pQWidget->isWindow();
} }
QWindow* Qt5Frame::windowHandle() QWindow* Qt5Frame::windowHandle() const
{ {
if (m_pTopLevel) if (m_pTopLevel)
return m_pTopLevel->windowHandle(); return m_pTopLevel->windowHandle();
...@@ -252,7 +252,7 @@ QWindow* Qt5Frame::windowHandle() ...@@ -252,7 +252,7 @@ QWindow* Qt5Frame::windowHandle()
return m_pQWidget->windowHandle(); return m_pQWidget->windowHandle();
} }
QScreen* Qt5Frame::screen() QScreen* Qt5Frame::screen() const
{ {
QWindow* const pWindow = windowHandle(); QWindow* const pWindow = windowHandle();
if (pWindow) if (pWindow)
...@@ -261,7 +261,7 @@ QScreen* Qt5Frame::screen() ...@@ -261,7 +261,7 @@ QScreen* Qt5Frame::screen()
return nullptr; return nullptr;
} }
bool Qt5Frame::isMinimized() bool Qt5Frame::isMinimized() const
{ {
if (m_pTopLevel) if (m_pTopLevel)
return m_pTopLevel->isMinimized(); return m_pTopLevel->isMinimized();
...@@ -269,7 +269,7 @@ bool Qt5Frame::isMinimized() ...@@ -269,7 +269,7 @@ bool Qt5Frame::isMinimized()
return m_pQWidget->isMinimized(); return m_pQWidget->isMinimized();
} }
bool Qt5Frame::isMaximized() bool Qt5Frame::isMaximized() const
{ {
if (m_pTopLevel) if (m_pTopLevel)
return m_pTopLevel->isMaximized(); return m_pTopLevel->isMaximized();
...@@ -474,12 +474,7 @@ void Qt5Frame::SetModal(bool bModal) ...@@ -474,12 +474,7 @@ void Qt5Frame::SetModal(bool bModal)
} }
} }
bool Qt5Frame::GetModal() const bool Qt5Frame::GetModal() const { return isWindow() && windowHandle()->isModal(); }
{
if (isWindow())
return windowHandle()->getModality() == Qt::WindowModal;
return false;
}
void Qt5Frame::SetWindowState(const SalFrameState* pState) void Qt5Frame::SetWindowState(const SalFrameState* pState)
{ {
......
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