Merge branch 'master' of github.com:qgis/Quantum-GIS

Author: timlinux

debian/changelog

@@ -8,6 +8,7 @@ qgis (1.8.0) UNRELEASED; urgency=low
   * include internal pyspatialite in python-qgis
   * update watch
   * drop abi postfix from sqlanywhere plugin
+  * include network analysis library
 
  -- Jürgen E. Fischer <jef@norbit.de>  Thu, 29 Sep 2011 21:44:50 +0000
 

debian/libqgis{QGIS_ABI}.install

@@ -1,3 +1,4 @@
 usr/lib/libqgis_core.so.{QGIS_ABI}
 usr/lib/libqgis_gui.so.{QGIS_ABI}
 usr/lib/libqgis_analysis.so.{QGIS_ABI}
+usr/lib/libqgis_networkanalysis.so.{QGIS_ABI}

doc/INSTALL.t2t

@@ -33,7 +33,7 @@ Building QGIS from source - step by step
 %! PostProc(tex): '\\section' '\\newpage\\section'
 %! PostProc(tex): 'section{' 'section{\\color{qgis-green}'
 %! PostProc(tex): NEWPAGE  '\\newpage'
-% Give alternating table rows different colours and use a smaller font in tables (\tiny)
+% Give alternating table rows different colors and use a smaller font in tables (\tiny)
 %! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}'
 %! encoding: iso-8859-1
 

doc/changelog.t2t

@@ -81,7 +81,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]
 - Reduce top and side margins for attribute table dialog
 - Remove the (hopefully) last SVN reference
 - More svn version removal
-- Added missing colour accessor/mutator/member from composerlegenditem header
+- Added missing color accessor/mutator/member from composerlegenditem header
 - Get rid of svn version stuff from release branch.
 - Other workaround for Qt#5114 (fixes #3250, #3028, #2598)
 - Try to make the histogram smoother
@@ -216,7 +216,7 @@ changed so we will just provide a bullet list of key new features here.
 
 - Support for icons of plugins in the plugin manager dialog.
 - Removed quickprint plugin - use easyprint plugin rather from plugin repo.
-- Removed ogr convertor plugin - use 'save as' context menu rather.
+- Removed ogr converter plugin - use 'save as' context menu rather.
 - 
 
 ==Printing==

doc/qgis-download-stats.ods

@@ -1935,7 +1935,7 @@
           <widget class="QLabel" label="&lt;p align=&quot;right&quot;&gt;Full&lt;/p&gt;" objectName="textLabel4"/>
         </widget>
         <widget class="QGroupBox" label="" objectName="gboxCustomTransparency">
-          <widget class="QLabel" label="Transparency band" objectName="lblTransarent"/>
+          <widget class="QLabel" label="Transparency band" objectName="lblTransparent"/>
           <widget class="QComboBox" label="" objectName="cboxTransparencyBand"/>
           <widget class="QLabel" label="Transparent pixel list" objectName="label_2"/>
         </widget>

resources/customization.xml

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+echo "A script to generate a source video progression"
+echo "see http://woostuff.wordpress.com/2011/01/03/generating-a-gource-source-commit-history-visualization-for-qgis-quantum-gis/"
+echo "Run it from the root directory e.g. scripts/$0"
+
+gource --title "Quantum GIS" --logo images/icons/qgis-icon.png \
+    --hide filenames \
+    --date-format "%d, %B %Y" \
+    --seconds-per-day 0.05 \
+    --highlight-all-users \
+    --auto-skip-seconds 0.5 \
+    --file-idle-time 0 \
+    --max-files 999999999 \
+    --multi-sampling \
+    --stop-at-end \
+    --elasticity 0.1 \
+    -b ffffff \
+    --disable-progress \
+    --user-friction .2 \
+    --output-ppm-stream - | \
+ ffmpeg -an -threads 4 -y -b 3000K -vb 8000000 -r 60 -f image2pipe \
+        -vcodec ppm -i - -vcodec libx264 -vpre libx264-medium qgis-history.mp4

scripts/make_gource_video.sh

@@ -48,7 +48,11 @@ class ANALYSIS_EXPORT QgsArcProperter
     /**
      * calculate and return adge property
      */
-    virtual QVariant property( double distance, const QgsFeature& f ) const
-    { return QVariant(); }
+    virtual QVariant property( double distance, const QgsFeature &f ) const
+    {
+      Q_UNUSED( distance );
+      Q_UNUSED( f );
+      return QVariant();
+    }
 };
 #endif //QGSEDGEPROPERTYH

src/analysis/network/qgsarcproperter.h

@@ -14,5 +14,6 @@
 
 QVariant QgsDistanceArcProperter::property( double distance, const QgsFeature& f ) const
 {
+  Q_UNUSED( f );
   return QVariant( distance );
 }

src/analysis/network/qgsdistancearcproperter.cpp

@@ -107,16 +107,6 @@ int QgsGraphArc::outVertex() const
   return mOut;
 }
 
-int QgsGraphArc::in() const
-{
-  return mIn;
-}
-
-int QgsGraphArc::out() const
-{
-  return mOut;
-}
-
 QgsGraphVertex::QgsGraphVertex( const QgsPoint& point )
     : mCoordinate( point )
 {