From 486c2f4534020d2248e33417ff13c23f1df0a2db Mon Sep 17 00:00:00 2001 From: Roman Gilg Date: Thu, 27 Jun 2019 00:03:25 +0200 Subject: [PATCH] [platformsupport] Minor code style and class variables access changes Summary: Some of these variables have been declared protected but can apparently also be private. Other minor code style improvements. Test Plan: Compiles, Wayland nested session runs. Reviewers: #kwin, zzag Reviewed By: #kwin, zzag Subscribers: zzag, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D22109 --- platformsupport/scenes/opengl/texture.h | 26 ++++++++++--------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/platformsupport/scenes/opengl/texture.h b/platformsupport/scenes/opengl/texture.h index d574b0cb55..5024f733a5 100644 --- a/platformsupport/scenes/opengl/texture.h +++ b/platformsupport/scenes/opengl/texture.h @@ -18,8 +18,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ -#ifndef KWIN_SCENE_OPENGL_TEXTURE_H -#define KWIN_SCENE_OPENGL_TEXTURE_H +#pragma once #include #include @@ -28,37 +27,34 @@ namespace KWin { class OpenGLBackend; -class WindowPixmap; class SceneOpenGLTexturePrivate; +class WindowPixmap; -class SceneOpenGLTexture - : public GLTexture +class SceneOpenGLTexture : public GLTexture { public: - SceneOpenGLTexture(OpenGLBackend *backend); - virtual ~SceneOpenGLTexture(); + explicit SceneOpenGLTexture(OpenGLBackend *backend); + ~SceneOpenGLTexture() override; SceneOpenGLTexture & operator = (const SceneOpenGLTexture& tex); void discard() override final; -protected: +private: + SceneOpenGLTexture(SceneOpenGLTexturePrivate& dd); + bool load(WindowPixmap *pixmap); void updateFromPixmap(WindowPixmap *pixmap); - SceneOpenGLTexture(SceneOpenGLTexturePrivate& dd); - -private: Q_DECLARE_PRIVATE(SceneOpenGLTexture) friend class OpenGLWindowPixmap; }; -class SceneOpenGLTexturePrivate - : public GLTexturePrivate +class SceneOpenGLTexturePrivate : public GLTexturePrivate { public: - virtual ~SceneOpenGLTexturePrivate(); + ~SceneOpenGLTexturePrivate() override; virtual bool loadTexture(WindowPixmap *pixmap) = 0; virtual void updateTexture(WindowPixmap *pixmap); @@ -72,5 +68,3 @@ private: }; } - -#endif