Remove obsolete mutexes

Author: adazem009

src/irenderedtarget.h

@@ -69,9 +69,6 @@ class IRenderedTarget : public QNanoQuickItem
 
         virtual QPointF mapFromScene(const QPointF &point) const = 0;
 
-        virtual void lockCostume() = 0;
-        virtual void unlockCostume() = 0;
-
         virtual bool mirrorHorizontally() const = 0;
 
         virtual Texture texture() const = 0;

src/renderedtarget.cpp

@@ -98,7 +98,6 @@ void RenderedTarget::updateCostume(Costume *costume)
     if (!costume || costume == m_costume)
         return;
 
-    m_costumeMutex.lock();
     m_costume = costume;
 
     if (m_costumesLoaded) {
@@ -110,8 +109,6 @@ void RenderedTarget::updateCostume(Costume *costume)
             m_skin = it->second;
     }
 
-    m_costumeMutex.unlock();
-
     calculateSize();
     calculatePos();
 }
@@ -530,16 +527,6 @@ void RenderedTarget::handleSceneMouseMove(qreal x, qreal y)
     }
 }
 
-void RenderedTarget::lockCostume()
-{
-    m_costumeMutex.lock();
-}
-
-void RenderedTarget::unlockCostume()
-{
-    m_costumeMutex.unlock();
-}
-
 bool RenderedTarget::mirrorHorizontally() const
 {
     return m_mirrorHorizontally;

src/renderedtarget.h

@@ -76,9 +76,6 @@ class RenderedTarget : public IRenderedTarget
 
         QPointF mapFromScene(const QPointF &point) const override;
 
-        void lockCostume() override;
-        void unlockCostume() override;
-
         bool mirrorHorizontally() const override;
 
         Texture texture() const override;
@@ -118,8 +115,6 @@ class RenderedTarget : public IRenderedTarget
         Skin *m_skin = nullptr;
         Texture m_texture;
         Texture m_oldTexture;
-        QMutex m_costumeMutex;
-        QMutex mutex;
         double m_size = 1;
         double m_x = 0;
         double m_y = 0;

src/targetpainter.cpp

@@ -27,8 +27,6 @@ void TargetPainter::paint(QNanoPainter *painter)
                "application object.");
     }
 
-    m_target->lockCostume();
-
     QOpenGLContext *context = QOpenGLContext::currentContext();
     Q_ASSERT(context);
 
@@ -46,10 +44,8 @@ void TargetPainter::paint(QNanoPainter *painter)
 
     Texture texture = m_target->texture();
 
-    if (!texture.isValid()) {
-        m_target->unlockCostume();
+    if (!texture.isValid())
         return;
-    }
 
     // Create a FBO for the current texture
     unsigned int fbo;
@@ -58,7 +54,6 @@ void TargetPainter::paint(QNanoPainter *painter)
     glF.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture.handle(), 0);
 
     if (glF.glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
-        m_target->unlockCostume();
         qWarning() << "error: framebuffer incomplete (" + m_target->scratchTarget()->name() + ")";
         glF.glDeleteFramebuffers(1, &fbo);
         return;
@@ -73,7 +68,6 @@ void TargetPainter::paint(QNanoPainter *painter)
     glF.glDeleteFramebuffers(1, &fbo);
 
     m_target->updateHullPoints(targetFbo);
-    m_target->unlockCostume();
 }
 
 void TargetPainter::synchronize(QNanoQuickItem *item)

test/mocks/renderedtargetmock.h

@@ -54,9 +54,6 @@ class RenderedTargetMock : public IRenderedTarget
 
         MOCK_METHOD(QPointF, mapFromScene, (const QPointF &), (const, override));
 
-        MOCK_METHOD(void, lockCostume, (), (override));
-        MOCK_METHOD(void, unlockCostume, (), (override));
-
         MOCK_METHOD(bool, mirrorHorizontally, (), (const, override));
 
         MOCK_METHOD(Texture, texture, (), (const, override));

test/targetpainter/targetpainter_test.cpp

@@ -76,10 +76,8 @@ TEST_F(TargetPainterTest, Paint)
 
     // Paint
     Texture texture(refFbo.texture(), refFbo.size());
-    EXPECT_CALL(target, lockCostume());
     EXPECT_CALL(target, texture()).WillOnce(Return(texture));
     EXPECT_CALL(target, updateHullPoints(&fbo));
-    EXPECT_CALL(target, unlockCostume());
     targetPainter.paint(&painter);
     painter.endFrame();