[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
This commit is contained in:
parent
73fa7df1fc
commit
486c2f4534
1 changed files with 10 additions and 16 deletions
|
@ -18,8 +18,7 @@ GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*********************************************************************/
|
*********************************************************************/
|
||||||
#ifndef KWIN_SCENE_OPENGL_TEXTURE_H
|
#pragma once
|
||||||
#define KWIN_SCENE_OPENGL_TEXTURE_H
|
|
||||||
|
|
||||||
#include <kwingltexture.h>
|
#include <kwingltexture.h>
|
||||||
#include <kwingltexture_p.h>
|
#include <kwingltexture_p.h>
|
||||||
|
@ -28,37 +27,34 @@ namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class OpenGLBackend;
|
class OpenGLBackend;
|
||||||
class WindowPixmap;
|
|
||||||
class SceneOpenGLTexturePrivate;
|
class SceneOpenGLTexturePrivate;
|
||||||
|
class WindowPixmap;
|
||||||
|
|
||||||
class SceneOpenGLTexture
|
class SceneOpenGLTexture : public GLTexture
|
||||||
: public GLTexture
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
SceneOpenGLTexture(OpenGLBackend *backend);
|
explicit SceneOpenGLTexture(OpenGLBackend *backend);
|
||||||
virtual ~SceneOpenGLTexture();
|
~SceneOpenGLTexture() override;
|
||||||
|
|
||||||
SceneOpenGLTexture & operator = (const SceneOpenGLTexture& tex);
|
SceneOpenGLTexture & operator = (const SceneOpenGLTexture& tex);
|
||||||
|
|
||||||
void discard() override final;
|
void discard() override final;
|
||||||
|
|
||||||
protected:
|
private:
|
||||||
|
SceneOpenGLTexture(SceneOpenGLTexturePrivate& dd);
|
||||||
|
|
||||||
bool load(WindowPixmap *pixmap);
|
bool load(WindowPixmap *pixmap);
|
||||||
void updateFromPixmap(WindowPixmap *pixmap);
|
void updateFromPixmap(WindowPixmap *pixmap);
|
||||||
|
|
||||||
SceneOpenGLTexture(SceneOpenGLTexturePrivate& dd);
|
|
||||||
|
|
||||||
private:
|
|
||||||
Q_DECLARE_PRIVATE(SceneOpenGLTexture)
|
Q_DECLARE_PRIVATE(SceneOpenGLTexture)
|
||||||
|
|
||||||
friend class OpenGLWindowPixmap;
|
friend class OpenGLWindowPixmap;
|
||||||
};
|
};
|
||||||
|
|
||||||
class SceneOpenGLTexturePrivate
|
class SceneOpenGLTexturePrivate : public GLTexturePrivate
|
||||||
: public GLTexturePrivate
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual ~SceneOpenGLTexturePrivate();
|
~SceneOpenGLTexturePrivate() override;
|
||||||
|
|
||||||
virtual bool loadTexture(WindowPixmap *pixmap) = 0;
|
virtual bool loadTexture(WindowPixmap *pixmap) = 0;
|
||||||
virtual void updateTexture(WindowPixmap *pixmap);
|
virtual void updateTexture(WindowPixmap *pixmap);
|
||||||
|
@ -72,5 +68,3 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in a new issue