Some minor cleaning up.

opencor · Sep 3, 2020 · 59d529b · 59d529b
1 parent a6fcd4f
commit 59d529b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingvieweditingwidget.cpp b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingvieweditingwidget.cpp
@@ -67,13 +67,11 @@ CellMLZincMappingViewEditingModel::CellMLZincMappingViewEditingModel(QObject *pP
 
 //==============================================================================
 
-const char *CellMLZincMappingViewEditingModel::MappingViewEdittingMimeType = "opencor/mapping-view-editting";
-
-//==============================================================================
-
 QStringList CellMLZincMappingViewEditingModel::mimeTypes() const
 {
-    return {MappingViewEdittingMimeType};
+    // Return the MIME type supported by our model
+
+    return { CellMLZincMappingViewEditingMimeType };
 }
 
 //==============================================================================
@@ -87,7 +85,7 @@ QMimeData * CellMLZincMappingViewEditingModel::mimeData(const QModelIndexList &p
         names.append(itemFromIndex(index)->text()+"|"+itemFromIndex(index)->accessibleDescription());
     }
 
-    res->setData(MappingViewEdittingMimeType,names.toUtf8());
+    res->setData(CellMLZincMappingViewEditingMimeType, names.toUtf8());
 
     return res;
 }

diff --git a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingvieweditingwidget.h b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingvieweditingwidget.h
@@ -62,25 +62,31 @@ namespace Core {
 //==============================================================================
 
 namespace CellMLZincMappingView {
-    class CellMLZincMappingViewWidget;
 
 //==============================================================================
 
+static const auto CellMLZincMappingViewEditingMimeType = QStringLiteral("opencor/mapping-view-editing");
+
+//==============================================================================
 
 class CellMLZincMappingViewEditingModel : public QStandardItemModel
 {
     Q_OBJECT
 
 public:
-    static const char *MappingViewEdittingMimeType;
-
     explicit CellMLZincMappingViewEditingModel(QObject *pParent = nullptr);
 
     QStringList mimeTypes() const override;
     QMimeData * mimeData(const QModelIndexList &pIndexes) const override;
 
 };
 
+//==============================================================================
+
+class CellMLZincMappingViewWidget;
+
+//==============================================================================
+
 class CellMLZincMappingViewEditingWidget : public Core::Widget
 {
     Q_OBJECT

diff --git a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.cpp b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.cpp
@@ -206,7 +206,7 @@ void CellMLZincMappingViewZincWidget::wheelEvent(QWheelEvent *pEvent)
 
 void CellMLZincMappingViewZincWidget::dragEnterEvent(QDragEnterEvent *pEvent)
 {
-    if (pEvent->mimeData()->hasFormat(CellMLZincMappingViewEditingModel::MappingViewEdittingMimeType)) {
+    if (pEvent->mimeData()->hasFormat(CellMLZincMappingViewEditingMimeType)) {
         pEvent->acceptProposedAction();
     } else {
         pEvent->ignore();
@@ -230,7 +230,7 @@ void CellMLZincMappingViewZincWidget::dragMoveEvent(QDragMoveEvent *pEvent)
 
 void CellMLZincMappingViewZincWidget::dropEvent(QDropEvent *pEvent)
 {
-    QString data = pEvent->mimeData()->data(CellMLZincMappingViewEditingModel::MappingViewEdittingMimeType);
+    QString data = pEvent->mimeData()->data(CellMLZincMappingViewEditingMimeType);
     const QStringList splitText = data.split("|");
 
     pEvent->acceptProposedAction();