Commit 739e5b36 authored by Martin Schultz's avatar Martin Schultz

reduced includes by means of static code analysis

parent d5cffe97
......@@ -63,7 +63,6 @@
#include <../ObjectTypes/TriangleMesh/TriangleMesh.hh>
#include <../ObjectTypes/PolyMesh/PolyMesh.hh>
#include "PluginFunctions.hh"
#include "PluginFunctionsCore.hh"
namespace PluginFunctions {
......
......@@ -49,7 +49,6 @@
#include <OpenFlipper/BasePlugin/RPCWrappers.hh>
#include <iostream>
#include "RPCWrappersHelper.hh"
#include <QApplication>
......
......@@ -63,52 +63,25 @@
// -------------------- mview
#include "Core.hh"
// -------------------- ACG
#include <ACG/Scenegraph/DrawModes.hh>
#include <ACG/Scenegraph/SceneGraph.hh>
#include <ACG/QtWidgets/QtFileDialog.hh>
// -------------------- Qt
#include <QKeyEvent>
#include <QSplitter>
#include <QMenuBar>
#include <QToolBox>
#include <QApplication>
#include <QStatusBar>
#include <QMessageBox>
#include <QFile>
#include <QSettings>
#if QT_VERSION >= 0x050000
#include <QOpenGLContext>
#include <QSurfaceFormat>
#else
#undef QT_NO_OPENGL
#include <QGLFormat>
#endif
#include <QPluginLoader>
#include "OpenFlipper/BasePlugin/BaseInterface.hh"
#include "OpenFlipper/BasePlugin/KeyInterface.hh"
#include "OpenFlipper/BasePlugin/MouseInterface.hh"
#include "OpenFlipper/BasePlugin/PickingInterface.hh"
#include "OpenFlipper/BasePlugin/ToolboxInterface.hh"
#include "OpenFlipper/BasePlugin/TextureInterface.hh"
#include "OpenFlipper/BasePlugin/MenuInterface.hh"
#include "OpenFlipper/BasePlugin/INIInterface.hh"
#include "OpenFlipper/INIFile/INIFile.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenFlipper/common/RecentFiles.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#include <QStringList>
#include <QtScript/QScriptValueIterator>
#include <ACG/Scenegraph/SeparatorNode.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/BasePlugin/PluginFunctionsCore.hh"
#include "OpenFlipper/BasePlugin/RPCWrappers.hh"
......@@ -118,8 +91,6 @@
#include <OpenFlipper/common/BaseObjectCore.hh>
#include <OpenFlipper/common/TypesInternal.hh>
#include <OpenFlipper/common/RendererInfo.hh>
#include <OpenFlipper/widgets/messageBox/StaysOnTopMessageBox.hh>
#define WIDGET_HEIGHT 800
......
......@@ -61,11 +61,8 @@
// -------------------- mview
#include "Core.hh"
// -------------------- ACG
#include "OpenFlipper/common/GlobalOptions.hh"
// -------------------- Qt
#include <QScrollBar>
#include <QApplication>
//== IMPLEMENTATION ==========================================================
......
......@@ -62,18 +62,11 @@
// -------------------- mview
#include "Core.hh"
// -------------------- ACG
#include <ACG/Scenegraph/DrawModes.hh>
#include <OpenFlipper/INIFile/INIFile.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/common/RecentFiles.hh>
#include <ObjectTypes/Light/Light.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <QFile>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
//== IMPLEMENTATION ==========================================================
......
......@@ -62,17 +62,9 @@
// -------------------- mview
#include "Core.hh"
// -------------------- ACG
#include <ACG/Scenegraph/DrawModes.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/common/RecentFiles.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <QFile>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
//== IMPLEMENTATION ==========================================================
/// \todo After obj writing to one file is implemented in obj plugin, remove this Function and the whole File!
......
......@@ -61,18 +61,8 @@
#include "Core.hh"
#include <QToolBox>
#include "OpenFlipper/BasePlugin/BaseInterface.hh"
#include "OpenFlipper/BasePlugin/ToolboxInterface.hh"
#include "OpenFlipper/BasePlugin/TextureInterface.hh"
#include "OpenFlipper/BasePlugin/PluginFunctionsCore.hh"
#include <OpenFlipper/common/RendererInfo.hh>
#include <stdexcept>
//== IMPLEMENTATION ==========================================================
//========================================================================================
......
......@@ -62,63 +62,32 @@
// -------------------- mview
#include "Core.hh"
#include <QMenuBar>
#include <QToolBox>
#include <QMessageBox>
#include <QApplication>
#include <QScrollArea>
#include <QMessageBox>
#include <QtScript/QScriptValueIterator>
#include <QThread>
#include <QMutexLocker>
#if QT_VERSION >= 0x050000
#include <QStaticPlugin>
#endif
#include <QPluginLoader>
#include "OpenFlipper/BasePlugin/BaseInterface.hh"
#include "OpenFlipper/BasePlugin/AboutInfoInterface.hh"
#include "OpenFlipper/BasePlugin/KeyInterface.hh"
#include "OpenFlipper/BasePlugin/BackupInterface.hh"
#include "OpenFlipper/BasePlugin/LoggingInterface.hh"
#include "OpenFlipper/BasePlugin/MouseInterface.hh"
#include "OpenFlipper/BasePlugin/PickingInterface.hh"
#include "OpenFlipper/BasePlugin/ToolboxInterface.hh"
#include "OpenFlipper/BasePlugin/OptionsInterface.hh"
#include "OpenFlipper/BasePlugin/ToolbarInterface.hh"
#include "OpenFlipper/BasePlugin/TextureInterface.hh"
#include "OpenFlipper/BasePlugin/RenderInterface.hh"
#include "OpenFlipper/BasePlugin/PostProcessorInterface.hh"
#include "OpenFlipper/BasePlugin/MenuInterface.hh"
#include "OpenFlipper/BasePlugin/ContextMenuInterface.hh"
#include "OpenFlipper/BasePlugin/ProcessInterface.hh"
#include "OpenFlipper/BasePlugin/ViewInterface.hh"
#include "OpenFlipper/BasePlugin/ViewModeInterface.hh"
#include "OpenFlipper/BasePlugin/LoadSaveInterface.hh"
#include "OpenFlipper/BasePlugin/StatusbarInterface.hh"
#include "OpenFlipper/BasePlugin/INIInterface.hh"
#include "OpenFlipper/BasePlugin/FileInterface.hh"
#include "OpenFlipper/BasePlugin/RPCInterface.hh"
#include "OpenFlipper/BasePlugin/ScriptInterface.hh"
#include "OpenFlipper/BasePlugin/SecurityInterface.hh"
#include "OpenFlipper/BasePlugin/SelectionInterface.hh"
#include "OpenFlipper/BasePlugin/TypeInterface.hh"
#include "OpenFlipper/BasePlugin/PluginConnectionInterface.hh"
#include "OpenFlipper/BasePlugin/MetadataInterface.hh"
#include "OpenFlipper/common/RendererInfo.hh"
#include "OpenFlipper/INIFile/INIFile.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <ACG/QtWidgets/QtFileDialog.hh>
#include "OpenFlipper/widgets/PluginDialog/PluginDialog.hh"
#include <deque>
#include <limits>
/**
* The number of plugins to load simultaneously.
......
......@@ -61,7 +61,6 @@
// -------------------- mview
#include "Core.hh"
#include <OpenFlipper/common/Types.hh>
//== IMPLEMENTATION ==========================================================
......
......@@ -59,10 +59,7 @@
#include "SpinBoxEventFilter.hh"
#include <QAbstractSpinBox>
#include <QAbstractSlider>
#include <QEvent>
#include <QWidget>
#include <QObjectList>
#include <QMetaEnum>
#include <stack>
......
......@@ -56,19 +56,13 @@
#include <ACG/QtWidgets/QtFileDialog.hh>
#include <ACG/Scenegraph/SceneGraphAnalysis.hh>
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenFlipper/common/RecentFiles.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/widgets/loadWidget/loadWidget.hh"
#include "OpenFlipper/widgets/addEmptyWidget/addEmptyWidget.hh"
#include <OpenFlipper/common/Types.hh>
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
#include <OpenFlipper/common/DataTypes.hh>
#include <time.h>
#include "OpenFunctionThread.hh"
void Core::resetScenegraph( bool _resetTrackBall ) {
......
......@@ -62,13 +62,6 @@
// -------------------- mview
#include "Core.hh"
// -------------------- ACG
#include <ACG/Scenegraph/DrawModes.hh>
#include <OpenFlipper/INIFile/INIFile.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <QCoreApplication>
//== IMPLEMENTATION ==========================================================
......
......@@ -50,15 +50,8 @@
#include "Core.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/widgets/loadWidget/loadWidget.hh"
#include <OpenFlipper/common/DataTypes.hh>
#include <time.h>
//========================================================================================
// === Public Slots (called by CoreWidget's File-Menu / Scripting / Plugins) =========
//========================================================================================
......
......@@ -50,22 +50,8 @@
#include "Core.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <ObjectTypes/Light/Light.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/widgets/loadWidget/loadWidget.hh"
#include <QFileDialog>
#include <QGroupBox>
#include <QBoxLayout>
#include <QMultiMap>
#include <set>
#include <map>
/// Save Settings (slot is called from CoreWidget's File-Menu)
void Core::saveSettings(){
......
......@@ -53,19 +53,8 @@
#include "INIFile.hh"
//std include
#include <fstream>
#include <iostream>
#include <functional>
#include <sstream>
#include <cstring>
#include <cctype>
//#include <ios>
#include <QString>
#include <QFile>
#include <QTextStream>
#include <QStringList>
// -----------------------------------------------------------------------------
INIFile::INIFile()
......
......@@ -61,9 +61,7 @@
#include "Logging.hh"
#include <QStringList>
//== IMPLEMENTATION ==========================================================
//== IMPLEMENTATION ==========================================================
/**
* @param _pluginName Name of the Plugin which uses this logger (Prepended to all Output)
......
......@@ -55,16 +55,10 @@
#include "common/glew_wrappers.hh"
// Qt
#include <QApplication>
#include <qgl.h>
// stdc++
#include <iostream>
#include <fstream>
#include <csignal>
#include <cstdlib>
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenFlipper/SimpleOpt/SimpleOpt.h>
......@@ -77,7 +71,6 @@
#endif
#ifdef USE_OPENMP
#include <omp.h>
#endif
/* ==========================================================
......
......@@ -62,8 +62,6 @@
#define PROTOTYPEMATRIX4X4_C
#include "prototypeMatrix4x4.hh"
#include <OpenFlipper/Scripting/scriptWrappers/vec3dWrapper.hh>
#include <iostream>
prototypeMatrix4x4::prototypeMatrix4x4(QObject *parent ) :
QObject(parent)
......
......@@ -63,9 +63,7 @@
#include "prototypeVec3d.hh"
#include <iostream>
prototypeVec3d::prototypeVec3d(QObject *parent ) :
prototypeVec3d::prototypeVec3d(QObject *parent ) :
QObject(parent)
{
......
......@@ -63,8 +63,6 @@
#include "prototypeVec4d.hh"
#include <iostream>
prototypeVec4d::prototypeVec4d(QObject *parent ) :
QObject(parent)
{
......
......@@ -48,7 +48,6 @@
\*===========================================================================*/
#include "NumberParsing.hh"
#include <QString>
#include <cmath>
#include <sstream>
......
......@@ -62,11 +62,9 @@
//== INCLUDES =================================================================
#include "BaseObjectCore.hh"
#include "BaseObject.hh"
#include "Types.hh"
#include <OpenFlipper/BasePlugin/PluginFunctionsCore.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <QFileInfo>
//== TYPEDEFS =================================================================
......
......@@ -60,10 +60,8 @@
#include "Types.hh"
#include <ACG/Scenegraph/SceneGraph.hh>
#include <OpenFlipper/common/BaseObjectCore.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <QDir>
......
......@@ -65,7 +65,6 @@
//== INCLUDES =================================================================
#include <OpenFlipper/common/FileTypes.hh>
#include <vector>
static std::vector<fileTypes> supportedTypes_;
......
......@@ -59,12 +59,9 @@
#include <QDir>
#include "GlobalOptions.hh"
#include <cstdlib>
#include <iostream>
#include <ACG/Scenegraph/DrawModes.hh>
#include <ACG/GL/ShaderGenerator.hh>
#include <OpenFlipper/BasePlugin/PluginFunctionsViewControls.hh>
#include <QDir>
#include <QCoreApplication>
namespace OpenFlipper {
......
......@@ -61,7 +61,6 @@
#include "RecentFiles.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/common/Types.hh>
namespace OpenFlipper {
namespace Options {
......
......@@ -65,14 +65,11 @@
//== INCLUDES =================================================================
#include "TypesInternal.hh"
#include "DataTypes.hh"
#include <map>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/BasePlugin/LoggingInterface.hh>
#include <QCoreApplication>
#include <QMetaType>
/** This field defines the start id for custom datatypes. It starts high to avoid conflicts with previously
......
......@@ -48,8 +48,6 @@
\*===========================================================================*/
#include "TypesInternal.hh"
#include "UpdateType.hh"
#include <map>
#include <QCoreApplication>
#include <OpenFlipper/common/GlobalOptions.hh>
......
......@@ -56,10 +56,8 @@
//
//=============================================================================
#include <OpenFlipper/common/GlobalDefines.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#include "ViewerProperties.hh"
#include <iostream>
namespace Viewer {
......
......@@ -48,7 +48,6 @@
\*===========================================================================*/
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/common/BaseObjectData.hh>
#include "SelectionObjectMarker.hh"
//******************************************************************************
......
......@@ -55,13 +55,8 @@
#include <QtGui>
#endif
#include <QBrush>
#include "TreeModelObjectSelection.hh"
#include <iostream>
#include "../OpenFlipper/BasePlugin/PluginFunctions.hh"
......
......@@ -49,7 +49,6 @@
//== INCLUDES =================================================================
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QPushButton>
#include <QTreeView>
#include <QMouseEvent>
......@@ -60,7 +59,6 @@
#include "objectPickDialog.hh"
#include "TreeModelObjectSelection.hh"
#include "TreeItemObjectSelection.hh"
//== NAMESPACES ===============================================================
......
......@@ -56,7 +56,6 @@
#include "objectSelectionWidget.hh"
#include "objectPickDialog.hh"
#include "TreeModelObjectSelection.hh"
//== NAMESPACES ===============================================================
......
......@@ -49,7 +49,6 @@
#include "JobInfo.hh"
#include <iostream>
JobInfo::JobInfo() :
......
......@@ -51,8 +51,6 @@
#include "PluginDialog.hh"
#include <QMessageBox>
const QColor PluginDialog::blockColor_ = QColor(228, 155, 18);
const QColor PluginDialog::unloadColor_ = QColor(172, 172, 172);
const QColor PluginDialog::loadedBuiltInColor_ = QColor(208, 240, 192);
......
......@@ -53,8 +53,6 @@
#include <OpenFlipper/common/GlobalOptions.hh>
#include <iostream>
AboutWidget::AboutWidget(QWidget *parent )
: QMainWindow(parent)
{
......
......@@ -65,8 +65,6 @@
#include <QGLFormat>
#include <OpenFlipper/common/GlobalOptions.hh>
#ifndef WIN32
#ifndef ARCH_DARWIN
#include <malloc.h>
......
......@@ -61,13 +61,7 @@
// -------------------- mview
#include "CoreWidget.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include "../../common/GlobalOptions.hh"
#include <OpenFlipper/common/RendererInfo.hh>
//== IMPLEMENTATION ==========================================================
#include <ACG/Scenegraph/CoordsysNode.hh>
void CoreWidget::slotCustomContextMenu( const QPoint& _point ) {
......
......@@ -62,23 +62,15 @@
#include "CoreWidget.hh"
// -------------------- OpenFlipper Includes
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/common/RecentFiles.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/BasePlugin/PluginFunctionsCore.hh>
#include <OpenFlipper/BasePlugin/KeyInterface.hh>
#include <OpenFlipper/BasePlugin/LoggingInterface.hh>
#include <OpenFlipper/widgets/videoCaptureDialog/VideoCaptureDialog.hh>
#include <OpenFlipper/widgets/glWidget/CursorPainter.hh>
#include <ACG/Scenegraph/SceneGraphAnalysis.hh>
#include <ACG/GL/ShaderCache.hh>
// -------------------- Qt event Includes
#include <QEvent>
#include <QWhatsThisClickedEvent>
#include <QGLFormat>
#define WIDGET_HEIGHT 800
......
......@@ -62,7 +62,6 @@
#include "CoreWidget.hh"
// -------------------- ACG
#include "OpenFlipper/common/GlobalOptions.hh"
//== IMPLEMENTATION ==========================================================
......
......@@ -61,7 +61,6 @@
// -------------------- mview
#include "CoreWidget.hh"
// -------------------- ACG
#include "OpenFlipper/common/GlobalOptions.hh"
// -------------------- Qt
......
......@@ -60,8 +60,6 @@
#include "CoreWidget.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
#ifdef WIN32
const QString CoreWidget::homePage_ = "qthelp://org.openflipper.user/user/main.html";
#else
......
......@@ -59,10 +59,6 @@
//== INCLUDES =================================================================
#include "CoreWidget.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/BasePlugin/MenuInterface.hh>
#include <OpenFlipper/common/RendererInfo.hh>
//== IMPLEMENTATION ==========================================================
......
......@@ -55,7 +55,6 @@
#include "SideArea.hh"
#include "SideElement.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
//== IMPLEMENTATION ==========================================================
SideArea::SideArea (QWidget *_parent) :
......
......@@ -52,13 +52,10 @@
//== INCLUDES =================================================================
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QLabel>
#include <QToolButton>
#include <QAction>
#include <QFrame>
#include <QMouseEvent>
#include <QFont>
#include <QDialog>
#include <OpenFlipper/common/GlobalOptions.hh>
......
......@@ -61,9 +61,7 @@
// -------------------- mview
#include "CoreWidget.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
//== IMPLEMENTATION ==========================================================
//== IMPLEMENTATION ==========================================================
StackWidgetInfo::StackWidgetInfo(bool _editable,QString _name,QWidget* _widget) :
editable(_editable),
......
......@@ -60,7 +60,6 @@
// -------------------- mview
#include "CoreWidget.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
//== IMPLEMENTATION ==========================================================
......
......@@ -61,9 +61,6 @@
// -------------------- mview
#include "CoreWidget.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
//== IMPLEMENTATION ==========================================================
......
......@@ -50,11 +50,6 @@
#include "CoreWidget.hh"
#include <OpenFlipper/BasePlugin/KeyInterface.hh>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
//-----------------------------------------------------------------------------
......
......@@ -61,9 +61,6 @@
#include "CoreWidget.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/widgets/glWidget/CursorPainter.hh>
#include <ACG/Scenegraph/SceneGraphAnalysis.hh>
//-----------------------------------------------------------------------------
......
......@@ -54,8 +54,6 @@
#include <OpenFlipper/widgets/viewModeWidget/viewModeWidget.hh>