diff --git a/src/Mod/TechDraw/App/CosmeticExtension.h b/src/Mod/TechDraw/App/CosmeticExtension.h index d269e8a884..a010ddefa9 100644 --- a/src/Mod/TechDraw/App/CosmeticExtension.h +++ b/src/Mod/TechDraw/App/CosmeticExtension.h @@ -95,7 +95,7 @@ private: }; -typedef App::ExtensionPythonT CosmeticExtensionPython; +using CosmeticExtensionPython = App::ExtensionPythonT; } //end namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawGeomHatch.h b/src/Mod/TechDraw/App/DrawGeomHatch.h index d29a01173d..b05fa0c8bb 100644 --- a/src/Mod/TechDraw/App/DrawGeomHatch.h +++ b/src/Mod/TechDraw/App/DrawGeomHatch.h @@ -113,7 +113,7 @@ private: }; -typedef App::FeaturePythonT DrawGeomHatchPython; +using DrawGeomHatchPython = App::FeaturePythonT; diff --git a/src/Mod/TechDraw/App/DrawHatch.h b/src/Mod/TechDraw/App/DrawHatch.h index 1afbbd3afd..ad4fd3fd4e 100644 --- a/src/Mod/TechDraw/App/DrawHatch.h +++ b/src/Mod/TechDraw/App/DrawHatch.h @@ -84,7 +84,7 @@ private: }; -typedef App::FeaturePythonT DrawHatchPython; +using DrawHatchPython = App::FeaturePythonT; } //namespace TechDraw #endif diff --git a/src/Mod/TechDraw/App/DrawLeaderLine.h b/src/Mod/TechDraw/App/DrawLeaderLine.h index 6d8eb0a398..269e60638d 100644 --- a/src/Mod/TechDraw/App/DrawLeaderLine.h +++ b/src/Mod/TechDraw/App/DrawLeaderLine.h @@ -87,7 +87,7 @@ private: }; -typedef App::FeaturePythonT DrawLeaderLinePython; +using DrawLeaderLinePython = App::FeaturePythonT; } //namespace TechDraw #endif diff --git a/src/Mod/TechDraw/App/DrawPage.h b/src/Mod/TechDraw/App/DrawPage.h index dc5d0b8860..bfff9156c8 100644 --- a/src/Mod/TechDraw/App/DrawPage.h +++ b/src/Mod/TechDraw/App/DrawPage.h @@ -22,9 +22,9 @@ #ifndef _DrawPage_h_ #define _DrawPage_h_ - -#include - + +#include + #include #include @@ -122,7 +122,7 @@ private: }; -typedef App::FeaturePythonT DrawPagePython; +using DrawPagePython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawParametricTemplate.h b/src/Mod/TechDraw/App/DrawParametricTemplate.h index 033edf9d12..5000b78ea5 100644 --- a/src/Mod/TechDraw/App/DrawParametricTemplate.h +++ b/src/Mod/TechDraw/App/DrawParametricTemplate.h @@ -22,8 +22,8 @@ #ifndef _TECHDRAW_DrawParametricTemplate_h_ #define _TECHDRAW_DrawParametricTemplate_h_ - -#include + +#include #include #include @@ -90,7 +90,7 @@ private: static const char* OrientationEnums[]; }; -typedef App::FeaturePythonT DrawParametricTemplatePython; +using DrawParametricTemplatePython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawProjectSplit.h b/src/Mod/TechDraw/App/DrawProjectSplit.h index 668f0e6d17..58e0f12965 100644 --- a/src/Mod/TechDraw/App/DrawProjectSplit.h +++ b/src/Mod/TechDraw/App/DrawProjectSplit.h @@ -97,7 +97,7 @@ private: }; -typedef App::FeaturePythonT DrawProjectSplitPython; +using DrawProjectSplitPython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawRichAnno.h b/src/Mod/TechDraw/App/DrawRichAnno.h index aeb11ba5a4..aa92aac9a7 100644 --- a/src/Mod/TechDraw/App/DrawRichAnno.h +++ b/src/Mod/TechDraw/App/DrawRichAnno.h @@ -64,7 +64,7 @@ protected: private: }; -typedef App::FeaturePythonT DrawRichAnnoPython; +using DrawRichAnnoPython = App::FeaturePythonT; } //namespace TechDraw #endif diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.h b/src/Mod/TechDraw/App/DrawSVGTemplate.h index bafa365dc5..659e3098e5 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplate.h +++ b/src/Mod/TechDraw/App/DrawSVGTemplate.h @@ -22,8 +22,8 @@ #ifndef _TECHDRAW_DrawSVGTemplate_h_ #define _TECHDRAW_DrawSVGTemplate_h_ - -#include + +#include #include #include @@ -77,7 +77,7 @@ protected: }; -typedef App::FeaturePythonT DrawSVGTemplatePython; +using DrawSVGTemplatePython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawTemplate.h b/src/Mod/TechDraw/App/DrawTemplate.h index 53f5679e7f..d006d0e4d8 100644 --- a/src/Mod/TechDraw/App/DrawTemplate.h +++ b/src/Mod/TechDraw/App/DrawTemplate.h @@ -22,8 +22,8 @@ #ifndef _TECHDRAW_DrawTemplate_h_ #define _TECHDRAW_DrawTemplate_h_ - -#include + +#include #include #include @@ -86,7 +86,7 @@ private: }; -typedef App::FeaturePythonT DrawTemplatePython; +using DrawTemplatePython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawTile.h b/src/Mod/TechDraw/App/DrawTile.h index 8112e1c56e..f604670f08 100644 --- a/src/Mod/TechDraw/App/DrawTile.h +++ b/src/Mod/TechDraw/App/DrawTile.h @@ -22,8 +22,8 @@ #ifndef _TechDraw_DrawTile_h_ #define _TechDraw_DrawTile_h_ - -#include + +#include # include # include @@ -62,7 +62,7 @@ protected: private: }; -typedef App::FeaturePythonT DrawTilePython; +using DrawTilePython = App::FeaturePythonT; } //namespace TechDraw #endif diff --git a/src/Mod/TechDraw/App/DrawTileWeld.h b/src/Mod/TechDraw/App/DrawTileWeld.h index 206f7c37fb..afc37e1e30 100644 --- a/src/Mod/TechDraw/App/DrawTileWeld.h +++ b/src/Mod/TechDraw/App/DrawTileWeld.h @@ -22,8 +22,8 @@ #ifndef _TechDraw_DrawTileWeld_h_ #define _TechDraw_DrawTileWeld_h_ - -#include + +#include #include #include @@ -73,7 +73,7 @@ protected: private: }; -typedef App::FeaturePythonT DrawTileWeldPython; +using DrawTileWeldPython = App::FeaturePythonT; } //namespace TechDraw #endif diff --git a/src/Mod/TechDraw/App/DrawView.h b/src/Mod/TechDraw/App/DrawView.h index 287d6b92d2..24976d9b59 100644 --- a/src/Mod/TechDraw/App/DrawView.h +++ b/src/Mod/TechDraw/App/DrawView.h @@ -132,7 +132,7 @@ private: bool m_overrideKeepUpdated; }; -typedef App::FeaturePythonT DrawViewPython; +using DrawViewPython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.h b/src/Mod/TechDraw/App/DrawViewAnnotation.h index 3841e0d9ea..488023b13b 100644 --- a/src/Mod/TechDraw/App/DrawViewAnnotation.h +++ b/src/Mod/TechDraw/App/DrawViewAnnotation.h @@ -75,7 +75,7 @@ private: static const char* TextStyleEnums[]; }; -typedef App::FeaturePythonT DrawViewAnnotationPython; +using DrawViewAnnotationPython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawViewClip.h b/src/Mod/TechDraw/App/DrawViewClip.h index dd2d66fa23..0699cf8f2d 100644 --- a/src/Mod/TechDraw/App/DrawViewClip.h +++ b/src/Mod/TechDraw/App/DrawViewClip.h @@ -77,7 +77,7 @@ protected: void onChanged(const App::Property* prop) override; }; -typedef App::FeaturePythonT DrawViewClipPython; +using DrawViewClipPython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawViewDetail.h b/src/Mod/TechDraw/App/DrawViewDetail.h index f6e70ba509..b1fad36f5e 100644 --- a/src/Mod/TechDraw/App/DrawViewDetail.h +++ b/src/Mod/TechDraw/App/DrawViewDetail.h @@ -110,7 +110,7 @@ protected: DrawViewSection* m_saveDvs; }; -typedef App::FeaturePythonT DrawViewDetailPython; +using DrawViewDetailPython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawViewDimension.h b/src/Mod/TechDraw/App/DrawViewDimension.h index 5a4a2c7543..9b3b64c6de 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.h +++ b/src/Mod/TechDraw/App/DrawViewDimension.h @@ -48,7 +48,7 @@ struct DimRef { std::string sub; }; -typedef std::pair pointPair; +using pointPair = std::pair; struct anglePoints { diff --git a/src/Mod/TechDraw/App/DrawViewDraft.h b/src/Mod/TechDraw/App/DrawViewDraft.h index 793ef3ff90..3993042853 100644 --- a/src/Mod/TechDraw/App/DrawViewDraft.h +++ b/src/Mod/TechDraw/App/DrawViewDraft.h @@ -74,7 +74,7 @@ protected: std::string getSVGTail(); }; -typedef App::FeaturePythonT DrawViewDraftPython; +using DrawViewDraftPython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawViewImage.h b/src/Mod/TechDraw/App/DrawViewImage.h index 2d2379dede..69a5a1f61f 100644 --- a/src/Mod/TechDraw/App/DrawViewImage.h +++ b/src/Mod/TechDraw/App/DrawViewImage.h @@ -72,7 +72,7 @@ protected: Base::BoundBox3d bbox; }; -typedef App::FeaturePythonT DrawViewImagePython; +using DrawViewImagePython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawViewMulti.h b/src/Mod/TechDraw/App/DrawViewMulti.h index 5610652393..bd2004369c 100644 --- a/src/Mod/TechDraw/App/DrawViewMulti.h +++ b/src/Mod/TechDraw/App/DrawViewMulti.h @@ -80,7 +80,7 @@ protected: // void getParameters(void); }; -typedef App::FeaturePythonT DrawViewMultiPython; +using DrawViewMultiPython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawViewPart.h b/src/Mod/TechDraw/App/DrawViewPart.h index 1ee08715d0..76114b8127 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.h +++ b/src/Mod/TechDraw/App/DrawViewPart.h @@ -269,7 +269,7 @@ private: }; -typedef App::FeaturePythonT DrawViewPartPython; +using DrawViewPartPython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawViewSection.h b/src/Mod/TechDraw/App/DrawViewSection.h index 11b9a94d98..77359588a7 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.h +++ b/src/Mod/TechDraw/App/DrawViewSection.h @@ -166,7 +166,7 @@ protected: }; -typedef App::FeaturePythonT DrawViewSectionPython; +using DrawViewSectionPython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h index 68ddadc35e..d0e9fe8687 100644 --- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h +++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h @@ -70,7 +70,7 @@ protected: private: }; -typedef App::FeaturePythonT DrawViewSpreadsheetPython; +using DrawViewSpreadsheetPython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.h b/src/Mod/TechDraw/App/DrawViewSymbol.h index 26887f37a5..a8cced9aba 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbol.h +++ b/src/Mod/TechDraw/App/DrawViewSymbol.h @@ -77,7 +77,7 @@ protected: bool loadQDomDocument(QDomDocument& symbolDocument); }; -typedef App::FeaturePythonT DrawViewSymbolPython; +using DrawViewSymbolPython = App::FeaturePythonT; } //namespace TechDraw diff --git a/src/Mod/TechDraw/App/DrawWeldSymbol.h b/src/Mod/TechDraw/App/DrawWeldSymbol.h index 7fb1dae33b..153aec9f03 100644 --- a/src/Mod/TechDraw/App/DrawWeldSymbol.h +++ b/src/Mod/TechDraw/App/DrawWeldSymbol.h @@ -69,7 +69,7 @@ protected: private: }; -typedef App::FeaturePythonT DrawWeldSymbolPython; +using DrawWeldSymbolPython = App::FeaturePythonT; } //namespace TechDraw #endif diff --git a/src/Mod/TechDraw/App/EdgeWalker.cpp b/src/Mod/TechDraw/App/EdgeWalker.cpp index a5fbf33fbc..1541c18996 100644 --- a/src/Mod/TechDraw/App/EdgeWalker.cpp +++ b/src/Mod/TechDraw/App/EdgeWalker.cpp @@ -177,9 +177,9 @@ bool EdgeWalker::perform() } // Test for planarity - typedef std::vector< graph_traits::edge_descriptor > vec_t; + using vec_t = std::vector< graph_traits::edge_descriptor >; std::vector embedding(num_vertices(m_g)); - typedef std::vector< graph_traits::edge_descriptor > kura_edges_t; + using kura_edges_t = std::vector< graph_traits::edge_descriptor >; kura_edges_t kEdges; kura_edges_t::iterator ki, ki_end; graph_traits::edge_descriptor e1; diff --git a/src/Mod/TechDraw/App/EdgeWalker.h b/src/Mod/TechDraw/App/EdgeWalker.h index b7ac595a4d..9108018218 100644 --- a/src/Mod/TechDraw/App/EdgeWalker.h +++ b/src/Mod/TechDraw/App/EdgeWalker.h @@ -45,32 +45,28 @@ namespace TechDraw { //using namespace boost; -typedef +using graph = boost::adjacency_list < boost::vecS, boost::vecS, boost::undirectedS, boost::property, boost::property - > - graph; + >; -typedef - boost::graph_traits < graph >::vertex_descriptor - vertex_t; -typedef - boost::graph_traits < graph >::edge_descriptor - edge_t; +using vertex_t = + boost::graph_traits < graph >::vertex_descriptor; -typedef - std::vector< std::vector > - planar_embedding_storage_t; +using edge_t = + boost::graph_traits < graph >::edge_descriptor; -typedef +using planar_embedding_storage_t = + std::vector< std::vector >; + +using planar_embedding_t = boost::iterator_property_map< planar_embedding_storage_t::iterator, boost::property_map::type - > - planar_embedding_t; + >; class TechDrawExport WalkerEdge { diff --git a/src/Mod/TechDraw/App/ProjectionAlgos.h b/src/Mod/TechDraw/App/ProjectionAlgos.h index effa99f2a4..7adea571b1 100644 --- a/src/Mod/TechDraw/App/ProjectionAlgos.h +++ b/src/Mod/TechDraw/App/ProjectionAlgos.h @@ -53,7 +53,7 @@ public: WithHidden = 1, WithSmooth = 2 }; - typedef std::map XmlAttributes; + using XmlAttributes = std::map; std::string getSVG(ExtractionType type, double tolerance=0.05, XmlAttributes V_style=XmlAttributes(), diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h index 0c74b3b4e8..ab60699b10 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.h +++ b/src/Mod/TechDraw/Gui/MDIViewPage.h @@ -121,7 +121,7 @@ protected: void onDeleteObject(const App::DocumentObject& obj); - typedef boost::signals2::connection Connection; + using Connection = boost::signals2::connection; Connection connectDeletedObject; bool compareSelections(std::vector treeSel,QList sceneSel); diff --git a/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h b/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h index e4956e0a5a..34f4fac097 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h @@ -42,7 +42,7 @@ public: virtual QIcon extensionMergeGreyableOverlayIcons(const QIcon & orig) const override; }; -typedef Gui::ViewProviderExtensionPythonT ViewProviderCosmeticExtensionPython; +using ViewProviderCosmeticExtensionPython = Gui::ViewProviderExtensionPythonT; } //namespace TechDrawGui diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h index 2acdb899d3..61301a0077 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h @@ -82,7 +82,7 @@ public: void onProgressMessage(const TechDraw::DrawView* dv, const std::string featureName, const std::string text); - typedef boost::signals2::scoped_connection Connection; + using Connection = boost::signals2::scoped_connection; Connection connectGuiRepaint; Connection connectProgressMessage; diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h index 546171a3e4..ed8647b32c 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h @@ -82,7 +82,7 @@ public: //slots & connections void onGuiRepaint(const TechDraw::DrawPage* dp); - typedef boost::signals2::scoped_connection Connection; + using Connection = boost::signals2::scoped_connection; Connection connectGuiRepaint; void unsetEdit(int ModNum) override; diff --git a/src/Mod/Test/Gui/UnitTestPy.h b/src/Mod/Test/Gui/UnitTestPy.h index b5acfe492e..649939f750 100644 --- a/src/Mod/Test/Gui/UnitTestPy.h +++ b/src/Mod/Test/Gui/UnitTestPy.h @@ -60,7 +60,7 @@ public: Py::Object clearUnitTests (const Py::Tuple&); private: - typedef PyObject* (*method_varargs_handler)(PyObject *_self, PyObject *_args); + using method_varargs_handler = PyObject* (*)(PyObject *_self, PyObject *_args); static method_varargs_handler pycxx_handler; static PyObject *method_varargs_ext_handler(PyObject *_self, PyObject *_args); };