[QGIS Commit] r15539 - in trunk/qgis: debian images/developers images/themes/default/propertyicons resources/context_help src/astyle src/core/raster src/gui/symbology-ng src/plugins/spatialquery src/ui tools

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sat Mar 19 16:27:59 EDT 2011 

Author: jef
Date: 2011-03-19 13:27:59 -0700 (Sat, 19 Mar 2011)
New Revision: 15539

Removed:
   trunk/qgis/debian/pencil.uu
   trunk/qgis/tools/qgiscommit
Modified:
   trunk/qgis/images/developers/Magnus_Homann.jpg
   trunk/qgis/images/themes/default/propertyicons/join.png
   trunk/qgis/resources/context_help/RgSettingsDlg-de_DE
   trunk/qgis/resources/context_help/RgShortestPathWidget-de_DE
   trunk/qgis/src/astyle/ASBeautifier.cpp
   trunk/qgis/src/astyle/ASEnhancer.cpp
   trunk/qgis/src/astyle/ASFormatter.cpp
   trunk/qgis/src/astyle/ASResource.cpp
   trunk/qgis/src/astyle/astyle.h
   trunk/qgis/src/astyle/astyle_main.cpp
   trunk/qgis/src/astyle/license.html
   trunk/qgis/src/core/raster/qgsrasterlayer.cpp
   trunk/qgis/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
   trunk/qgis/src/plugins/spatialquery/CMakeLists.txt
   trunk/qgis/src/plugins/spatialquery/README
   trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp
   trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h
   trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.cpp
   trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.h
   trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.cpp
   trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.h
   trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.cpp
   trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.h
   trunk/qgis/src/plugins/spatialquery/qgsspatialquery.cpp
   trunk/qgis/src/plugins/spatialquery/qgsspatialquery.h
   trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp
   trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.h
   trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.qrc
   trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui
   trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.cpp
   trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.h
   trunk/qgis/src/plugins/spatialquery/select.png
   trunk/qgis/src/plugins/spatialquery/selectadd.png
   trunk/qgis/src/plugins/spatialquery/selectesubsetlayer.png
   trunk/qgis/src/plugins/spatialquery/selectremove.png
   trunk/qgis/src/ui/qgsoptionsbase.ui
   trunk/qgis/src/ui/qgsrendererrulepropsdialogbase.ui
Log:
fix some warnings and other cleanups

