[QGIS Commit] r11832 - in trunk/qgis/src: app app/legend ui

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-10-24 16:33:40 -0400 (Sat, 24 Oct 2009)
New Revision: 11832

Removed:
   trunk/qgis/src/app/qgstable.h
Modified:
   trunk/qgis/src/app/legend/qgslegendlayerfile.cpp
   trunk/qgis/src/app/qgsmeasuredialog.cpp
   trunk/qgis/src/ui/qgsoptionsbase.ui
Log:
fix warnings

Modified: trunk/qgis/src/app/legend/qgslegendlayerfile.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegendlayerfile.cpp	2009-10-24 13:30:36 UTC (rev 11831)
+++ trunk/qgis/src/app/legend/qgslegendlayerfile.cpp	2009-10-24 20:33:40 UTC (rev 11832)
@@ -48,7 +48,7 @@
     : QgsLegendItem( theLegendItem, theString ), mLyr( theLayer )
 {
   // Set the initial visibility flag for layers
-  // This user option allows the user to turn off inital drawing of
+  // This user option allows the user to turn off initial drawing of
   // layers when they are added to the map. This is useful when adding
   // many layers and the user wants to adjusty symbology, etc prior to
   // actually viewing the layer.

Modified: trunk/qgis/src/app/qgsmeasuredialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsmeasuredialog.cpp	2009-10-24 13:30:36 UTC (rev 11831)
+++ trunk/qgis/src/app/qgsmeasuredialog.cpp	2009-10-24 20:33:40 UTC (rev 11832)
@@ -208,6 +208,8 @@
     case QGis::Feet:
       mTable->setHeaderLabels( QStringList( tr( "Segments (in feet)" ) ) );
       break;
+    case Qgis::DegreesMinutesSeconds:
+    case Qgis::DegreesMinutesMinutes:
     case QGis::Degrees:
       mTable->setHeaderLabels( QStringList( tr( "Segments (in degrees)" ) ) );
       break;

Deleted: trunk/qgis/src/app/qgstable.h
===================================================================
--- trunk/qgis/src/app/qgstable.h	2009-10-24 13:30:36 UTC (rev 11831)
+++ trunk/qgis/src/app/qgstable.h	2009-10-24 20:33:40 UTC (rev 11832)
@@ -1,38 +0,0 @@
-/***************************************************************************
-                          qgstable.h  -  description
-                             -------------------
-    begin                : Sun Jun 30 2002
-    copyright            : (C) 2002 by Gary E.Sherman
-    email                : sherman at mrcc.com
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-/* $Id$ */
-
-#ifndef QGSTABLE_H
-#define QGSTABLE_H
-
-#include "qgsdatasource.h"
-
-/*! \class QgsTable
- * \brief Class to represent an attribute table related
- * to a map layer of any type
- */
-
-class QgsTable : public QgsDataSource
-{
-  public:
-    //! Constructor
-    QgsTable();
-    //! Destructor
-    ~QgsTable();
-};
-
-#endif

Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui	2009-10-24 13:30:36 UTC (rev 11831)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui	2009-10-24 20:33:40 UTC (rev 11832)
@@ -13,7 +13,9 @@
    <string>Options</string>
   </property>
   <property name="windowIcon" >
-   <iconset/>
+   <iconset>
+    <normaloff/>
+   </iconset>
   </property>
   <property name="sizeGripEnabled" >
    <bool>true</bool>