From 49c8827345cfe5bf2f90f75b64e8bf12ccc6250f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= Date: Sun, 13 Apr 2014 20:41:51 +0200 Subject: [PATCH] Remove SceneOpenGL::Texture::load(QImage) It's never called. --- scene_opengl.cpp | 7 ------- scene_opengl.h | 1 - 2 files changed, 8 deletions(-) diff --git a/scene_opengl.cpp b/scene_opengl.cpp index a9d1daf66c..0d862350a7 100644 --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -787,13 +787,6 @@ bool SceneOpenGL::Texture::load(xcb_pixmap_t pix, const QSize &size, int depth) return d->loadTexture(pix, size, depth); } -bool SceneOpenGL::Texture::load(const QImage& image, GLenum target) -{ - if (image.isNull()) - return false; - return load(QPixmap::fromImage(image), target); -} - bool SceneOpenGL::Texture::load(const QPixmap& pixmap, GLenum target) { if (pixmap.isNull()) diff --git a/scene_opengl.h b/scene_opengl.h index 5617f5dc6c..8e258ce721 100644 --- a/scene_opengl.h +++ b/scene_opengl.h @@ -166,7 +166,6 @@ public: Texture & operator = (const Texture& tex); using GLTexture::load; - virtual bool load(const QImage& image, GLenum target = GL_TEXTURE_2D); virtual bool load(const QPixmap& pixmap, GLenum target = GL_TEXTURE_2D); virtual void discard(); bool update(const QRegion &damage);