Commit ff055243 authored by David Partyka's avatar David Partyka
Browse files

Reorder headers so vtkWin32Header is included before standard headers.

vtkWin32Header include vtkConfigure that should be included before including standard hears.
parent 68a5347f
......@@ -30,10 +30,12 @@
#ifndef __QVTKApplication_h
#define __QVTKApplication_h
#include <QApplication>
#include "QVTKWin32Header.h" // for QVTK_EXPORT
#include "vtkTDxConfigure.h" // defines VTK_USE_TDX
#include <QApplication>
#ifdef VTK_USE_TDX
class vtkTDxDevice;
#ifdef Q_WS_X11
......
......@@ -36,8 +36,8 @@
#ifndef Q_VTK_INTERACTOR_H
#define Q_VTK_INTERACTOR_H
#include <vtkRenderWindowInteractor.h>
#include "QVTKWin32Header.h"
#include <vtkRenderWindowInteractor.h>
#include <QtCore/QObject>
#include "vtkTDxConfigure.h" // defines VTK_USE_TDX
......
......@@ -29,6 +29,7 @@
#ifndef QVTK_PAINT_ENGINE_HPP
#define QVTK_PAINT_ENGINE_HPP
#include "QVTKWin32Header.h"
#include <QPaintEngine>
class QVTKWidget;
class QVTKPaintEngineInternal;
......
......@@ -36,8 +36,9 @@
#ifndef Q_VTK_WIDGET_H
#define Q_VTK_WIDGET_H
#include <QtGui/QWidget>
#include "QVTKInteractor.h"
#include <QtGui/QWidget>
class QVTKInteractorAdapter;
class vtkRenderWindow;
......
......@@ -20,7 +20,7 @@
#ifndef __QVTKWin32Header_h
#define __QVTKWin32Header_h
#include "vtkConfigure.h"
#include "vtkSystemIncludes.h"
#include "vtkABI.h"
#if defined(VTK_BUILD_SHARED_LIBS)
......
......@@ -18,8 +18,8 @@
the U.S. Government retains certain rights in this software.
-------------------------------------------------------------------------*/
#include "vtkQtAbstractModelAdapter.h"
#include "vtkObject.h" // For vtkGenericWarningMacro
#include "vtkQtAbstractModelAdapter.h"
int vtkQtAbstractModelAdapter::ModelColumnToFieldDataColumn(int col) const
{
......
......@@ -12,18 +12,18 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
//
#include <stack>
#include <vector>
#include <algorithm>
#include <functional>
//
#include "vtkObjectFactory.h"
#include "vtkModifiedBSPTree.h"
#include "vtkPolyData.h"
#include "vtkGenericCell.h"
#include "vtkIdListCollection.h"
#include <stack>
#include <vector>
#include <algorithm>
#include <functional>
#include <vtkAppendPolyData.h>
#include <vtkCubeSource.h>
//
......
......@@ -16,7 +16,6 @@
// .SECTION Description
//
#include "vtksys/SystemTools.hxx"
#include "vtkSmartPointer.h"
#include "vtkSQLiteDatabase.h"
#include "vtkSQLQuery.h"
......@@ -27,6 +26,8 @@
#include "vtkTableToSQLiteWriter.h"
#include "vtkSQLiteToTableReader.h"
#include "vtksys/SystemTools.hxx"
int TestSQLiteTableReadWrite(int argc, char *argv[])
{
if ( argc <= 1 )
......
......@@ -18,6 +18,14 @@
the U.S. Government retains certain rights in this software.
-------------------------------------------------------------------------*/
#include "vtkGraph.h"
#include "vtkBoostGraphAdapter.h"
#include "vtkIntArray.h"
#include "vtkIdTypeArray.h"
#include "vtkMath.h"
#include "vtkSmartPointer.h"
#include "vtkTimerLog.h"
#include <vtksys/stl/vector>
#include <vtksys/stl/map>
#include <vtksys/stl/utility>
......@@ -37,14 +45,6 @@
#include <boost/graph/dijkstra_shortest_paths.hpp>
#include <boost/graph/transitive_closure.hpp>
#include "vtkGraph.h"
#include "vtkBoostGraphAdapter.h"
#include "vtkIntArray.h"
#include "vtkIdTypeArray.h"
#include "vtkMath.h"
#include "vtkTimerLog.h"
#include "vtkSmartPointer.h"
#define VTK_CREATE(type, name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
......
......@@ -42,16 +42,15 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#include "Partition.h"
#include "ParticleDistribute.h"
#ifdef USE_VTK_COSMO
#include "CosmoDefinition.h"
#include "vtkStdString.h"
#include "vtkSetGet.h"
#endif
#include "Partition.h"
#include "ParticleDistribute.h"
#include <iostream>
#include <fstream>
#include <sstream>
......
......@@ -58,9 +58,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ParticleDistribute_h
#define ParticleDistribute_h
#include "Message.h"
#include <cstdlib>
#ifdef USE_VTK_COSMO
#include "CosmoDefinition.h"
......@@ -76,6 +73,9 @@ using namespace vtkstd;
using namespace std;
#endif
#include "Message.h"
#include <cstdlib>
#ifdef USE_VTK_COSMO
class COSMO_EXPORT ParticleDistribute {
#else
......
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