diff --git a/krita/ui/canvas/kis_abstract_canvas_widget.h b/krita/ui/canvas/kis_abstract_canvas_widget.h --- a/krita/ui/canvas/kis_abstract_canvas_widget.h +++ b/krita/ui/canvas/kis_abstract_canvas_widget.h @@ -70,9 +70,6 @@ // 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.h b/krita/ui/canvas/kis_canvas2.h --- a/krita/ui/canvas/kis_canvas2.h +++ b/krita/ui/canvas/kis_canvas2.h @@ -251,7 +251,6 @@ Q_DISABLE_COPY(KisCanvas2) void connectCurrentCanvas(); - void disconnectCurrentCanvas(); void createCanvas(bool useOpenGL); void createQPainterCanvas(); void createOpenGLCanvas(); diff --git a/krita/ui/canvas/kis_canvas2.cpp b/krita/ui/canvas/kis_canvas2.cpp --- a/krita/ui/canvas/kis_canvas2.cpp +++ b/krita/ui/canvas/kis_canvas2.cpp @@ -484,11 +484,6 @@ 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 @@ m_d->openGLFilterMode != cfg.openGLFilteringMode()); if (needReset) { - disconnectCurrentCanvas(); createCanvas(useOpenGL); connectCurrentCanvas(); notifyZoomChanged(); diff --git a/krita/ui/canvas/kis_qpainter_canvas.h b/krita/ui/canvas/kis_qpainter_canvas.h --- a/krita/ui/canvas/kis_qpainter_canvas.h +++ b/krita/ui/canvas/kis_qpainter_canvas.h @@ -65,7 +65,6 @@ 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/canvas/kis_qpainter_canvas.cpp b/krita/ui/canvas/kis_qpainter_canvas.cpp --- a/krita/ui/canvas/kis_qpainter_canvas.cpp +++ b/krita/ui/canvas/kis_qpainter_canvas.cpp @@ -202,9 +202,6 @@ return; } -void KisQPainterCanvas::disconnectCurrentCanvas() -{ } - void KisQPainterCanvas::finishResizingImage(qint32 w, qint32 h) { m_d->prescaledProjection->slotImageSizeChanged(w, h); diff --git a/krita/ui/opengl/kis_opengl_canvas2.h b/krita/ui/opengl/kis_opengl_canvas2.h --- a/krita/ui/opengl/kis_opengl_canvas2.h +++ b/krita/ui/opengl/kis_opengl_canvas2.h @@ -80,7 +80,6 @@ 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 --- a/krita/ui/opengl/kis_opengl_canvas2.cpp +++ b/krita/ui/opengl/kis_opengl_canvas2.cpp @@ -202,14 +202,6 @@ } } -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_image_textures.h b/krita/ui/opengl/kis_opengl_image_textures.h --- 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 #include #include @@ -42,10 +41,8 @@ /** * 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 @@ KisOpenGLUpdateInfoSP updateCache(const QRect& rect); KisOpenGLUpdateInfoSP updateCacheNoConversion(const QRect& rect); -public Q_SLOTS: - void recalculateCache(KisUpdateInfoSP info); void slotImageSizeChanged(qint32 w, qint32 h);