Skip to content
Permalink
Browse files
automatic indentation update (r12600-r13658)
git-svn-id: http://svn.osgeo.org/qgis/trunk@13659 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jun 5, 2010
1 parent cf5de48 commit 8696c2fc51301111d0190636130f8591e1985cb0
Showing with 623 additions and 621 deletions.
  1. +178 −178 python/plugins/GdalTools/tools/dialogSettings.ui
  2. +3 −3 src/analysis/interpolation/Vector3D.h
  3. +1 −1 src/app/ogr/qgsogrsublayersdialog.cpp
  4. +4 −4 src/app/ogr/qgsvectorlayersaveasdialog.cpp
  5. +1 −1 src/app/ogr/qgsvectorlayersaveasdialog.h
  6. +1 −1 src/app/qgspluginmanager.cpp
  7. +1 −1 src/app/qgswmssourceselect.cpp
  8. +23 −23 src/core/qgspluginlayerregistry.cpp
  9. +1 −1 src/core/qgsproviderregistry.cpp
  10. +3 −3 src/core/qgsvectorfilewriter.cpp
  11. +8 −8 src/core/symbology-ng/qgsrendererv2registry.cpp
  12. +4 −4 src/core/symbology-ng/qgsrendererv2registry.h
  13. +13 −13 src/core/symbology-ng/qgssymbollayerv2registry.h
  14. +2 −2 src/core/symbology/qgssymbol.cpp
  15. +1 −1 src/gui/qgsprojectbadlayerguihandler.h
  16. +1 −1 src/plugins/georeferencer/qgsmapcoordsdialog.cpp
  17. +2 −2 src/plugins/gps_importer/qgsgpsplugin.cpp
  18. +7 −6 src/plugins/grass/qgis.g.browser.cpp
  19. +1 −1 src/plugins/grass/qgsgrassedittools.cpp
  20. +1 −1 src/plugins/grass/qgsgrassmapcalc.h
  21. +3 −3 src/plugins/grass/qgsgrassmodel.cpp
  22. +3 −3 src/plugins/grass/qgsgrassmodule.h
  23. +3 −3 src/plugins/grass/qgsgrassplugin.cpp
  24. +3 −3 src/plugins/grass/qgsgrassselect.cpp
  25. +1 −1 src/plugins/grass/qgsgrassshell.cpp
  26. +4 −3 src/plugins/grass/qgsgrasstools.cpp
  27. +1 −1 src/plugins/oracle_raster/qgsoracleconnect_ui.cpp
  28. +318 −318 src/plugins/spatialquery/qgsspatialquerydialogbase.ui
  29. +2 −2 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  30. +4 −4 src/providers/grass/qgis.d.rast.c
  31. +3 −3 src/python/qgspythonutilsimpl.cpp
  32. +1 −1 src/python/qgspythonutilsimpl.h
  33. +21 −21 tests/src/core/testqgssearchstring.cpp
@@ -1,178 +1,178 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>GdalToolsSettingsDialog</class>
<widget class="QDialog" name="GdalToolsSettingsDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>397</width>
<height>286</height>
</rect>
</property>
<property name="windowTitle">
<string>Gdal Tools settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Path to the GDAL binaries</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="leGdalBinPath"/>
</item>
<item>
<widget class="QPushButton" name="btnSetBinPath">
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>GDAL data path</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLineEdit" name="leGdalDataPath">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnSetDataPath">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>GDAL driver path</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLineEdit" name="leGdalDriverPath">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnSetDriverPath">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>GDAL pymod path</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLineEdit" name="leGdalPythonPath">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnSetPythonPath">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>GdalToolsSettingsDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>GdalToolsSettingsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>GdalToolsSettingsDialog</class>
<widget class="QDialog" name="GdalToolsSettingsDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>397</width>
<height>286</height>
</rect>
</property>
<property name="windowTitle">
<string>Gdal Tools settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Path to the GDAL binaries</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="leGdalBinPath"/>
</item>
<item>
<widget class="QPushButton" name="btnSetBinPath">
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>GDAL data path</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLineEdit" name="leGdalDataPath">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnSetDataPath">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>GDAL driver path</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLineEdit" name="leGdalDriverPath">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnSetDriverPath">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>GDAL pymod path</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLineEdit" name="leGdalPythonPath">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnSetPythonPath">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>GdalToolsSettingsDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>GdalToolsSettingsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>
@@ -24,9 +24,9 @@
#endif

class ANALYSIS_EXPORT Vector3D
/**
Class Vector3D represents a 3D-Vector, capable to store x-,y- and z-coordinates in double values. In fact, the class is the same as Point3D. The name 'vector' makes it easier to understand the programs.
*/
/**
Class Vector3D represents a 3D-Vector, capable to store x-,y- and z-coordinates in double values. In fact, the class is the same as Point3D. The name 'vector' makes it easier to understand the programs.
*/

{
protected:
@@ -23,7 +23,7 @@ QgsOGRSublayersDialog::QgsOGRSublayersDialog( QWidget* parent, Qt::WFlags fl )
: QDialog( parent, fl )
{
setupUi( this );
QStringList labels = QStringList() << tr("Layer ID") << tr("Layer name") << tr("Nb of features") << tr("Geometry type");
QStringList labels = QStringList() << tr( "Layer ID" ) << tr( "Layer name" ) << tr( "Nb of features" ) << tr( "Geometry type" );
layersTable->setHeaderLabels( labels );
}

0 comments on commit 8696c2f

Please sign in to comment.