Skip to content

Commit b541da5

Browse files
author
jef
committedJun 5, 2010
automatic indentation update (r12600-r13658)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13659 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 3f3efa0 commit b541da5

33 files changed

+623
-621
lines changed
 

‎python/plugins/GdalTools/tools/dialogSettings.ui

Lines changed: 178 additions & 178 deletions
Original file line numberDiff line numberDiff line change
@@ -1,178 +1,178 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<ui version="4.0">
3-
<class>GdalToolsSettingsDialog</class>
4-
<widget class="QDialog" name="GdalToolsSettingsDialog">
5-
<property name="geometry">
6-
<rect>
7-
<x>0</x>
8-
<y>0</y>
9-
<width>397</width>
10-
<height>286</height>
11-
</rect>
12-
</property>
13-
<property name="windowTitle">
14-
<string>Gdal Tools settings</string>
15-
</property>
16-
<layout class="QVBoxLayout" name="verticalLayout">
17-
<item>
18-
<widget class="QLabel" name="label">
19-
<property name="text">
20-
<string>Path to the GDAL binaries</string>
21-
</property>
22-
</widget>
23-
</item>
24-
<item>
25-
<layout class="QHBoxLayout" name="horizontalLayout">
26-
<item>
27-
<widget class="QLineEdit" name="leGdalBinPath"/>
28-
</item>
29-
<item>
30-
<widget class="QPushButton" name="btnSetBinPath">
31-
<property name="text">
32-
<string>Browse</string>
33-
</property>
34-
</widget>
35-
</item>
36-
</layout>
37-
</item>
38-
<item>
39-
<widget class="QLabel" name="label_2">
40-
<property name="enabled">
41-
<bool>false</bool>
42-
</property>
43-
<property name="text">
44-
<string>GDAL data path</string>
45-
</property>
46-
</widget>
47-
</item>
48-
<item>
49-
<layout class="QHBoxLayout" name="horizontalLayout_2">
50-
<item>
51-
<widget class="QLineEdit" name="leGdalDataPath">
52-
<property name="enabled">
53-
<bool>false</bool>
54-
</property>
55-
</widget>
56-
</item>
57-
<item>
58-
<widget class="QPushButton" name="btnSetDataPath">
59-
<property name="enabled">
60-
<bool>false</bool>
61-
</property>
62-
<property name="text">
63-
<string>Browse</string>
64-
</property>
65-
</widget>
66-
</item>
67-
</layout>
68-
</item>
69-
<item>
70-
<widget class="QLabel" name="label_3">
71-
<property name="enabled">
72-
<bool>false</bool>
73-
</property>
74-
<property name="text">
75-
<string>GDAL driver path</string>
76-
</property>
77-
</widget>
78-
</item>
79-
<item>
80-
<layout class="QHBoxLayout" name="horizontalLayout_3">
81-
<item>
82-
<widget class="QLineEdit" name="leGdalDriverPath">
83-
<property name="enabled">
84-
<bool>false</bool>
85-
</property>
86-
</widget>
87-
</item>
88-
<item>
89-
<widget class="QPushButton" name="btnSetDriverPath">
90-
<property name="enabled">
91-
<bool>false</bool>
92-
</property>
93-
<property name="text">
94-
<string>Browse</string>
95-
</property>
96-
</widget>
97-
</item>
98-
</layout>
99-
</item>
100-
<item>
101-
<widget class="QLabel" name="label_4">
102-
<property name="enabled">
103-
<bool>false</bool>
104-
</property>
105-
<property name="text">
106-
<string>GDAL pymod path</string>
107-
</property>
108-
</widget>
109-
</item>
110-
<item>
111-
<layout class="QHBoxLayout" name="horizontalLayout_4">
112-
<item>
113-
<widget class="QLineEdit" name="leGdalPythonPath">
114-
<property name="enabled">
115-
<bool>false</bool>
116-
</property>
117-
</widget>
118-
</item>
119-
<item>
120-
<widget class="QPushButton" name="btnSetPythonPath">
121-
<property name="enabled">
122-
<bool>false</bool>
123-
</property>
124-
<property name="text">
125-
<string>Browse</string>
126-
</property>
127-
</widget>
128-
</item>
129-
</layout>
130-
</item>
131-
<item>
132-
<widget class="QDialogButtonBox" name="buttonBox">
133-
<property name="orientation">
134-
<enum>Qt::Horizontal</enum>
135-
</property>
136-
<property name="standardButtons">
137-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
138-
</property>
139-
</widget>
140-
</item>
141-
</layout>
142-
</widget>
143-
<resources/>
144-
<connections>
145-
<connection>
146-
<sender>buttonBox</sender>
147-
<signal>accepted()</signal>
148-
<receiver>GdalToolsSettingsDialog</receiver>
149-
<slot>accept()</slot>
150-
<hints>
151-
<hint type="sourcelabel">
152-
<x>248</x>
153-
<y>254</y>
154-
</hint>
155-
<hint type="destinationlabel">
156-
<x>157</x>
157-
<y>274</y>
158-
</hint>
159-
</hints>
160-
</connection>
161-
<connection>
162-
<sender>buttonBox</sender>
163-
<signal>rejected()</signal>
164-
<receiver>GdalToolsSettingsDialog</receiver>
165-
<slot>reject()</slot>
166-
<hints>
167-
<hint type="sourcelabel">
168-
<x>316</x>
169-
<y>260</y>
170-
</hint>
171-
<hint type="destinationlabel">
172-
<x>286</x>
173-
<y>274</y>
174-
</hint>
175-
</hints>
176-
</connection>
177-
</connections>
178-
</ui>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>GdalToolsSettingsDialog</class>
4+
<widget class="QDialog" name="GdalToolsSettingsDialog">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>397</width>
10+
<height>286</height>
11+
</rect>
12+
</property>
13+
<property name="windowTitle">
14+
<string>Gdal Tools settings</string>
15+
</property>
16+
<layout class="QVBoxLayout" name="verticalLayout">
17+
<item>
18+
<widget class="QLabel" name="label">
19+
<property name="text">
20+
<string>Path to the GDAL binaries</string>
21+
</property>
22+
</widget>
23+
</item>
24+
<item>
25+
<layout class="QHBoxLayout" name="horizontalLayout">
26+
<item>
27+
<widget class="QLineEdit" name="leGdalBinPath"/>
28+
</item>
29+
<item>
30+
<widget class="QPushButton" name="btnSetBinPath">
31+
<property name="text">
32+
<string>Browse</string>
33+
</property>
34+
</widget>
35+
</item>
36+
</layout>
37+
</item>
38+
<item>
39+
<widget class="QLabel" name="label_2">
40+
<property name="enabled">
41+
<bool>false</bool>
42+
</property>
43+
<property name="text">
44+
<string>GDAL data path</string>
45+
</property>
46+
</widget>
47+
</item>
48+
<item>
49+
<layout class="QHBoxLayout" name="horizontalLayout_2">
50+
<item>
51+
<widget class="QLineEdit" name="leGdalDataPath">
52+
<property name="enabled">
53+
<bool>false</bool>
54+
</property>
55+
</widget>
56+
</item>
57+
<item>
58+
<widget class="QPushButton" name="btnSetDataPath">
59+
<property name="enabled">
60+
<bool>false</bool>
61+
</property>
62+
<property name="text">
63+
<string>Browse</string>
64+
</property>
65+
</widget>
66+
</item>
67+
</layout>
68+
</item>
69+
<item>
70+
<widget class="QLabel" name="label_3">
71+
<property name="enabled">
72+
<bool>false</bool>
73+
</property>
74+
<property name="text">
75+
<string>GDAL driver path</string>
76+
</property>
77+
</widget>
78+
</item>
79+
<item>
80+
<layout class="QHBoxLayout" name="horizontalLayout_3">
81+
<item>
82+
<widget class="QLineEdit" name="leGdalDriverPath">
83+
<property name="enabled">
84+
<bool>false</bool>
85+
</property>
86+
</widget>
87+
</item>
88+
<item>
89+
<widget class="QPushButton" name="btnSetDriverPath">
90+
<property name="enabled">
91+
<bool>false</bool>
92+
</property>
93+
<property name="text">
94+
<string>Browse</string>
95+
</property>
96+
</widget>
97+
</item>
98+
</layout>
99+
</item>
100+
<item>
101+
<widget class="QLabel" name="label_4">
102+
<property name="enabled">
103+
<bool>false</bool>
104+
</property>
105+
<property name="text">
106+
<string>GDAL pymod path</string>
107+
</property>
108+
</widget>
109+
</item>
110+
<item>
111+
<layout class="QHBoxLayout" name="horizontalLayout_4">
112+
<item>
113+
<widget class="QLineEdit" name="leGdalPythonPath">
114+
<property name="enabled">
115+
<bool>false</bool>
116+
</property>
117+
</widget>
118+
</item>
119+
<item>
120+
<widget class="QPushButton" name="btnSetPythonPath">
121+
<property name="enabled">
122+
<bool>false</bool>
123+
</property>
124+
<property name="text">
125+
<string>Browse</string>
126+
</property>
127+
</widget>
128+
</item>
129+
</layout>
130+
</item>
131+
<item>
132+
<widget class="QDialogButtonBox" name="buttonBox">
133+
<property name="orientation">
134+
<enum>Qt::Horizontal</enum>
135+
</property>
136+
<property name="standardButtons">
137+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
138+
</property>
139+
</widget>
140+
</item>
141+
</layout>
142+
</widget>
143+
<resources/>
144+
<connections>
145+
<connection>
146+
<sender>buttonBox</sender>
147+
<signal>accepted()</signal>
148+
<receiver>GdalToolsSettingsDialog</receiver>
149+
<slot>accept()</slot>
150+
<hints>
151+
<hint type="sourcelabel">
152+
<x>248</x>
153+
<y>254</y>
154+
</hint>
155+
<hint type="destinationlabel">
156+
<x>157</x>
157+
<y>274</y>
158+
</hint>
159+
</hints>
160+
</connection>
161+
<connection>
162+
<sender>buttonBox</sender>
163+
<signal>rejected()</signal>
164+
<receiver>GdalToolsSettingsDialog</receiver>
165+
<slot>reject()</slot>
166+
<hints>
167+
<hint type="sourcelabel">
168+
<x>316</x>
169+
<y>260</y>
170+
</hint>
171+
<hint type="destinationlabel">
172+
<x>286</x>
173+
<y>274</y>
174+
</hint>
175+
</hints>
176+
</connection>
177+
</connections>
178+
</ui>

‎src/analysis/interpolation/Vector3D.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
#endif
2525

2626
class ANALYSIS_EXPORT Vector3D
27-
/**
28-
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.
29-
*/
27+
/**
28+
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.
29+
*/
3030

3131
{
3232
protected:

‎src/app/ogr/qgsogrsublayersdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ QgsOGRSublayersDialog::QgsOGRSublayersDialog( QWidget* parent, Qt::WFlags fl )
2323
: QDialog( parent, fl )
2424
{
2525
setupUi( this );
26-
QStringList labels = QStringList() << tr("Layer ID") << tr("Layer name") << tr("Nb of features") << tr("Geometry type");
26+
QStringList labels = QStringList() << tr( "Layer ID" ) << tr( "Layer name" ) << tr( "Nb of features" ) << tr( "Geometry type" );
2727
layersTable->setHeaderLabels( labels );
2828
}
2929

0 commit comments

Comments
 (0)
Please sign in to comment.