summaryrefslogtreecommitdiff
path: root/vcl/qt5/Qt5OpenGLContext.cxx
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2021-09-28 15:02:47 +0200
committerMichael Weghorn <m.weghorn@posteo.de>2021-09-29 13:50:16 +0200
commitdfd3fdfe664e214ca1bba72b96d19b89ff25e7bc (patch)
treef4e6afe4de72c808606e123e51baa19b02e63b1a /vcl/qt5/Qt5OpenGLContext.cxx
parent894450d6ebbb2d5e063d72b971580d1b8c10a5e3 (diff)
qt5: Remove "5" from class names in qt5 VCL plugin
Rename classes for the qt5 VCL plugin to no longer contain the Qt version number "5" in them, e.g. "Qt5Widget" -> "QtWidget". Also, adapt some variable names and comments accordingly. The code will be used for an upcoming qt6 VCL plugin as well, so a "Qt" prefix fits better than a "Qt5" one. Renaming the headers and source files will be done in a separate commit to make tracking git history easier. Change-Id: Idf422f82ca9dafbb70e9a64de9c8cfc4cc8c0909 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122805 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'vcl/qt5/Qt5OpenGLContext.cxx')
-rw-r--r--vcl/qt5/Qt5OpenGLContext.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/vcl/qt5/Qt5OpenGLContext.cxx b/vcl/qt5/Qt5OpenGLContext.cxx
index ca2ec48d1d4c..0c8dd1729886 100644
--- a/vcl/qt5/Qt5OpenGLContext.cxx
+++ b/vcl/qt5/Qt5OpenGLContext.cxx
@@ -32,9 +32,9 @@
#include <QtGui/QOpenGLContext>
#include <QtGui/QWindow>
-bool Qt5OpenGLContext::g_bAnyCurrent = false;
+bool QtOpenGLContext::g_bAnyCurrent = false;
-void Qt5OpenGLContext::swapBuffers()
+void QtOpenGLContext::swapBuffers()
{
OpenGLZone aZone;
@@ -46,7 +46,7 @@ void Qt5OpenGLContext::swapBuffers()
BuffersSwapped();
}
-void Qt5OpenGLContext::resetCurrent()
+void QtOpenGLContext::resetCurrent()
{
clearCurrent();
@@ -59,19 +59,19 @@ void Qt5OpenGLContext::resetCurrent()
}
}
-bool Qt5OpenGLContext::isCurrent()
+bool QtOpenGLContext::isCurrent()
{
OpenGLZone aZone;
return g_bAnyCurrent && (QOpenGLContext::currentContext() == m_pContext);
}
-bool Qt5OpenGLContext::isAnyCurrent()
+bool QtOpenGLContext::isAnyCurrent()
{
OpenGLZone aZone;
return g_bAnyCurrent && (QOpenGLContext::currentContext() != nullptr);
}
-bool Qt5OpenGLContext::ImplInit()
+bool QtOpenGLContext::ImplInit()
{
if (!m_pWindow)
{
@@ -102,7 +102,7 @@ bool Qt5OpenGLContext::ImplInit()
return bRet;
}
-void Qt5OpenGLContext::makeCurrent()
+void QtOpenGLContext::makeCurrent()
{
if (isCurrent())
return;
@@ -120,7 +120,7 @@ void Qt5OpenGLContext::makeCurrent()
registerAsCurrent();
}
-void Qt5OpenGLContext::destroyCurrentContext()
+void QtOpenGLContext::destroyCurrentContext()
{
OpenGLZone aZone;
@@ -136,7 +136,7 @@ void Qt5OpenGLContext::destroyCurrentContext()
}
}
-void Qt5OpenGLContext::initWindow()
+void QtOpenGLContext::initWindow()
{
if (!m_pChildWindow)
{
@@ -150,5 +150,5 @@ void Qt5OpenGLContext::initWindow()
}
m_pWindow
- = static_cast<Qt5Object*>(m_pChildWindow->ImplGetWindowImpl()->mpSysObj)->windowHandle();
+ = static_cast<QtObject*>(m_pChildWindow->ImplGetWindowImpl()->mpSysObj)->windowHandle();
}