[CHANGE] - renamed export definition files to better match our naming scheme (no underscores).

src/common/WAssert.h

@@ -28,7 +28,7 @@
 #include <string>
 
 #include "WException.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Implements assertion logic.

src/common/WColor.h

@@ -31,7 +31,7 @@
 #include <string>
 #include <vector>
 
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Represents a RGBA Color

src/common/WCondition.h

@@ -29,7 +29,7 @@
 #include <boost/signals2/signal.hpp>
 #include <boost/thread.hpp>
 
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Class to encapsulate boost::condition_variable_any. You may use it to efficiently wait for events (a condition comes true). It

src/common/WConditionOneShot.h

@@ -28,7 +28,7 @@
 #include <boost/thread.hpp>
 
 #include "WCondition.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Implements a WCondition, but can be fired only ONCE. This is useful if you want to have a thread waiting for a condition but

src/common/WConditionSet.h

@@ -32,7 +32,7 @@
 #include <boost/thread.hpp>
 
 #include "WCondition.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Class allowing multiple conditions to be used for one waiting cycle. Since wait() can not be used for waiting on multiple

src/common/WException.h

@@ -31,7 +31,7 @@
 #include <sstream>
 
 #include "WTerminalColor.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Basic exception handler.

src/common/WExport_CommonDLL.h → src/common/WExportCommon.h

@@ -22,8 +22,8 @@
 //
 //---------------------------------------------------------------------------
 
-#ifndef WEXPORT_COMMONDLL_H
-#define WEXPORT_COMMONDLL_H
+#ifndef WEXPORTCOMMON_H
+#define WEXPORTCOMMON_H
 
 #ifdef _MSC_VER
 
@@ -41,5 +41,5 @@
 
 #endif // _MSC_VER
 
-#endif  // WEXPORT_COMMONDLL_H
+#endif  // WEXPORTCOMMON_H
 

src/common/WFlagForwarder.h

@@ -29,7 +29,7 @@
 #include <boost/signals2/signal.hpp>
 
 #include "WFlag.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * This class helps especially container module programmers to easily synchronize the value of one flag with several other

src/common/WHistogram.h

@@ -27,7 +27,7 @@
 
 #include <utility>
 
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Container which associate values with (uniform width) bins (aka intervals or buckets). This class implements the abstract interface and

src/common/WItemSelection.h

@@ -33,7 +33,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 class WItemSelector;
 

src/common/WItemSelector.h

@@ -33,7 +33,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include "WItemSelection.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * This class represents a subset of a WItemSelection. It is a class for managing selections. The class is kept very restrictive. The selection

src/common/WLogEntry.h

@@ -28,7 +28,7 @@
 #include <string>
 
 #include "WTerminalColor.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Various log levels, to distinguish output on its level.

src/common/WLogger.h

@@ -38,7 +38,7 @@
 #include "WLogEntry.h"
 #include "WStringUtils.h"
 #include "WThreadedRunner.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Does actual logging of WLogEntries down to stdout or something similar.

src/common/WPathHelper.h

@@ -30,7 +30,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 /**
  * Singleton class helping to find files and paths. It is a useful to to search for resources and the central place to "hardcode" relative paths.
  * It contains global paths only. Modules have their OWN local paths.

src/common/WPreferences.h

@@ -36,7 +36,7 @@
 #include "WProperties.h"
 #include "WLogger.h"
 
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 /**
  * Fetches and caches preferences set in file.
  */

src/common/WProgress.h

@@ -30,7 +30,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 /**
  * Class managing progress inside of modules. It interacts with the abstract WGUI class to present those information to the user.
  * At the same time, it also is a simple tree structure, allowing the programmer to arrange complex sub progress. This is

src/common/WProgressCombiner.h

@@ -31,7 +31,7 @@
 #include <boost/thread.hpp>
 
 #include "WProgress.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Base class for all kinds of progress combinations. You might want to derive from this class to implement some special progress

src/common/WProjectFileIO.h

@@ -28,7 +28,7 @@
 #include <ostream>
 #include <string>
 
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 /**
  * A base class for all parts of OpenWalnut which can be serialized to a project file. It is used by WProjectFile to actually parse the file line
  * by line. Derive from this class if you write your own parser and use it to fill your internal data structures.

src/common/WProperties.h

@@ -38,7 +38,7 @@
 #include "WPropertyBase.h"
 #include "WPropertyTypes.h"
 #include "WPropertyVariable.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Class to manage properties of an object and to provide convenience methods for easy access and manipulation. It also allows

src/common/WPropertyBase.h

@@ -36,7 +36,7 @@
 #include "WPropertyTypes.h"
 #include "WCondition.h"
 #include "WConditionSet.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Abstract base class for all properties. Simply provides name and type information.

src/common/WPropertyHelper.h

@@ -33,7 +33,7 @@
 #include "constraints/WPropertyConstraintPathExists.h"
 #include "constraints/WPropertyConstraintIsDirectory.h"
 #include "constraints/WPropertyConstraintSelectOnlyOne.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * This namespace contains several utility functions to handle properties. Especially constraint helper to easily create constraints.

src/common/WPrototyped.h

@@ -29,7 +29,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Interface class for the concept "Prototype". The requirements are a zero-parameter constructor.

src/common/WSegmentationFault.h

@@ -35,7 +35,7 @@
 #include <boost/lexical_cast.hpp>
 
 #include "WException.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 #ifdef __linux__
 // This is highly platform dependent. Used for backtrace functionality.

src/common/WSharedLib.h

@@ -30,7 +30,7 @@
 
 #include <boost/filesystem.hpp>
 
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * This class loads shared libraries and provides function pointers. This is especially useful for dynamic loading of shared libraries during

src/common/WStringUtils.h

@@ -37,7 +37,7 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Some utilities for string manipulation and output operations. Please note

src/common/WTerminalColor.h

@@ -27,7 +27,7 @@
 
 #include <string>
 
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Helper class to provide a convenient way to colorize output on the console.

src/common/WThreadedRunner.h

@@ -33,7 +33,7 @@
 #include <boost/thread/thread.hpp>
 
 #include "WFlag.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Base class for all classes needing to be executed in a separate thread.

src/common/WTransferable.h

@@ -26,7 +26,7 @@
 #define WTRANSFERABLE_H
 
 #include "../common/WPrototyped.h"
-#include "WExport_CommonDLL.h"
+#include "WExportCommon.h"
 
 /**
  * Class building the interface for classes that might be transferred using WModuleConnector.

src/common/datastructures/WDXtLookUpTable.h

@@ -28,7 +28,7 @@
 #include <vector>
 
 #include "../exceptions/WOutOfBounds.h"
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 /**
  * Represents a symmetric matrix-like look up table, meaning it stores only

src/common/datastructures/WFiber.h

@@ -29,7 +29,7 @@
 
 #include "../math/WLine.h"
 #include "../math/WPosition.h"
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 // we need this to find the WFiberTest class which is not inside wmath namespace
 // Additionally I found no way to put the WFiberTest class into wmath and CXXTest

src/common/datastructures/WTriangleMesh.h

@@ -37,7 +37,7 @@
 #include "../math/WVector3D.h"
 #include "../WTransferable.h"
 
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 /**
  * A triangle consisting of 3 id of vertices that represent its corners

src/common/datastructures/WUnionFind.h

@@ -30,7 +30,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 /**
  * Implements a very simple union-find datastructure aka disjoint_sets.
  * \note I know there is a boost solution on that:

src/common/exceptions/WFileNotFound.h

@@ -28,7 +28,7 @@
 #include <string>
 
 #include "../WException.h"
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 /**
  * Thrown whenever a file was not found.

src/common/exceptions/WFileOpenFailed.h

@@ -28,7 +28,7 @@
 #include <string>
 
 #include "../WException.h"
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 /**
  * Thrown whenever a file could not be opened.

src/common/exceptions/WLibraryFetchFailed.h

@@ -28,7 +28,7 @@
 #include <string>
 
 #include "../WException.h"
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 /**
  * Thrown whenever a symbol could not be fetched.

src/common/exceptions/WLibraryLoadFailed.h

@@ -28,7 +28,7 @@
 #include <string>
 
 #include "../WException.h"
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 /**
  * Thrown whenever a library could not been loaded. This may be caused by a file not found error or link errors.

src/common/exceptions/WNotImplemented.h

@@ -28,7 +28,7 @@
 #include <string>
 
 #include "../WException.h"
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 /**
  * Indicates invalid element access of a container.

src/common/exceptions/WOutOfBounds.h

@@ -28,7 +28,7 @@
 #include <string>
 
 #include "../WException.h"
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 /**
  * Indicates invalid element access of a container.

src/common/exceptions/WPropertyNameMalformed.h

@@ -28,7 +28,7 @@
 #include <string>
 
 #include "../WException.h"
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 /**
  * Indicates invalid property name.

src/common/exceptions/WPropertyNotUnique.h

@@ -28,7 +28,7 @@
 #include <string>
 
 #include "../WException.h"
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 /**
  * Indicates that a given property is not unique in a group of properties.

src/common/exceptions/WPropertyUnknown.h

@@ -28,7 +28,7 @@
 #include <string>
 
 #include "../WException.h"
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 /**
  * Indicates invalid element access of a container.

src/common/math/WLine.h

@@ -31,7 +31,7 @@
 
 #include "../WMixinVector.h"
 #include "WPosition.h"
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 // we need this to find the WLineTest class which is not inside wmath namespace
 class WLineTest;

src/common/math/WLinearAlgebraFunctions.h

@@ -25,7 +25,7 @@
 #ifndef WLINEARALGEBRAFUNCTIONS_H
 #define WLINEARALGEBRAFUNCTIONS_H
 
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 namespace wmath
 {

src/common/math/WSymmetricSphericalHarmonic.h

@@ -30,7 +30,7 @@
 #include "WMath.h"
 #include "WUnitSphereCoordinates.h"
 #include "WValue.h"
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 namespace wmath
 {

src/common/math/WUnitSphereCoordinates.h

@@ -29,7 +29,7 @@
 
 #include "../../common/math/WVector3D.h"
 
-#include "../../common/WExport_CommonDLL.h"
+#include "../../common/WExportCommon.h"
 
 namespace wmath
 {

src/common/math/WVector3D.h

@@ -33,7 +33,7 @@
 #include "../WLimits.h"
 #include "WValue.h"
 
-#include "../WExport_CommonDLL.h"
+#include "../WExportCommon.h"
 
 namespace wmath
 {

src/graphicsEngine/WExport_GEDLL.h → src/graphicsEngine/WExportWGE.h

@@ -22,8 +22,8 @@
 //
 //---------------------------------------------------------------------------
 
-#ifndef WEXPORT_GEDLL_H
-#define WEXPORT_GEDLL_H
+#ifndef WEXPORTWGE_H
+#define WEXPORTWGE_H
 
 #ifdef _MSC_VER
 
@@ -41,5 +41,5 @@
 
 #endif // _MSC_VER
 
-#endif  // WEXPORT_GEDLL_H
+#endif  // WEXPORTWGE_H
 

src/graphicsEngine/WGE2DManipulator.h

@@ -27,7 +27,7 @@
 
 #include <osgGA/MatrixManipulator>
 
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 /**
  * A manipulator which changes the view of a 2D scene. Does things like panning
  * and zooming.

src/graphicsEngine/WGEBorderLayout.h

@@ -32,7 +32,7 @@
 
 #include "WGEGroupNode.h"
 #include "WGELabel.h"
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 /**
  * This class contains a label layout for positioning labels at the side of the screen. There is a line from the point of interest to the label

src/graphicsEngine/WGECamera.h

@@ -27,7 +27,7 @@
 
 #include <osg/Camera>
 
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 /**
  * Class for wrapping around the OSG Camera class. It adds some utility

src/graphicsEngine/WGEGeodeUtils.h

@@ -37,7 +37,7 @@
 #include "../common/math/WPosition.h"
 #include "../common/math/WLine.h"
 
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 namespace wge
 {

src/graphicsEngine/WGEGeometryUtils.h

@@ -32,7 +32,7 @@
 #include "../common/datastructures/WTriangleMesh.h"
 #include "../common/math/WPosition.h"
 
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 namespace wge
 {

src/graphicsEngine/WGEGroupNode.h

@@ -34,7 +34,7 @@
 #include <osg/NodeCallback>
 
 #include "../common/WCondition.h"
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 /**
  * Class to wrap around the osg Group node and providing a thread safe add/removal mechanism. Please be sure to use

src/graphicsEngine/WGELabel.h

@@ -29,7 +29,7 @@
 #include <osgText/FadeText>
 
 #include "WGELayoutableItem.h"
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 /**
  * Label layout-item. An layoutable item which displays text. This is nice for labeling elements on the screen. It can be used stand-alone (as it

src/graphicsEngine/WGEManagedGroupNode.h

@@ -32,7 +32,7 @@
 #include "WGEGroupNode.h"
 #include "../common/WCondition.h"
 #include "../common/WFlag.h"
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 /**
  * This class adds some convenience methods to WGEGroupNode. It can handle bool properties which switch the node on and off.

src/graphicsEngine/WGEProjectFileIO.h

@@ -31,7 +31,7 @@
 #include <osg/Matrixd>
 
 #include "../common/WProjectFileIO.h"
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 /**
  * IO class for writing the graphics engine state to a project file. Currently it only writes the camera settings for the main view with the

src/graphicsEngine/WGEScene.h

@@ -26,7 +26,7 @@
 #define WGESCENE_H
 
 #include "WGEGroupNode.h"
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 /**
  * Class for managing the OpenSceneGraph root node. It can handle new nodes, removing nodes and so on.

src/graphicsEngine/WGEShaderAnimationCallback.h

@@ -33,7 +33,7 @@
 #endif
 #include <osg/Uniform>
 
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 /**
  * This is a uniform callback setting the uniform to the current time in milliseconds, hundredth of a second or tenth of a second.

src/graphicsEngine/WGEUtils.h

@@ -34,7 +34,7 @@
 
 #include "../common/WColor.h"
 #include "../common/math/WPosition.h"
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 namespace wge
 {

src/graphicsEngine/WGEViewer.h

@@ -47,7 +47,7 @@
 #include "WPickHandler.h"
 #include "WGEGroupNode.h"
 
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 
 /**

src/graphicsEngine/WGEZoomTrackballManipulator.h

@@ -26,7 +26,7 @@
 #define WGEZOOMTRACKBALLMANIPULATOR_H
 
 #include <osgGA/TrackballManipulator>
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 /**
  * New OSG manipulator: TrackballManipulator with added mouse wheel zoom.

src/graphicsEngine/WGraphicsEngine.h

@@ -51,7 +51,7 @@
 #include "WGEScene.h"
 #include "WGEViewer.h"
 #include "WGESignals.h"
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 /**
  * Base class for initializing the graphics engine. This Class also serves as adaptor to access the graphics

src/graphicsEngine/WPickHandler.h

@@ -48,7 +48,7 @@
 
 #include "../common/math/WPosition.h"
 #include "WPickInfo.h"
-#include "WExport_GEDLL.h"
+#include "WExportWGE.h"
 
 /**
  * class to handle events with a pick

src/graphicsEngine/WPickInfo.h

@@ -30,7 +30,7 @@