summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/kde5/KDE5SalFrame.cxx4
-rw-r--r--vcl/unx/kde5/KDE5SalGraphics.cxx2
-rw-r--r--vcl/unx/kde5/KDE5SalGraphics.hxx3
3 files changed, 4 insertions, 5 deletions
diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx
index d3a13968237f..c195b641e119 100644
--- a/vcl/unx/kde5/KDE5SalFrame.cxx
+++ b/vcl/unx/kde5/KDE5SalFrame.cxx
@@ -30,8 +30,6 @@
#include <KConfigGroup>
#include <KSharedConfig>
-#undef Region
-
#include "KDE5SalFrame.hxx"
#include "KDE5SalGraphics.hxx"
@@ -211,7 +209,7 @@ SalGraphics* KDE5SalFrame::AcquireGraphics()
if (!m_pKDE5Graphics.get())
{
m_pKDE5Graphics.reset(new KDE5SalGraphics(this));
- Qt5Frame::InitSvpSalGraphics(m_pKDE5Graphics.get());
+ Qt5Frame::InitQt5SvpGraphics(m_pKDE5Graphics.get());
}
return m_pKDE5Graphics.get();
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index 0b4b4283f0da..6e30b9599740 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -40,7 +40,7 @@ static void QImage2BitmapBuffer(QImage* pImg, BitmapBuffer* pBuf)
}
KDE5SalGraphics::KDE5SalGraphics(Qt5Frame* pFrame)
- : SvpSalGraphics()
+ : Qt5SvpGraphics(pFrame->GetQWidget())
, m_pFrame(pFrame)
{
}
diff --git a/vcl/unx/kde5/KDE5SalGraphics.hxx b/vcl/unx/kde5/KDE5SalGraphics.hxx
index 109a0fa8ac29..1b12d890278c 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.hxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.hxx
@@ -25,6 +25,7 @@
#include <headless/svpgdi.hxx>
#include <Qt5Graphics_Controls.hxx>
+#include <Qt5SvpGraphics.hxx>
#include <QtGui/QImage>
#include <QtWidgets/QPushButton>
@@ -34,7 +35,7 @@ class Qt5Frame;
/**
* Handles native graphics requests and performs the needed drawing operations.
*/
-class KDE5SalGraphics : public SvpSalGraphics
+class KDE5SalGraphics : public Qt5SvpGraphics
{
public:
KDE5SalGraphics(Qt5Frame* pFrame);