From fa52af4765f0c94b22721aefb5a910e990ce9156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= <fredrik@kde.org>
Date: Wed, 26 Nov 2014 21:29:39 +0100
Subject: [PATCH] Remove SceneOpenGL::createTexture(QPixmap)

...and associated code.

It is no longer used.
---
 scene_opengl.cpp | 11 -----------
 scene_opengl.h   |  3 ---
 2 files changed, 14 deletions(-)

diff --git a/scene_opengl.cpp b/scene_opengl.cpp
index 18b141436d..a294e2cd74 100644
--- a/scene_opengl.cpp
+++ b/scene_opengl.cpp
@@ -756,11 +756,6 @@ SceneOpenGL::Texture *SceneOpenGL::createTexture()
     return new Texture(m_backend);
 }
 
-SceneOpenGL::Texture *SceneOpenGL::createTexture(const QPixmap &pix, GLenum target)
-{
-    return new Texture(m_backend, pix, target);
-}
-
 bool SceneOpenGL::viewportLimitsMatched(const QSize &size) const {
     GLint limit[2];
     glGetIntegerv(GL_MAX_VIEWPORT_DIMS, limit);
@@ -1050,12 +1045,6 @@ SceneOpenGL::Texture::Texture(OpenGLBackend *backend)
 {
 }
 
-SceneOpenGL::Texture::Texture(OpenGLBackend *backend, const QPixmap &pix, GLenum target)
-    : GLTexture(*backend->createBackendTexture(this))
-{
-    GLTexture::load(pix.toImage(), target);
-}
-
 SceneOpenGL::Texture::~Texture()
 {
 }
diff --git a/scene_opengl.h b/scene_opengl.h
index 2c7b107bdf..28faf97d0c 100644
--- a/scene_opengl.h
+++ b/scene_opengl.h
@@ -74,7 +74,6 @@ public:
      * @return :SceneOpenGL::Texture*
      **/
     Texture *createTexture();
-    Texture *createTexture(const QPixmap& pix, GLenum target = GL_TEXTURE_2D);
 
 #ifndef KWIN_HAVE_OPENGLES
     /**
@@ -165,12 +164,10 @@ class SceneOpenGL::Texture
 {
 public:
     Texture(OpenGLBackend *backend);
-    Texture(OpenGLBackend *backend, const QPixmap& pix, GLenum target = GL_TEXTURE_2D);
     virtual ~Texture();
 
     Texture & operator = (const Texture& tex);
 
-    using GLTexture::load;
     virtual void discard();
 
 protected: