From 6079d69c93d98a668754968d24c0279c6fd7a377 Mon Sep 17 00:00:00 2001 From: Ronan Le Tiec Date: Sat, 23 May 2020 15:38:59 +0200 Subject: [PATCH] Refactoring VPuzzleMimeDataPiece --- src/app/puzzle/puzzle.pri | 4 ++-- src/app/puzzle/vpcarrouselpiece.cpp | 4 ++-- src/app/puzzle/vpmaingraphicsview.cpp | 4 ++-- ...zzlemimedatapiece.cpp => vpmimedatapiece.cpp} | 12 ++++++------ ...{vpuzzlemimedatapiece.h => vpmimedatapiece.h} | 16 ++++++++-------- 5 files changed, 20 insertions(+), 20 deletions(-) rename src/app/puzzle/{vpuzzlemimedatapiece.cpp => vpmimedatapiece.cpp} (85%) rename src/app/puzzle/{vpuzzlemimedatapiece.h => vpmimedatapiece.h} (85%) diff --git a/src/app/puzzle/puzzle.pri b/src/app/puzzle/puzzle.pri index 8e111294e..5fe7c72a1 100644 --- a/src/app/puzzle/puzzle.pri +++ b/src/app/puzzle/puzzle.pri @@ -16,8 +16,8 @@ SOURCES += \ $$PWD/vplayout.cpp \ $$PWD/vpmaingraphicsview.cpp \ $$PWD/vpmainwindow.cpp \ + $$PWD/vpmimedatapiece.cpp \ $$PWD/vppiecelist.cpp \ - $$PWD/vpuzzlemimedatapiece.cpp \ $$PWD/vpuzzlepiece.cpp \ $$PWD/vpuzzlesettings.cpp \ $$PWD/xml/vplayoutfilereader.cpp \ @@ -40,9 +40,9 @@ HEADERS += \ $$PWD/vplayout.h \ $$PWD/vpmaingraphicsview.h \ $$PWD/vpmainwindow.h \ + $$PWD/vpmimedatapiece.h \ $$PWD/vppiecelist.h \ $$PWD/vpstable.h \ - $$PWD/vpuzzlemimedatapiece.h \ $$PWD/vpuzzlepiece.h \ $$PWD/vpuzzlesettings.h \ $$PWD/xml/vplayoutfilereader.h \ diff --git a/src/app/puzzle/vpcarrouselpiece.cpp b/src/app/puzzle/vpcarrouselpiece.cpp index 3eec52e79..83ee455e6 100644 --- a/src/app/puzzle/vpcarrouselpiece.cpp +++ b/src/app/puzzle/vpcarrouselpiece.cpp @@ -37,7 +37,7 @@ #include #include -#include "vpuzzlemimedatapiece.h" +#include "vpmimedatapiece.h" #include "vpcarrouselpiecelist.h" #include "vpcarrousel.h" @@ -212,7 +212,7 @@ void VPCarrouselPiece::mouseMoveEvent(QMouseEvent *event) // starts the dragging QDrag *drag = new QDrag(this); - VPuzzleMimeDataPiece *mimeData = new VPuzzleMimeDataPiece(); + VPMimeDataPiece *mimeData = new VPMimeDataPiece(); mimeData->SetPiecePtr(m_piece); mimeData->setObjectName("piecePointer"); diff --git a/src/app/puzzle/vpmaingraphicsview.cpp b/src/app/puzzle/vpmaingraphicsview.cpp index 97d39ac57..2100a1e27 100644 --- a/src/app/puzzle/vpmaingraphicsview.cpp +++ b/src/app/puzzle/vpmaingraphicsview.cpp @@ -32,7 +32,7 @@ #include #include -#include "vpuzzlemimedatapiece.h" +#include "vpmimedatapiece.h" #include "vppiecelist.h" #include "../vwidgets/vmaingraphicsscene.h" @@ -111,7 +111,7 @@ void VPMainGraphicsView::dropEvent(QDropEvent *event) if(mime->objectName() == "piecePointer") { - const VPuzzleMimeDataPiece *mimePiece = qobject_cast (mime); + const VPMimeDataPiece *mimePiece = qobject_cast (mime); VPuzzlePiece *piece = mimePiece->GetPiecePtr(); if(piece != nullptr) diff --git a/src/app/puzzle/vpuzzlemimedatapiece.cpp b/src/app/puzzle/vpmimedatapiece.cpp similarity index 85% rename from src/app/puzzle/vpuzzlemimedatapiece.cpp rename to src/app/puzzle/vpmimedatapiece.cpp index 873d500c8..5f7cb6c4b 100644 --- a/src/app/puzzle/vpuzzlemimedatapiece.cpp +++ b/src/app/puzzle/vpmimedatapiece.cpp @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vpuzzlemimedatapiece.cpp + ** @file vpmimedatapiece.cpp ** @author Ronan Le Tiec ** @date 4 5, 2020 ** @@ -26,28 +26,28 @@ ** *************************************************************************/ -#include "vpuzzlemimedatapiece.h" +#include "vpmimedatapiece.h" //--------------------------------------------------------------------------------------------------------------------- -VPuzzleMimeDataPiece::VPuzzleMimeDataPiece() +VPMimeDataPiece::VPMimeDataPiece() { } //--------------------------------------------------------------------------------------------------------------------- -VPuzzleMimeDataPiece::~VPuzzleMimeDataPiece() +VPMimeDataPiece::~VPMimeDataPiece() { } //--------------------------------------------------------------------------------------------------------------------- -VPuzzlePiece* VPuzzleMimeDataPiece::GetPiecePtr() const +VPuzzlePiece* VPMimeDataPiece::GetPiecePtr() const { return m_piece; } //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleMimeDataPiece::SetPiecePtr(VPuzzlePiece* piece) +void VPMimeDataPiece::SetPiecePtr(VPuzzlePiece* piece) { m_piece = piece; } diff --git a/src/app/puzzle/vpuzzlemimedatapiece.h b/src/app/puzzle/vpmimedatapiece.h similarity index 85% rename from src/app/puzzle/vpuzzlemimedatapiece.h rename to src/app/puzzle/vpmimedatapiece.h index 8246c604b..f1bba271e 100644 --- a/src/app/puzzle/vpuzzlemimedatapiece.h +++ b/src/app/puzzle/vpmimedatapiece.h @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vpuzzlemimedatapiece.h + ** @file vpmimedatapiece.h ** @author Ronan Le Tiec ** @date 4 5, 2020 ** @@ -26,21 +26,21 @@ ** *************************************************************************/ -#ifndef VPUZZLEMIMEDATAPIECE_H -#define VPUZZLEMIMEDATAPIECE_H +#ifndef VPMIMEDATAPIECE_H +#define VPMIMEDATAPIECE_H #include #include "vpuzzlepiece.h" -class VPuzzleMimeDataPiece : public QMimeData +class VPMimeDataPiece : public QMimeData { Q_OBJECT public: - VPuzzleMimeDataPiece(); - ~VPuzzleMimeDataPiece(); + VPMimeDataPiece(); + ~VPMimeDataPiece(); /** * @brief GetPiecePtr Returns the piece pointer of the mime data @@ -55,11 +55,11 @@ public: void SetPiecePtr(VPuzzlePiece* piece); private: - Q_DISABLE_COPY(VPuzzleMimeDataPiece) + Q_DISABLE_COPY(VPMimeDataPiece) VPuzzlePiece *m_piece{nullptr}; }; -#endif // VPUZZLEMIMEDATAPIECE_H +#endif // VPMIMEDATAPIECE_H