Merge branch 'master' of https://github.com/pixlra/playuver

Conflicts:
	source/ConfigureResolutionDialog.cpp

source/ConfigureResolutionDialog.cpp

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     ConfigureResolutionDialog.cpp
- *  \brief    Dialog box to set the sequence resolution
+/**
+ * \file     ConfigureResolutionDialog.cpp
+ * \brief    Dialog box to set the sequence resolution
  */
 
 #include <QApplication>

source/ConfigureResolutionDialog.h

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     ConfigureResolutionDialog.h
- \brief    Dialog box to set the sequence resolution
+/**
+ * \file     ConfigureResolutionDialog.h
+ * \brief    Dialog box to set the sequence resolution
  */
 
 #ifndef __CONFIGURERESOLUTIONDIALOG_H__

source/ImageInterface.cpp

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     imageinterface.cpp
- \brief    Sub windows handling
+/**
+ * \file     imageinterface.cpp
+ * \brief    Sub windows handling
  */
 
 #include <QtWidgets>

source/ImageInterface.h

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     imageinterface.h
- \brief    Sub windows handling
+/**
+ * \file     imageinterface.h
+ * \brief    Sub windows handling
  */
 
 #ifndef __IMAGEINTERFACE_H__

source/InputStream.cpp

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     InputStream.cpp
- \brief    Input handling
+/**
+ * \file     InputStream.cpp
+ * \brief    Input handling
  */
 
 #include <cstdio>

source/InputStream.h

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     InputStream.h
- \brief    Input handling
+/**
+ * \file     InputStream.h
+ * \brief    Input handling
  */
 
 #ifndef __INPUTSTREAM_H__

source/LibMemAlloc.cpp

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     LibMemAlloc.cpp
- \brief    memory allocation functions
+/**
+ * \file     LibMemAlloc.cpp
+ * \brief    memory allocation functions
  */
 
 #include "LibMemAlloc.h"

source/LibMemAlloc.h

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     LibMemAlloc.h
- \brief    memory allocation functions
+/**
+ * \file     LibMemAlloc.h
+ * \brief    memory allocation functions
  */
 
 #ifndef __LIBMEMALLOC_H__

source/TypeDef.h

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     TypeDef.h
- \brief    Define basic types, new types and enumerations
+/**
+ * \file     TypeDef.h
+ * \brief    Define basic types, new types and enumerations
  */
 
 #ifndef __TYPEDEF_H__

source/main.cpp

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     main.cp
- \brief    main file
+/**
+ * \file     main.cp
+ * \brief    main file
  */
 
 #include <QApplication>

source/plaYUVerApp.cpp

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     plaYUVerApp.cpp
- \brief    Main definition of the plaYUVerApp app
+/**
+ * \file     plaYUVerApp.cpp
+ * \brief    Main definition of the plaYUVerApp app
  */
 
 

source/plaYUVerApp.h

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     plaYUVerApp.h
- \brief    Main definition of the plaYUVerApp app
+/**
+ * \file     plaYUVerApp.h
+ * \brief    Main definition of the plaYUVerApp app
  */
 
 #ifndef __PLAYUVERAPP_H__

source/plaYUVerSettings.cpp

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     playuversettings.h
- \brief    plaYUVer app settings
+/**
+ * \file     playuversettings.h
+ * \brief    plaYUVer app settings
  */
 
 #include <QDir>

source/plaYUVerSettings.h

@@ -16,8 +16,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** \file     playuversettings.h
- \brief    plaYUVer app settings
+/**
+ * \file     playuversettings.h
+ * \brief    plaYUVer app settings
  */
 
 #ifndef __PLAYUVERSETTINGS_H__