src/core/CMakeLists.txt

@@ -322,7 +322,6 @@ SET(QGIS_CORE_MOC_HDRS
 
   composer/qgsaddremoveitemcommand.h
   composer/qgscomposerlegend.h
-  composer/qgscomposerlegendstyle.h
   composer/qgscomposermap.h
   composer/qgscomposerpicture.h
   composer/qgscomposerscalebar.h

src/core/composer/qgscomposerlegend.cpp

@@ -111,7 +111,7 @@ QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )
   double columnTop = mBoxSpace + titleSize.height() + style( QgsComposerLegendStyle::Group ).margin( QgsComposerLegendStyle::Top );
 
   QPointF point( mBoxSpace, columnTop );
-  bool firstInColumn = true;
+  // bool firstInColumn = true;
   double columnMaxHeight = 0;
   qreal columnWidth = 0;
   int column = 0;
@@ -131,7 +131,7 @@ QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )
       point.ry() = columnTop;
       columnWidth = 0;
       column++;
-      firstInColumn = true;
+      // firstInColumn = true;
     }
     // Add space if necessary, unfortunately it depends on first nucleon
     //if ( !firstInColumn )
@@ -145,7 +145,7 @@ QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )
     point.ry() += atom.size.height();
     columnMaxHeight = qMax( point.y() - columnTop, columnMaxHeight );
 
-    firstInColumn = false;
+    // firstInColumn = false;
   }
   point.rx() += columnWidth + mBoxSpace;
 
@@ -962,7 +962,7 @@ QList<QgsComposerLegend::Atom> QgsComposerLegend::createAtomList( QStandardItem*
 // Draw atom and expand its size (using actual nucleons labelXOffset)
 QSizeF QgsComposerLegend::drawAtom( Atom atom, QPainter* painter, QPointF point )
 {
-  bool first = true;
+  // bool first = true;
   QSizeF size = QSizeF( atom.size );
   foreach ( Nucleon nucleon, atom.nucleons )
   {
@@ -1006,7 +1006,7 @@ QSizeF QgsComposerLegend::drawAtom( Atom atom, QPainter* painter, QPointF point
       size.rwidth() = qMax( symbolNucleon.size.width(), size.width() );
     }
     point.ry() += nucleon.size.height();
-    first = false;
+    // first = false;
   }
   return size;
 }
@@ -1046,7 +1046,7 @@ void QgsComposerLegend::setColumns( QList<Atom>& atomList )
 
   // Divide atoms to columns
   double totalHeight = 0;
-  bool first = true;
+  // bool first = true;
   qreal maxAtomHeight = 0;
   foreach ( Atom atom, atomList )
   {
@@ -1056,7 +1056,7 @@ void QgsComposerLegend::setColumns( QList<Atom>& atomList )
     //}
     totalHeight += atom.size.height();
     maxAtomHeight = qMax( atom.size.height(), maxAtomHeight );
-    first  = false;
+    // first  = false;
   }
 
   // We know height of each atom and we have to split them into columns
@@ -1071,7 +1071,7 @@ void QgsComposerLegend::setColumns( QList<Atom>& atomList )
   double currentColumnHeight = 0;
   double maxColumnHeight = 0;
   double closedColumnsHeight = 0;
-  first = true; // first in column
+  // first = true; // first in column
   for ( int i = 0; i < atomList.size(); i++ )
   {
     Atom atom = atomList[i];
@@ -1104,7 +1104,7 @@ void QgsComposerLegend::setColumns( QList<Atom>& atomList )
     currentColumnAtomCount++;
     maxColumnHeight = qMax( currentColumnHeight, maxColumnHeight );
 
-    first  = false;
+    // first  = false;
   }
 
   // Alling labels of symbols for each layr/column to the same labelXOffset

src/mapserver/qgswmsserver.cpp

@@ -1552,6 +1552,9 @@ void QgsWMSServer::drawLegendLayerItem( QgsComposerLayerItem* item, QPainter* p,
       case QgsComposerLegendItem::LayerItem:
         //QgsDebugMsg( "GroupItem not handled" );
         break;
+      case QgsComposerLegendItem::StyleItem:
+        //QgsDebugMsg( "StyleItem not handled" );
+        break;
     }
 
     //finally draw text

src/plugins/CMakeLists.txt

@@ -16,6 +16,7 @@ ADD_SUBDIRECTORY(roadgraph)
 ADD_SUBDIRECTORY(zonal_statistics)
 ADD_SUBDIRECTORY(georeferencer)
 ADD_SUBDIRECTORY(gps_importer)
+ADD_SUBDIRECTORY(topology)
 
 IF (WITH_SPATIALITE)
   ADD_SUBDIRECTORY(offline_editing)

src/plugins/topology/CMakeLists.txt

@@ -0,0 +1,61 @@
+
+########################################################
+# Files
+
+SET (topol_SRCS
+  topol.cpp
+  rulesDialog.cpp
+  checkDock.cpp
+  topolError.cpp
+  topolTest.cpp
+  dockModel.cpp
+)
+
+SET (topol_UIS
+  rulesDialog.ui
+  checkDock.ui  
+)
+
+SET (topol_MOC_HDRS
+  topol.h
+  rulesDialog.h
+  checkDock.h
+  topolTest.h
+  dockModel.h
+)
+
+SET (topol_RCCS  topol.qrc)
+
+########################################################
+# Build
+
+QT4_WRAP_UI (topol_UIS_H  ${topol_UIS})
+
+QT4_WRAP_CPP (topol_MOC_SRCS  ${topol_MOC_HDRS})
+
+QT4_ADD_RESOURCES(topol_RCC_SRCS ${topol_RCCS})
+
+ADD_LIBRARY (topolplugin MODULE ${topol_SRCS} ${topol_MOC_SRCS} ${topol_RCC_SRCS} ${topol_UIS_H})
+
+INCLUDE_DIRECTORIES(
+  ${CMAKE_BINARY_DIR}/src/ui
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${GEOS_INCLUDE_DIR}
+  ../../core ../../core/raster ../../core/renderer ../../core/symbology
+  ../../gui  
+  ..
+)
+
+TARGET_LINK_LIBRARIES(topolplugin
+  qgis_core
+  qgis_gui
+)
+
+
+########################################################
+# Install
+
+INSTALL(TARGETS topolplugin
+  RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
+  LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
+