Do not use using namespace mv in headers (#1245)

* Remove using mv from private headers

* Data hierarchy

* data properties

* logging plugin

* shared parameters

* tasks plugin

* text data

* point data

* color data

* cluster data

* Images

* point data: add namespace qualifier to friend

Author: alxvth

ManiVault/src/plugins/ClusterData/src/ClusterData.cpp

@@ -21,6 +21,7 @@
 
 Q_PLUGIN_METADATA(IID "studio.manivault.ClusterData")
 
+using namespace mv;
 using namespace mv::util;
 
 ClusterData::ClusterData(const mv::plugin::PluginFactory* factory) :

ManiVault/src/plugins/ClusterData/src/ClusterData.h

@@ -19,8 +19,6 @@
 
 #include <vector>
 
-using namespace mv;
-
 const mv::DataType ClusterType = mv::DataType(QString("Clusters"));
 
 class InfoAction;
@@ -38,7 +36,7 @@ class CLUSTERDATA_EXPORT ClusterData : public mv::plugin::RawData
      * @param guid Globally unique dataset identifier (use only for deserialization)
      * @return Smart pointer to dataset
      */
-    Dataset<DatasetImpl> createDataSet(const QString& guid = "") const override;
+    mv::Dataset<mv::DatasetImpl> createDataSet(const QString& guid = "") const override;
 
     /**
      * Get clusters
@@ -117,11 +115,11 @@ class CLUSTERDATA_EXPORT ClusterData : public mv::plugin::RawData
 // Cluster Set
 // =============================================================================
 
-class CLUSTERDATA_EXPORT Clusters : public DatasetImpl
+class CLUSTERDATA_EXPORT Clusters : public mv::DatasetImpl
 {
 public:
     Clusters(QString dataName, bool mayUnderive = false, const QString& guid = "") :
-        DatasetImpl(dataName, mayUnderive, guid)
+        mv::DatasetImpl(dataName, mayUnderive, guid)
     {
     }
 
@@ -184,14 +182,14 @@ class CLUSTERDATA_EXPORT Clusters : public DatasetImpl
      * Get a copy of the dataset
      * @return Smart pointer to copy of the dataset
      */
-    Dataset<DatasetImpl> copy() const override
+    mv::Dataset<DatasetImpl> copy() const override
     {
         auto clusters = new Clusters(getRawDataName());
 
         clusters->setText(text());
         clusters->indices = indices;
 
-        return Dataset<DatasetImpl>(clusters);
+        return mv::Dataset<DatasetImpl>(clusters);
     }
 
     /**
@@ -201,7 +199,7 @@ class CLUSTERDATA_EXPORT Clusters : public DatasetImpl
      * @param visible Whether the subset will be visible in the UI
      * @return Smart pointer to the created subset
      */
-    Dataset<DatasetImpl> createSubsetFromSelection(const QString& guiName, const Dataset<DatasetImpl>& parentDataSet = Dataset<DatasetImpl>(), const bool& visible = true) const  override
+    mv::Dataset<DatasetImpl> createSubsetFromSelection(const QString& guiName, const mv::Dataset<DatasetImpl>& parentDataSet = mv::Dataset<DatasetImpl>(), const bool& visible = true) const  override
     {
         return mv::data().createSubsetFromSelection(getSelection(), toSmartPointer(), guiName, parentDataSet, visible);
     }
@@ -273,7 +271,7 @@ class CLUSTERDATA_EXPORT Clusters : public DatasetImpl
 
     std::vector<unsigned int>       indices;
     QSharedPointer<InfoAction>      _infoAction;        /** Shared pointer to info action */
-    EventListener                   _eventListener;     /** Listen to HDPS events */
+    mv::EventListener               _eventListener;     /** Listen to ManiVault events */
 };
 
 // =============================================================================

ManiVault/src/plugins/ClusterData/src/ClustersAction.cpp

@@ -11,6 +11,8 @@
 #include <QHeaderView>
 #include <QVBoxLayout>
 
+using namespace mv;
+
 ClustersAction::ClustersAction(QObject* parent, Dataset<Clusters> clustersDataset /*= Dataset<Clusters>()*/) :
     WidgetAction(parent, "Clusters"),
     _clustersDataset(),

ManiVault/src/plugins/ClusterData/src/ClustersAction.h

@@ -17,17 +17,14 @@
 
 #include <QItemSelectionModel>
 
-using namespace mv::gui;
-using namespace mv::util;
-
 /**
  * Clusters action class
  *
  * Action class for display of and interaction with clusters
  *
  * @author Thomas Kroes
  */
