diff --git a/platformsupport/scenes/opengl/texture.h b/platformsupport/scenes/opengl/texture.h index d574b0cb5..5024f733a 100644 --- a/platformsupport/scenes/opengl/texture.h +++ b/platformsupport/scenes/opengl/texture.h @@ -1,76 +1,70 @@ /******************************************************************** KWin - the KDE window manager This file is part of the KDE project. Copyright (C) 2006 Lubos Lunak Copyright (C) 2009, 2010, 2011 Martin Gräßlin This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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 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); virtual OpenGLBackend *backend() = 0; protected: SceneOpenGLTexturePrivate(); private: Q_DISABLE_COPY(SceneOpenGLTexturePrivate) }; } - -#endif