Commit 5c4b5522 authored by Emmanuel Promayon's avatar Emmanuel Promayon

UPDATED modernize use "using" instead of "typedef" (only for simple/direct case with no templates)

clang-tidy (4.0 and 7.0) did not find any "typedef" to modernize, this is a manual change
parent a82f4312
......@@ -110,8 +110,8 @@ private:
MMLMonitorDisplayFactory();
typedef MMLMonitorDisplay* (*CreateMonitorDisplayFunctionPointer)(Monitor* monitor, MMLComponent* manager);
using CreateMonitorDisplayFunctionPointer = MMLMonitorDisplay* (*)(Monitor* monitor, MMLComponent* manager);
/// A map between MonitorDisplay name as string to functions (CreateMonitorDisplayFunctionPointer)
std::map<std::string, CreateMonitorDisplayFunctionPointer> mapObjectCreator;
......
......@@ -66,15 +66,15 @@ namespace std {
* definition of a couple (=STL pair) [Atom *, vtkIdType]
* this associates an atom to its vtkPoint Id
*/
typedef std::pair<const Atom*, const vtkIdType> AtomPointIdPair;
using AtomPointIdPair = std::pair<const Atom*, const vtkIdType>;
/** definition of the association set (=map in STL) AtomPointIdMap.
* AtomPointIdMap associate all the Atom with their vtkPoint Id.
* The key is the atom, so that it is simple to retrieve its corresponding point Id
* (which is supposed to be the most often used functionnality).
*/
typedef std::map <const Atom*, const vtkIdType> AtomPointIdMap;
using AtomPointIdMap = std::map <const Atom*, const vtkIdType>;
/** the iterator corresponding to the AtomPointIdMap map */
typedef std::map <const Atom*, const vtkIdType>::iterator AtomPointIdMapIterator;
using AtomPointIdMapIterator = std::map <const Atom*, const vtkIdType>::iterator;
}
/**
......
......@@ -57,20 +57,20 @@ class Structure;
#endif // MSVC only
/** Definition of a function/method that could be called by the setProgress method. */
typedef void (*PtrToSetProgressFunction)(const float donePercentage);
using PtrToSetProgressFunction = void (*)(const float donePercentage);
namespace std {
/** definition of a couple (=STL pair) (int , Structure *)
* this associates a global cell/atom index to the ptr to the cell/atom that actually has this index
*/
typedef std::pair<unsigned int, Structure*> GlobalIndexStructurePair;
using GlobalIndexStructurePair = std::pair<unsigned int, Structure*>;
/** definition of the association set (=map in STL) globalIndexStructureMap.
* GlobalIndexStructureMap associate all the global index with their cell/atom ptr.
* The key is the global index, so that it is simple to retrieve a cell/atom pointer from the globalIndex
*/
typedef std::map <unsigned int, Structure*> GlobalIndexStructureMap;
using GlobalIndexStructureMap = std::map <unsigned int, Structure*>;
/** the iterator corresponding to GlobalIndexStructureMap */
typedef std::map <unsigned int, Structure*> ::iterator GlobalIndexStructureMapIterator;
using GlobalIndexStructureMapIterator = std::map <unsigned int, Structure*> ::iterator;
}
......
......@@ -36,7 +36,7 @@
#include "ui_RigidTransformDialog.h"
typedef vtkSmartPointer<vtkTransformFilter> vtkSmartPointerTransformFilter;
using vtkSmartPointerTransformFilter = vtkSmartPointer<vtkTransformFilter>;
/**
* @ingroup group_sdk_actions_mesh_basicmesh
......
......@@ -86,13 +86,12 @@ class Component;
class Action;
/// A list of Component
typedef CAMITK_API QList<Component*> ComponentList;
using CAMITK_API ComponentList = QList<Component*>;
/// A set of Action
typedef CAMITK_API QSet<Action*> ActionSet;
using CAMITK_API ActionSet = QSet<Action*>;
/// A list of Action
typedef CAMITK_API QList<Action*> ActionList;
using CAMITK_API ActionList = QList<Action*>;
}
#endif
......@@ -63,7 +63,7 @@ class MeshDataFilterModel;
class PropertyObject;
class Property;
typedef vtkSmartPointer<vtkCamera> vtkSmartPointerCamera;
using vtkSmartPointerCamera = vtkSmartPointer<vtkCamera>;
/// InteractiveViewerFrame is just a QFrame that delegates all key events to its InteractiveViewer
class InteractiveViewerFrame : public QFrame {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment