fix build error on windows and some warnings

qgis · Dec 6, 2013 · 5a1bcf3 · 5a1bcf3
1 parent ac50183
commit 5a1bcf3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -1669,11 +1669,14 @@ void QgsDxfExport::writeLinestyleAC1018( QTextStream& stream, const QString& sty
 
 void QgsDxfExport::writeEntitiesAC1018( QTextStream& stream )
 {
+  Q_UNUSED( stream );
   //todo...
 }
 
 void QgsDxfExport::writeEntitiesSymbolLevelsAC1018( QTextStream& stream, QgsVectorLayer* layer )
 {
+  Q_UNUSED( stream );
+  Q_UNUSED( layer );
   //todo...
 }
 

diff --git a/src/core/symbology-ng/qgssymbollayerv2.h b/src/core/symbology-ng/qgssymbollayerv2.h
@@ -31,14 +31,13 @@
 #include <QDomElement>
 
 #include "qgssymbolv2.h"
-
 #include "qgssymbollayerv2utils.h" // QgsStringMap
+#include "qgsdxfexport.h"
 
 class QPainter;
 class QSize;
 class QPolygonF;
 
-class QgsDxfExport;
 class QgsExpression;
 class QgsRenderContext;
 

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -392,6 +392,7 @@ INCLUDE_DIRECTORIES(
   ../core/composer
   ../core/raster
   ../core/symbology-ng
+  ../core/dxf
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/../ui
   ${QWT_INCLUDE_DIR}

diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
@@ -3882,9 +3882,9 @@
                  <property name="title">
                   <string>Default datum transformations</string>
                  </property>
-                 <layout class="QGridLayout" name="gridLayout_8">
+                 <layout class="QGridLayout" name="gridLayout_10">
                   <item row="0" column="0">
-                   <layout class="QHBoxLayout" name="horizontalLayout_4">
+                   <layout class="QHBoxLayout" name="horizontalLayout_38">
                     <item>
                      <widget class="QPushButton" name="mAddDefaultTransformButton">
                       <property name="text">