Commit 05f1c567 authored by Matthias Möller's avatar Matthias Möller

changed some c header includes to c++ pendant

refs #1624

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16856 383ad7c9-94d9-4d36-a494-682f7c89f535
parent f3d07f57
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
#include <OpenFlipper/widgets/glWidget/QtBaseViewer.hh> #include <OpenFlipper/widgets/glWidget/QtBaseViewer.hh>
// QT INCLUDES // QT INCLUDES
#include <qvariant.h> #include <QVariant>
#include <qmainwindow.h> #include <QMainWindow>
#include <QToolBox> #include <QToolBox>
#include <QStackedWidget> #include <QStackedWidget>
#include <QSplashScreen> #include <QSplashScreen>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <qapplication.h> #include <QApplication>
#include <QtGui> #include <QtGui>
#include <QFile> #include <QFile>
#include <QMessageBox> #include <QMessageBox>
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include "OpenFlipper/Core/Core.hh" #include "OpenFlipper/Core/Core.hh"
// Qt // Qt
#include <qapplication.h> #include <QApplication>
#include <qgl.h> #include <qgl.h>
// stdc++ // stdc++
......
...@@ -173,7 +173,7 @@ enum SG_Error { ...@@ -173,7 +173,7 @@ enum SG_Error {
# include <sys/types.h> # include <sys/types.h>
# include <sys/stat.h> # include <sys/stat.h>
# include <glob.h> # include <glob.h>
# include <limits.h> # include <climits>
# define MAX_PATH PATH_MAX # define MAX_PATH PATH_MAX
# define sg_strchr ::strchr # define sg_strchr ::strchr
# define sg_strrchr ::strrchr # define sg_strrchr ::strrchr
...@@ -184,9 +184,9 @@ enum SG_Error { ...@@ -184,9 +184,9 @@ enum SG_Error {
# define SOCHAR_T char # define SOCHAR_T char
#endif #endif
#include <stdlib.h> #include <cstdlib>
#include <string.h> #include <cstring>
#include <wchar.h> #include <cwchar>
// use assertions to test the input data // use assertions to test the input data
#ifdef _DEBUG #ifdef _DEBUG
...@@ -194,7 +194,7 @@ enum SG_Error { ...@@ -194,7 +194,7 @@ enum SG_Error {
# include <crtdbg.h> # include <crtdbg.h>
# define SG_ASSERT(b) _ASSERTE(b) # define SG_ASSERT(b) _ASSERTE(b)
# else # else
# include <assert.h> # include <cassert>
# define SG_ASSERT(b) assert(b) # define SG_ASSERT(b) assert(b)
# endif # endif
#else #else
......
...@@ -202,8 +202,8 @@ ShowFiles(args.FileCount(), args.Files()); ...@@ -202,8 +202,8 @@ ShowFiles(args.FileCount(), args.Files());
#ifdef SO_MAX_ARGS #ifdef SO_MAX_ARGS
# define SO_STATICBUF SO_MAX_ARGS # define SO_STATICBUF SO_MAX_ARGS
#else #else
# include <stdlib.h> // malloc, free # include <cstdlib> // malloc, free
# include <string.h> // memcpy # include <cstring> // memcpy
# define SO_STATICBUF 50 # define SO_STATICBUF 50
#endif #endif
...@@ -321,7 +321,7 @@ typedef enum _ESOArgType { ...@@ -321,7 +321,7 @@ typedef enum _ESOArgType {
# include <crtdbg.h> # include <crtdbg.h>
# define SO_ASSERT(b) _ASSERTE(b) # define SO_ASSERT(b) _ASSERTE(b)
# else # else
# include <assert.h> # include <cassert>
# define SO_ASSERT(b) assert(b) # define SO_ASSERT(b) assert(b)
# endif # endif
#else #else
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
#include <ACG/Math/Matrix4x4T.hh> #include <ACG/Math/Matrix4x4T.hh>
#include <ACG/Math/VectorT.hh> #include <ACG/Math/VectorT.hh>
#include <limits.h> #include <climits>
#include <QIcon> #include <QIcon>
#include <QMetaType> #include <QMetaType>
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include <QDir> #include <QDir>
#include "GlobalOptions.hh" #include "GlobalOptions.hh"
#include <stdlib.h> #include <cstdlib>
#include <iostream> #include <iostream>
#include <ACG/Scenegraph/DrawModes.hh> #include <ACG/Scenegraph/DrawModes.hh>
#include <OpenFlipper/BasePlugin/PluginFunctionsViewControls.hh> #include <OpenFlipper/BasePlugin/PluginFunctionsViewControls.hh>
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <assert.h> #include <cassert>
#include <QMimeData> #include <QMimeData>
#include <QToolButton> #include <QToolButton>
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include <OpenFlipper/common/GlobalOptions.hh> #include <OpenFlipper/common/GlobalOptions.hh>
#include <iostream> #include <iostream>
#include <math.h> #include <cmath>
#include <OpenMesh/Core/System/omstream.hh> #include <OpenMesh/Core/System/omstream.hh>
......
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