diff --git a/src/QtOpenGL.h.cmake b/src/QtOpenGL.h.cmake index 6a345fdd3d..a871f0bb50 100644 --- a/src/QtOpenGL.h.cmake +++ b/src/QtOpenGL.h.cmake @@ -33,10 +33,10 @@ #include #include -typedef QOpenGLContext QtGLContext; -typedef QSurfaceFormat QtGLFormat; -typedef QOpenGLWidget QtGLWidget; -typedef QOpenGLFramebufferObject QtGLFramebufferObject; -typedef QOpenGLFramebufferObjectFormat QtGLFramebufferObjectFormat; +using QtGLContext = QOpenGLContext; +using QtGLFormat = QSurfaceFormat; +using QtGLWidget = QOpenGLWidget; +using QtGLFramebufferObject = QOpenGLFramebufferObject; +using QtGLFramebufferObjectFormat = QOpenGLFramebufferObjectFormat; #endif //QUARTER_QTOPENGL_H diff --git a/src/Tools/ImageTools/ImageConv/CmdLine.h b/src/Tools/ImageTools/ImageConv/CmdLine.h index 96bf91fd4e..88a965a70b 100644 --- a/src/Tools/ImageTools/ImageConv/CmdLine.h +++ b/src/Tools/ImageTools/ImageConv/CmdLine.h @@ -136,7 +136,7 @@ struct CCmdParam }; // this class is actually a map of strings to vectors -typedef map _CCmdLine; +using _CCmdLine = map; // the command line parser class class CCmdLine : public _CCmdLine diff --git a/src/Tools/plugins/widget/customwidgets.h b/src/Tools/plugins/widget/customwidgets.h index ac31837653..19fdb365d4 100644 --- a/src/Tools/plugins/widget/customwidgets.h +++ b/src/Tools/plugins/widget/customwidgets.h @@ -68,7 +68,7 @@ namespace Base { Scientific = 2 }; - typedef int NumberOptions; + using NumberOptions = int; NumberOptions option; NumberFormat format; int precision;