Deleted: trunk/qgis/debian/pencil.uu
===================================================================
--- trunk/qgis/debian/pencil.uu	2011-03-19 17:40:19 UTC (rev 15538)
+++ trunk/qgis/debian/pencil.uu	2011-03-19 20:27:59 UTC (rev 15539)
@@ -1,44 +0,0 @@
-begin 644 pencil.png
-MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!&=!34$``*_(
-M-P6*Z0```!ET15AT4V]F='=A<F4`061O8F4 at 26UA9V5296%D>7')93P```:D
-M241!5'C:8OS__S_#0`*``&)B&&``$$`#[@"``&*!,1 at 9&2DS25:<@4%*@H'A
-M'Q,$@\!?Q@"&7XP+&9 at 8WC*P_J]B8/J_`J;\_YDS8!H@@*@3`M+"#`QR$JAB
-MOYBBV+G^+I((?L/':O-.D8'YWV*&/XRUZ%H!`HB%8LO5@!9+B3(P_/R'\,]/
-MIF(NH=\]`?D/&%XI,#&<?<G$\$/E(\OW==)-#-]8?S`P_^^&:0<((,I"P$":
-M at 4%&B('ASU^$V`^F+@'9;STAU7<99'6^,LC__\?`Q\S!P*GYAX'#[QG0C?_;
-M&?XSVL"4`P00>0Y@`J878RD&!A$>H.7_8*)L##\8%TIH?BX-K;K+(";W@^';
-M5U8&;J9O#/8B7`S<S((,[-H_&5 at -/C`S_&9LA6D"""#2HX"#F8'!5)*!@9.3
-M@>$WR')FD*@`T/+EBF;O/;S2GC)P<`.3P`\6AM__?S*(LZLS!(FE,;B(_F>8
-M^'0:PQVU[PP?SS!:P(P#""#2'"#`!K0<F-J96:"6`P/P/X,<PT_&-9I.KTW=
-MXUXP,#$S,?S^"?3DOY\,,IP&#-8BJ0R2'-H,/UGW,AC\8&"X=0R88-^]AN<&
-M@``BW@%"0,LMQ8!9#!C\?Z&EYW\&/8:_#.MTO%XJ.X>\`48OT/+?C`Q___UB
-M4."V`EJ>S"#"IL1P^><JAM4G-C!LF2C"\/7\VXD,;Y^4PHP%""#B'"##`8QS
-M8&+[#;84`OXQ.##\_[]*+^"%J(7;!P:F?Z!`^<_P[_\?!C5>9P9+X40&/E9Q
-MAC/?YS.LW+N+8<=4<8;?5U[6,'Q\T8IL-$``$7:`)A<#@Q8?,%*1ZHR_C*%,
-MK'\7:/N^YM(V_\K``LP$?YD@;M/A]V$P$XQG8&?A9CCZ92K#LBW'&?;/%OOY
-M_\;C'(;/[^:@&P\00/@=8`I,34I`!_P`&0TM*?\RY#!S_9ZDYO.&44'[!P,K
-MT'(F%E!)RL)@R!_$8"(8!<IJ#`<^]#(L7GV9X>1BD?<,MQ\D,'S]O`F;%0`!
-MA-L!%D"+%8%!_Q/9YPS-+`*_:N0]WC*(*_P&^YP5F#38F-D9C`0B&0P$0AE^
-M,7QBV/MZ`L.B)?<9+J\6>,1PYUXDPX\?QW!9`Q!`V!U at R,[`H,P&M9P1HNX/
-MPS1FT1^IXD[O&00D_C*P`N.<%1CL?*P\#)9"<0S:?/X,7QB>,.QXVL^P8/YK
-MAGM;N"\RW+T?R?#K]W5\@0P00)@.X`+F:SV@`[[#?<X+]/EB1JGO_KS6'QFX
-M!?\SL`&E6("6BW$*,3B()3&H\[HSO/UWG6'S/:#/YWYE>+:+=1_#_8<QP$+J
-M.:$D!A!`J`X0!%INPPE-<&"?2P(M7\T at _\V:U?`S`R<P5MA!10_0<AEN*08/
-MJ11 at BK=G>/;W),/::U,8EL[^R_#N`,,JA@=/4X`YY#,Q&0P@@!`.D&8%)CJ@
-MY0+`O/83+*P!-&0=@^HW30:-;PSL0&D.1HCE*GQ*#/ZR:4#+31D>_-[#L/S<
-M+(95<UD8OA[],YGAT=LBH-X_Q!8O``&$<(`=,,&!\Q-4_-_?%0PJWS49U'X!
-M*R^@Y4"+F8!85TB;(50AG4&95YOAYL]U#(N.+6+8N("3X=>)[S4,SSZUDEJR
-M`P00P@%,H(C]!70[4.C_7U\N?C;]7XK?P!4=*S/$YQ9BI at P1BFD,<CSR#)>^
-M+V!8L&\-P_:E/#__G_R2P_#ZVQQRZC6``$+4ALSP4`.6I=]+:JQ\&%S$],"!
-MR09T at +.T/4.,<BZ#)+<,PXF/TQ at F;U[!L&T^U_O_1S^%DVLY"``$$"($V']"
-M?/_OEY.TF(15JJD'@Q.C-<.Q=\4,WO)V#(EJJ0S<;"P,NU[V,"S9?I#ARB;>
-M1PRG/T8R?/ESC)(F!4``82D'_I86VG at S"`E)`"L2'8;%5A,8-KXYQ/#^WVN&
-M'8\6,:S<>I+A\4Y@'C\#M/S'O^N4-J@``@C5`4Q_31G_L+J),ZDR,/$#:SYF
-M`08_X0A at ON=F*%Q7S_#P[@.&[Z<X]C&<^1P+K.R?4:,Y"1!`J`Y at _E?X_[4T
-M8W[_3 at 9A"3F&+YR?&98>W\AP]-*YWV_NO;_`\)!I$\.#KQ.!->%G!BH!@`!B
-MA/6,&#,8#1A^LYUB>";'RL#U'I at FOOQ@>/7S/,-]AMT,KQAV`<O9"T!E7ZEE
-M,<Q>@`!"A``S0P;#]]_`E'CG(,--H*6/&/8!_7D%U,RD9<<$((#`+@&[1H4A
-ME(&'P00HQDJ/'A',7H``8ASHSBE```UXWQ`@@`;<`0`!!@!1Y1-PU(R$<P``
-*``!)14Y$KD)@@@``
-`
-end


Property changes on: trunk/qgis/images/developers/Magnus_Homann.jpg
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/images/themes/default/propertyicons/join.png
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/resources/context_help/RgSettingsDlg-de_DE
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/resources/context_help/RgShortestPathWidget-de_DE
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/astyle/ASBeautifier.cpp
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/astyle/ASEnhancer.cpp
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/astyle/ASFormatter.cpp
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/astyle/ASResource.cpp
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/astyle/astyle.h
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/astyle/astyle_main.cpp
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/astyle/license.html
___________________________________________________________________
Deleted: svn:executable
   - *

Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2011-03-19 17:40:19 UTC (rev 15538)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2011-03-19 20:27:59 UTC (rev 15539)
@@ -768,7 +768,6 @@
   }
 
   const QgsMapToPixel& theQgsMapToPixel = rendererContext.mapToPixel();
-  const QgsRectangle& theViewExtent = rendererContext.extent();
 
   QgsRectangle myProjectedViewExtent;
   QgsRectangle myProjectedLayerExtent;

Modified: trunk/qgis/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp	2011-03-19 17:40:19 UTC (rev 15538)
+++ trunk/qgis/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp	2011-03-19 20:27:59 UTC (rev 15539)
@@ -178,7 +178,7 @@
 {
   QString symbolName;
   QgsSymbolV2* symbol;
-  QgsVectorColorRampV2* ramp;
+  QgsVectorColorRampV2 *ramp = 0;
   QModelIndex index;
   bool isSymbol = true;
   bool prompt = true;


Property changes on: trunk/qgis/src/plugins/spatialquery/CMakeLists.txt
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/README
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.cpp
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsmngprogressbar.h
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.cpp
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsreaderfeatures.h
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.cpp
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsrubberselectid.h
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialquery.cpp
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialquery.h
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.cpp
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialog.h
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.qrc
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.cpp
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.h
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/select.png
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/selectadd.png
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/selectesubsetlayer.png
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/plugins/spatialquery/selectremove.png
___________________________________________________________________
Deleted: svn:executable
   - *

Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui	2011-03-19 17:40:19 UTC (rev 15538)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui	2011-03-19 20:27:59 UTC (rev 15539)
@@ -1433,7 +1433,7 @@
              <property name="title">
               <string>Coordinate Reference System for new layers</string>
              </property>
-             <layout class="QGridLayout" name="gridLayout">
+             <layout class="QGridLayout" name="gridLayout_23">
               <item row="0" column="0" colspan="3">
                <widget class="QLabel" name="label_8">
                 <property name="text">

Modified: trunk/qgis/src/ui/qgsrendererrulepropsdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsrendererrulepropsdialogbase.ui	2011-03-19 17:40:19 UTC (rev 15538)
+++ trunk/qgis/src/ui/qgsrendererrulepropsdialogbase.ui	2011-03-19 20:27:59 UTC (rev 15539)
@@ -17,7 +17,7 @@
    <item>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
-      <widget class="QLabel" name="label">
+      <widget class="QLabel" name="label_1">
        <property name="text">
         <string>Label</string>
        </property>
@@ -27,7 +27,7 @@
       <widget class="QLineEdit" name="editLabel"/>
      </item>
      <item row="1" column="0">
-      <widget class="QLabel" name="label">
+      <widget class="QLabel" name="label_5">
        <property name="text">
         <string>Filter</string>
        </property>

Deleted: trunk/qgis/tools/qgiscommit
===================================================================
--- trunk/qgis/tools/qgiscommit	2011-03-19 17:40:19 UTC (rev 15538)
+++ trunk/qgis/tools/qgiscommit	2011-03-19 20:27:59 UTC (rev 15539)
@@ -1,114 +0,0 @@
-#!/bin/sh
-# $Id$
-#
-
-# sanity check to insure that the user invoked this from somewhere within
-# the qgis source hieararchy
-
-if [ ! -f CVS/Repository -a ! `grep qgis CVS/Root` ]; then
-        echo "You are not in a qgis source directory!"
-        exit -1
-fi
-
-#
-# Get Changes
-#
-
-# This will hold the diffs between what's to be checked in and currently in the repository.
-TMPFILE=`mktemp /tmp/qgis-commit-tmp.XXXXXXXXXX`
-
-echo "************************************************************" > ${TMPFILE}
-echo "Please write above that line of stars! Rest will be removed." >> ${TMPFILE}
-
-cvs diff $@ 2> /dev/null | sed -e "/^?/d" -e "/^Index: /d" >> ${TMPFILE}
-
-if [ $? -ne 0 ]; then 
-  echo cvs diff failed;
-  rm $TMPFILE;
-  exit -2
-fi
-
-${EDITOR} ${TMPFILE}
-
-if [ $? -ne 0 ]; then 
-  echo edit session failed;
-  rm $TMPFILE;
-  exit -3
-fi
-
-#
-# Increment the extra version number in the configure.in; also add the message along
-# with the version number to the ChangeLog.
-#
-
-# find out where the top directory is
-WAY2ROOT="`dirname $PWD | sed -e 's#\(.*\)\/qgis.*#\1#'`/qgis"
-
-# if we're not already in the top directory, push the current directory on stack and 
-# cd to the top directory
-if [ "a${WAY2ROOT}" != "a" ]; then
-	pushd $WAY2ROOT > /dev/null
-fi
-
-# The top level directory *should* contain a configure.in; if not, then something went
-# horribly awry.
-if [ ! -f configure.in ]; then
-	popd
-	echo "Not in qgis top directory!"
-        rm $TMPFILE
-	exit -4
-fi
-
-# Get the user's sourceforge username.
-NAME=`sed -e 's/.*:\([^:]*\)@.*/\1/' CVS/Root`
-
-MAJOR_VERSION=`sed -n -e 's/MAJOR_VERSION=//p' configure.in`
-MINOR_VERSION=`sed -n -e 's/MINOR_VERSION=//p' configure.in`
-MICRO_VERSION=`sed -n -e 's/MICRO_VERSION=//p' configure.in`
-EXTRA_VERSION=`sed -n -e 's/EXTRA_VERSION=//p' configure.in`
-
-
-# I *think* this means that if the user *didn't* specify any files, then add in
-# the ChangeLog and configure.in.  
-# XXX I'm not sure why this should be done.
-
-if [ "a$@" != "a" ]; then
-	EXTRAS="$WAY2ROOT/ChangeLog $WAY2ROOT/configure.in"
-else
-	EXTRAS=""
-fi
-
-#
-# Change Extra Version
-#
-
-# increment extra version in configure.in
-
-NEXTRA_VERSION=`expr ${EXTRA_VERSION} + 1`
-sed -e "/EXTRA_VERSION=/s/${EXTRA_VERSION}/${NEXTRA_VERSION}/" configure.in > configure.in.tmp
-mv configure.in.tmp configure.in
-
-
-CLINES=`wc -l ChangeLog | awk '{print $1}'`
-DIFFLINES=`expr $CLINES - 4`
-DATE=`date +%F`
-MSG=`sed -e '/\*\{20\}/,$d' ${TMPFILE}`
-
-head -n 5 ChangeLog > ChangeLog.tmp
-echo "${DATE} [${NAME}] ${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}devel${NEXTRA_VERSION}" >> ChangeLog.tmp
-echo "${MSG}" >> ChangeLog.tmp
-tail -n $DIFFLINES ChangeLog >> ChangeLog.tmp
-mv ChangeLog.tmp ChangeLog
-
-#
-# Commit
-#
-
-if [ "a${WAY2ROOT}" != "a" ]; then
-	popd
-fi
-
-cvs commit -m "${MSG}" $@ ${EXTRAS}
-
-rm ${TMPFILE}
-

More information about the QGIS-commit mailing list