-class CLUSTERDATA_EXPORT ClustersAction : public WidgetAction
+class CLUSTERDATA_EXPORT ClustersAction : public mv::gui::WidgetAction
 {
     Q_OBJECT
 
@@ -65,7 +62,7 @@ class CLUSTERDATA_EXPORT ClustersAction : public WidgetAction
      * @param parent Pointer to parent object
      * @param clustersDataset Smart pointer to clusters
      */
-    ClustersAction(QObject* parent, Dataset<Clusters> clustersDataset = Dataset<Clusters>());
+    ClustersAction(QObject* parent, mv::Dataset<Clusters> clustersDataset = mv::Dataset<Clusters>());
 
     /**
      * Get clusters
@@ -77,13 +74,13 @@ class CLUSTERDATA_EXPORT ClustersAction : public WidgetAction
      * Get clusters dataset
      * @return Smart pointer to clusters dataset
      */
-    Dataset<Clusters>& getClustersDataset();
+    mv::Dataset<Clusters>& getClustersDataset();
 
     /**
      * Set clusters dataset
      * @param clustersDataset Smart pointer to clusters dataset
      */
-    void setClustersDataset(Dataset<Clusters> clustersDataset);
+    void setClustersDataset(mv::Dataset<Clusters> clustersDataset);
 
     /**
      * Create subset from selected clusters
@@ -125,7 +122,7 @@ class CLUSTERDATA_EXPORT ClustersAction : public WidgetAction
     void refreshClusters();
 
 protected:
-    Dataset<Clusters>           _clustersDataset;           /** Smart pointer to the clusters dataset */
+    mv::Dataset<Clusters>       _clustersDataset;           /** Smart pointer to the clusters dataset */
     ClustersModel               _clustersModel;             /** Clusters model */
     ColorizeClustersAction      _colorizeClustersAction;    /** Colorize clusters action */
     PrefixClustersAction        _prefixClustersAction;      /** Prefix clusters action */

ManiVault/src/plugins/ClusterData/src/ClustersActionWidget.cpp

@@ -11,6 +11,8 @@
 #include <QHeaderView>
 #include <QVBoxLayout>
 
+using namespace mv;
+
 ClustersActionWidget::ClustersActionWidget(QWidget* parent, ClustersAction* clustersAction, const std::int32_t& widgetFlags) :
     WidgetActionWidget(parent, clustersAction),
     _filterModel(),
@@ -104,11 +106,11 @@ ClustersActionWidget::ClustersActionWidget(QWidget* parent, ClustersAction* clus
 
         // Add remove cluster(s) widget
         if (widgetFlags & ClustersAction::Remove)
-            toolbarLayout->addWidget(_removeClustersAction.createWidget(this, TriggerAction::Icon));
+            toolbarLayout->addWidget(_removeClustersAction.createWidget(this, gui::TriggerAction::Icon));
 
         // Add merge clusters widget
         if (widgetFlags & ClustersAction::Merge)
-            toolbarLayout->addWidget(_mergeClustersAction.createWidget(this, TriggerAction::Icon));
+            toolbarLayout->addWidget(_mergeClustersAction.createWidget(this, gui::TriggerAction::Icon));
 
         // Add colorize widget if required
         if (widgetFlags & ClustersAction::Colorize)
@@ -124,7 +126,7 @@ ClustersActionWidget::ClustersActionWidget(QWidget* parent, ClustersAction* clus
 
         // Add refresh widget if required
         if (widgetFlags & ClustersAction::Refresh)
-            toolbarLayout->addWidget(_refreshClustersAction.createWidget(this, TriggerAction::Icon));
+            toolbarLayout->addWidget(_refreshClustersAction.createWidget(this, gui::TriggerAction::Icon));
 
         toolbarLayout->addStretch(1);
 

ManiVault/src/plugins/ClusterData/src/ClustersActionWidget.h

@@ -20,9 +20,6 @@
 #include <QItemSelectionModel>
 #include <QTreeView>
 
-using namespace mv::gui;
-using namespace mv::util;
-
 class ClustersAction;
 
 /**
@@ -32,7 +29,7 @@ class ClustersAction;
  *
  * @author Thomas Kroes
  */
-class ClustersActionWidget : public WidgetActionWidget {
+class ClustersActionWidget : public mv::gui::WidgetActionWidget {
 public:
 
     /**

ManiVault/src/plugins/ClusterData/src/ColorizeClustersAction.cpp

@@ -8,6 +8,8 @@
 #include "ClusterData.h"
 #include "ClustersActionWidget.h"
 
+using namespace mv::gui;
+
 ColorizeClustersAction::ColorizeClustersAction(ClustersAction& clustersAction) :
     TriggerAction(&clustersAction, "Colorize"),
     _clustersAction(clustersAction),

ManiVault/src/plugins/ClusterData/src/ColorizeClustersAction.h

@@ -10,9 +10,6 @@
 #include <actions/IntegralAction.h>
 #include <actions/TriggerAction.h>
 
-using namespace mv;
-using namespace mv::gui;
-
 class ClustersAction;
 
 /**
@@ -22,12 +19,12 @@ class ClustersAction;
  *
  * @author Thomas Kroes
  */
-class ColorizeClustersAction : public TriggerAction
+class ColorizeClustersAction : public mv::gui::TriggerAction
 {
 protected:
 
     /** Widget class for colorize clusters action */
-    class Widget : public WidgetActionWidget {
+    class Widget : public mv::gui::WidgetActionWidget {
     public:
 
         /**
@@ -58,19 +55,19 @@ class ColorizeClustersAction : public TriggerAction
 
 public: // Action getters
 
-    OptionAction& getColorByAction() { return _colorByAction; }
-    ColorMapAction& getColorMapAction() { return _colorMapAction; }
-    IntegralAction& getRandomSeedAction() { return _randomSeedAction; }
-    TriggerAction& getColorizeAction() { return _colorizeAction; }
+    mv::gui::OptionAction& getColorByAction() { return _colorByAction; }
+    mv::gui::ColorMapAction& getColorMapAction() { return _colorMapAction; }
+    mv::gui::IntegralAction& getRandomSeedAction() { return _randomSeedAction; }
+    mv::gui::TriggerAction& getColorizeAction() { return _colorizeAction; }
 
 public slots:
     /** When the color model or cluster number changes, update the cluster colors */
     void updateColorsInModel();
 
 protected:
-    ClustersAction&     _clustersAction;        /** Reference to clusters action */
-    OptionAction        _colorByAction;         /** Color by action */
-    ColorMap1DAction    _colorMapAction;        /** Color map action */
-    IntegralAction      _randomSeedAction;      /** Random seed action for random color generation */
-    TriggerAction       _colorizeAction;        /** Colorize action */
+    ClustersAction&             _clustersAction;        /** Reference to clusters action */
+    mv::gui::OptionAction       _colorByAction;         /** Color by action */
+    mv::gui::ColorMap1DAction   _colorMapAction;        /** Color map action */
+    mv::gui::IntegralAction     _randomSeedAction;      /** Random seed action for random color generation */
+    mv::gui::TriggerAction      _colorizeAction;        /** Colorize action */
 };

ManiVault/src/plugins/ClusterData/src/FilterClustersAction.cpp

@@ -29,7 +29,7 @@ FilterClustersAction::FilterClustersAction(ClustersActionWidget* clustersActionW
     };
 
     // Update the filter model filter when the name filter action string changes
-    connect(&_nameFilterAction, &StringAction::stringChanged, this, updateNameFilter);
+    connect(&_nameFilterAction, &mv::gui::StringAction::stringChanged, this, updateNameFilter);
 
     // Do an initial update of the model name filter
     updateNameFilter();

ManiVault/src/plugins/ClusterData/src/FilterClustersAction.h

@@ -7,9 +7,6 @@
 #include <actions/WidgetAction.h>
 #include <actions/StringAction.h>
 
-using namespace mv;
-using namespace mv::gui;
-
 class ClustersActionWidget;
 
 /**
@@ -19,12 +16,12 @@ class ClustersActionWidget;
  *
  * @author Thomas Kroes
  */
-class FilterClustersAction : public WidgetAction
+class FilterClustersAction : public mv::gui::WidgetAction
 {
 protected:
 
     /** Widget class for filter clusters action */
-    class Widget : public WidgetActionWidget {
+    class Widget : public mv::gui::WidgetActionWidget {
     public:
 
         /**
@@ -55,9 +52,9 @@ class FilterClustersAction : public WidgetAction
 
 public: // Action getters
 
-    StringAction& getNameFilterAction() { return _nameFilterAction; }
+    mv::gui::StringAction& getNameFilterAction() { return _nameFilterAction; }
 
 protected:
     ClustersActionWidget*   _clustersActionWidget;      /** Pointer to clusters action widget */
-    StringAction            _nameFilterAction;          /** Name filter action */
+    mv::gui::StringAction            _nameFilterAction;          /** Name filter action */
 };