Fix warnings

m-kuhn · m-kuhn · commit ba0bed00fac9 · 2012-09-05T16:06:47.000+02:00
diff --git a/src/core/diagram/qgspiediagram.cpp b/src/core/diagram/qgspiediagram.cpp
@@ -31,6 +31,7 @@ QgsPieDiagram::~QgsPieDiagram()
 
 QSizeF QgsPieDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is )
 {
+  Q_UNUSED( c );
   QgsAttributeMap::const_iterator attIt = attributes.find( is.classificationAttribute );
   if ( attIt == attributes.constEnd() )
   {
@@ -74,6 +75,8 @@ QSizeF QgsPieDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsR
 
 QSizeF QgsPieDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s )
 {
+  Q_UNUSED( c );
+  Q_UNUSED( attributes );
   return s.size;
 }
 
diff --git a/src/core/diagram/qgstextdiagram.cpp b/src/core/diagram/qgstextdiagram.cpp
@@ -32,7 +32,10 @@ QgsTextDiagram::~QgsTextDiagram()
 
 QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is )
 {
-    QgsAttributeMap::const_iterator attIt = attributes.find( is.classificationAttribute );
+  Q_UNUSED( c );
+
+  QgsAttributeMap::const_iterator attIt = attributes.find( is.classificationAttribute );
+
   if ( attIt == attributes.constEnd() )
   {
     return QSizeF(); //zero size if attribute is missing
@@ -74,8 +77,11 @@ QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const Qgs
 }
 
 QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s )
-{
-  return s.size;
+{  
+  Q_UNUSED( c );
+	Q_UNUSED( attributes );
+
+	return s.size;
 }
 
 void QgsTextDiagram::renderDiagram( const QgsAttributeMap& att, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position )
diff --git a/src/ui/qgsdiagrampropertiesbase.ui b/src/ui/qgsdiagrampropertiesbase.ui
@@ -11,6 +11,9 @@
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QGroupBox" name="mDisplayDiagramsGroupBox">
      <property name="title">
@@ -36,8 +39,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>742</width>
-           <height>610</height>
+           <width>756</width>
+           <height>627</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="scrollAreaLayout">
@@ -121,8 +124,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>708</width>
-               <height>278</height>
+               <width>723</width>
+               <height>356</height>
               </rect>
              </property>
              <attribute name="label">
@@ -331,8 +334,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>708</width>
-               <height>239</height>
+               <width>640</width>
+               <height>289</height>
               </rect>
              </property>
              <attribute name="label">
@@ -520,8 +523,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>165</width>
-               <height>220</height>
+               <width>216</width>
+               <height>284</height>
               </rect>
              </property>
              <attribute name="label">
@@ -682,8 +685,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>109</width>
-               <height>151</height>
+               <width>137</width>
+               <height>191</height>
               </rect>
              </property>
              <attribute name="label">
@@ -747,7 +750,7 @@
                     <bool>true</bool>
                    </property>
                    <attribute name="buttonGroup">
-                    <string>mOrientationButtonGroup</string>
+                    <string notr="true">mOrientationButtonGroup</string>
                    </attribute>
                   </widget>
                  </item>
@@ -757,7 +760,7 @@
                     <string>Down</string>
                    </property>
                    <attribute name="buttonGroup">
-                    <string>mOrientationButtonGroup</string>
+                    <string notr="true">mOrientationButtonGroup</string>
                    </attribute>
                   </widget>
                  </item>
@@ -767,7 +770,7 @@
                     <string>Right</string>
                    </property>
                    <attribute name="buttonGroup">
-                    <string>mOrientationButtonGroup</string>
+                    <string notr="true">mOrientationButtonGroup</string>
                    </attribute>
                   </widget>
                  </item>
@@ -777,7 +780,7 @@
                     <string>Left</string>
                    </property>
                    <attribute name="buttonGroup">
-                    <string>mOrientationButtonGroup</string>
+                    <string notr="true">mOrientationButtonGroup</string>
                    </attribute>
                   </widget>
                  </item>

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ QgsPieDiagram::~QgsPieDiagram()`
`31`	`31`
`32`	`32`	`QSizeF QgsPieDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is )`
`33`	`33`	`{`
	`34`	`+ Q_UNUSED( c );`
`34`	`35`	`QgsAttributeMap::const_iterator attIt = attributes.find( is.classificationAttribute );`
`35`	`36`	`if ( attIt == attributes.constEnd() )`
`36`	`37`	`{`
`@@ -74,6 +75,8 @@ QSizeF QgsPieDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsR`
`74`	`75`
`75`	`76`	`QSizeF QgsPieDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s )`
`76`	`77`	`{`
	`78`	`+ Q_UNUSED( c );`
	`79`	`+ Q_UNUSED( attributes );`
`77`	`80`	`return s.size;`
`78`	`81`	`}`
`79`	`82`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,10 @@ QgsTextDiagram::~QgsTextDiagram()`
`32`	`32`
`33`	`33`	`QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is )`
`34`	`34`	`{`
`35`		`- QgsAttributeMap::const_iterator attIt = attributes.find( is.classificationAttribute );`
	`35`	`+ Q_UNUSED( c );`
	`36`	`+`
	`37`	`+ QgsAttributeMap::const_iterator attIt = attributes.find( is.classificationAttribute );`
	`38`	`+`
`36`	`39`	`if ( attIt == attributes.constEnd() )`
`37`	`40`	`{`
`38`	`41`	`return QSizeF(); //zero size if attribute is missing`
`@@ -74,8 +77,11 @@ QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const Qgs`
`74`	`77`	`}`
`75`	`78`
`76`	`79`	`QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s )`
`77`		`-{`
`78`		`- return s.size;`
	`80`	`+{`
	`81`	`+ Q_UNUSED( c );`
	`82`	`+ Q_UNUSED( attributes );`
	`83`	`+`
	`84`	`+ return s.size;`
`79`	`85`	`}`
`80`	`86`
`81`	`87`	`void QgsTextDiagram::renderDiagram( const QgsAttributeMap& att, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position )`