[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita] krita/ui: Complete de"qobject"ing KisOpenGLImageTextures
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-12-16 13:59:37
Message-ID: E1a9CcD-00015g-Bp () scm ! kde ! org
[Download RAW message or body]

Git commit c526e2648ddce86fd73226e9aba8bbf04d5f4078 by Friedrich W. H. Kossebau.
Committed on 16/12/2015 at 13:59.
Pushed by kossebau into branch 'master'.

Complete de"qobject"ing KisOpenGLImageTextures

Summary:
KisOpenGLImageTextures has no signals, so the only purpose of
disconnectCurrentCanvas() is a noop.
And it's two slots are nowhere used as slots, but only called directly.

Kept the names of the former slots for consistency with KisPrescaledProjection
as used in QPainter canvas

Reviewers: rempt, dkazakov

Reviewed By: rempt, dkazakov

Differential Revision: https://phabricator.kde.org/D661

M  +0    -3    krita/ui/canvas/kis_abstract_canvas_widget.h
M  +0    -6    krita/ui/canvas/kis_canvas2.cpp
M  +0    -1    krita/ui/canvas/kis_canvas2.h
M  +0    -3    krita/ui/canvas/kis_qpainter_canvas.cpp
M  +0    -1    krita/ui/canvas/kis_qpainter_canvas.h
M  +0    -8    krita/ui/opengl/kis_opengl_canvas2.cpp
M  +0    -1    krita/ui/opengl/kis_opengl_canvas2.h
M  +1    -6    krita/ui/opengl/kis_opengl_image_textures.h

http://commits.kde.org/krita/c526e2648ddce86fd73226e9aba8bbf04d5f4078

diff --git a/krita/ui/canvas/kis_abstract_canvas_widget.h b/krita/ui/canvas/kis_abstract_canvas_widget.h
index 18ab523..de76c69 100644
--- a/krita/ui/canvas/kis_abstract_canvas_widget.h
+++ b/krita/ui/canvas/kis_abstract_canvas_widget.h
@@ -70,9 +70,6 @@ public:
     // Called from KisCanvas2::slotSetDisplayProfile
     virtual void setDisplayProfile(KisDisplayColorConverter *colorConverter) = 0;
 
-    // Called from KisCanvas2::disconnectCurrentCanvas
-    virtual void disconnectCurrentCanvas() = 0;
-
     // Called from KisCanvas2::finishResizingImage
     virtual void finishResizingImage(qint32 w, qint32 h) = 0;
 
diff --git a/krita/ui/canvas/kis_canvas2.cpp b/krita/ui/canvas/kis_canvas2.cpp
index 93d20d4..38f3de6 100644
--- a/krita/ui/canvas/kis_canvas2.cpp
+++ b/krita/ui/canvas/kis_canvas2.cpp
@@ -484,11 +484,6 @@ void KisCanvas2::connectCurrentCanvas()
     setLodAllowedInCanvas(m_d->lodAllowedInCanvas);
 }
 
-void KisCanvas2::disconnectCurrentCanvas()
-{
-    m_d->canvasWidget->disconnectCurrentCanvas();
-}
-
 void KisCanvas2::resetCanvas(bool useOpenGL)
 {
     // we cannot reset the canvas before it's created, but this method might be called,
@@ -503,7 +498,6 @@ void KisCanvas2::resetCanvas(bool useOpenGL)
          m_d->openGLFilterMode != cfg.openGLFilteringMode());
 
     if (needReset) {
-        disconnectCurrentCanvas();
         createCanvas(useOpenGL);
         connectCurrentCanvas();
         notifyZoomChanged();
diff --git a/krita/ui/canvas/kis_canvas2.h b/krita/ui/canvas/kis_canvas2.h
index 0fc675a..5f13699 100644
--- a/krita/ui/canvas/kis_canvas2.h
+++ b/krita/ui/canvas/kis_canvas2.h
@@ -251,7 +251,6 @@ private:
     Q_DISABLE_COPY(KisCanvas2)
 
     void connectCurrentCanvas();
-    void disconnectCurrentCanvas();
     void createCanvas(bool useOpenGL);
     void createQPainterCanvas();
     void createOpenGLCanvas();
diff --git a/krita/ui/canvas/kis_qpainter_canvas.cpp b/krita/ui/canvas/kis_qpainter_canvas.cpp
index a5718a0..2c170dd 100644
--- a/krita/ui/canvas/kis_qpainter_canvas.cpp
+++ b/krita/ui/canvas/kis_qpainter_canvas.cpp
@@ -202,9 +202,6 @@ void KisQPainterCanvas::setWrapAroundViewingMode(bool value)
     return;
 }
 
-void KisQPainterCanvas::disconnectCurrentCanvas()
-{ }
-
 void KisQPainterCanvas::finishResizingImage(qint32 w, qint32 h)
 {
     m_d->prescaledProjection->slotImageSizeChanged(w, h);
diff --git a/krita/ui/canvas/kis_qpainter_canvas.h b/krita/ui/canvas/kis_qpainter_canvas.h
index 5277e64..865de88 100644
--- a/krita/ui/canvas/kis_qpainter_canvas.h
+++ b/krita/ui/canvas/kis_qpainter_canvas.h
@@ -65,7 +65,6 @@ public: // Implement kis_abstract_canvas_widget interface
     void setWrapAroundViewingMode(bool value);
     void channelSelectionChanged(const QBitArray &channelFlags);
     void setDisplayProfile(KisDisplayColorConverter *colorConverter);
-    void disconnectCurrentCanvas();
     void finishResizingImage(qint32 w, qint32 h);
     KisUpdateInfoSP startUpdateCanvasProjection(const QRect & rc, const QBitArray &channelFlags);
     QRect updateCanvasProjection(KisUpdateInfoSP info);
diff --git a/krita/ui/opengl/kis_opengl_canvas2.cpp b/krita/ui/opengl/kis_opengl_canvas2.cpp
index 8068c8e..82476f0 100644
--- a/krita/ui/opengl/kis_opengl_canvas2.cpp
+++ b/krita/ui/opengl/kis_opengl_canvas2.cpp
@@ -202,14 +202,6 @@ void KisOpenGLCanvas2::setDisplayFilterImpl(KisDisplayFilter* displayFilter, boo
     }
 }
 
-void KisOpenGLCanvas2::disconnectCurrentCanvas()
-{
-    Q_ASSERT(d->openGLImageTextures);
-    d->openGLImageTextures->disconnect(canvas());
-    d->openGLImageTextures->disconnect(canvas()->image());
-}
-
-
 void KisOpenGLCanvas2::setWrapAroundViewingMode(bool value)
 {
     d->wrapAroundMode = value;
diff --git a/krita/ui/opengl/kis_opengl_canvas2.h b/krita/ui/opengl/kis_opengl_canvas2.h
index a2c32ae..d5078dc 100644
--- a/krita/ui/opengl/kis_opengl_canvas2.h
+++ b/krita/ui/opengl/kis_opengl_canvas2.h
@@ -80,7 +80,6 @@ public: // Implement kis_abstract_canvas_widget interface
     void setWrapAroundViewingMode(bool value);
     void channelSelectionChanged(const QBitArray &channelFlags);
     void setDisplayProfile(KisDisplayColorConverter *colorConverter);
-    void disconnectCurrentCanvas();
     void finishResizingImage(qint32 w, qint32 h);
     KisUpdateInfoSP startUpdateCanvasProjection(const QRect & rc, const QBitArray &channelFlags);
     QRect updateCanvasProjection(KisUpdateInfoSP info);
diff --git a/krita/ui/opengl/kis_opengl_image_textures.h b/krita/ui/opengl/kis_opengl_image_textures.h
index 95c4d02..8f01897 100644
--- a/krita/ui/opengl/kis_opengl_image_textures.h
+++ b/krita/ui/opengl/kis_opengl_image_textures.h
@@ -22,7 +22,6 @@
 
 #ifdef HAVE_OPENGL
 
-#include <QObject>
 #include <QVector>
 #include <QMap>
 
@@ -42,10 +41,8 @@ class KoColorProfile;
 /**
  * A set of OpenGL textures that contains the projection of a KisImage.
  */
-class KRITAUI_EXPORT KisOpenGLImageTextures : public QObject, public KisShared
+class KRITAUI_EXPORT KisOpenGLImageTextures : public KisShared
 {
-    Q_OBJECT
-
 public:
     /**
      * Obtain a KisOpenGLImageTextures object for the given image.
@@ -139,8 +136,6 @@ public:
     KisOpenGLUpdateInfoSP updateCache(const QRect& rect);
     KisOpenGLUpdateInfoSP updateCacheNoConversion(const QRect& rect);
 
-public Q_SLOTS:
-
     void recalculateCache(KisUpdateInfoSP info);
 
     void slotImageSizeChanged(qint32 w, qint32 h);
[prev in list] [next in list] [prev in thread] [next in thread]