Skip to content

Commit 1961fea

Browse files
author
g_j_m
committed
Remove Qt3 stuff
Change #includes to Qt4 form Remove unnecessary #includes git-svn-id: http://svn.osgeo.org/qgis/trunk@5750 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 7c7acf5 commit 1961fea

File tree

10 files changed

+199
-256
lines changed

10 files changed

+199
-256
lines changed

‎src/plugins/georeferencer/mapcoordsdialog.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#include <qlineedit.h>
2-
#include <qvalidator.h>
3-
1+
#include <QValidator>
42
#include <mapcoordsdialog.h>
53

64

‎src/plugins/georeferencer/plugin.cpp‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,6 @@
4646
#include <qgsmaplayer.h>
4747
#include <qgsrasterlayer.h>
4848
#include "plugin.h"
49-
#include <q3toolbar.h>
50-
#include <qmenubar.h>
51-
#include <qmessagebox.h>
52-
#include <q3popupmenu.h>
53-
#include <qlineedit.h>
54-
#include <qaction.h>
55-
#include <qapplication.h>
56-
#include <qcursor.h>
57-
#include <QMenu>
58-
//
59-
//non qt includes
60-
//
61-
#include <iostream>
6249

6350
//
6451
//the gui subclass

‎src/plugins/georeferencer/plugin.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@
5050
//
5151
//QT Includes
5252
//
53-
#include <qwidget.h>
54-
#include <Q3ToolBar>
53+
#include <QWidget>
5554

5655
/**
5756
* \class Plugin
@@ -103,8 +102,6 @@ public slots:
103102
////////////////////////////////////////////////////////////////////
104103

105104
int mPluginType;
106-
//! Pointer to our toolbar
107-
Q3ToolBar *mToolBarPointer;
108105
//! Pionter to QGIS main application object
109106
QgisApp *mQGisApp;
110107
//! Pointer to the QGIS interface object

‎src/plugins/georeferencer/pluginguibase.ui‎

Lines changed: 53 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -25,78 +25,33 @@
2525
<property name="spacing" >
2626
<number>6</number>
2727
</property>
28-
<item row="1" column="3" >
29-
<widget class="QLineEdit" name="leSelectRaster" >
30-
<property name="sizePolicy" >
31-
<sizepolicy>
32-
<hsizetype>7</hsizetype>
33-
<vsizetype>0</vsizetype>
34-
<horstretch>0</horstretch>
35-
<verstretch>0</verstretch>
36-
</sizepolicy>
37-
</property>
38-
</widget>
39-
</item>
40-
<item row="1" column="4" >
41-
<widget class="QPushButton" name="pbnSelectRaster" >
42-
<property name="sizePolicy" >
43-
<sizepolicy>
44-
<hsizetype>0</hsizetype>
45-
<vsizetype>0</vsizetype>
46-
<horstretch>0</horstretch>
47-
<verstretch>0</verstretch>
48-
</sizepolicy>
49-
</property>
50-
<property name="text" >
51-
<string>...</string>
52-
</property>
53-
</widget>
54-
</item>
55-
<item row="2" column="3" colspan="2" >
56-
<widget class="QPushButton" name="pbnEnterWorldCoords" >
28+
<item row="1" column="2" >
29+
<widget class="QLabel" name="textLabel1" >
5730
<property name="text" >
58-
<string>Enter world coordinates</string>
31+
<string>Raster file:</string>
5932
</property>
6033
</widget>
6134
</item>
6235
<item row="0" column="2" colspan="3" >
63-
<widget class="Q3TextEdit" name="teInstructions_2" >
64-
<property name="sizePolicy" >
65-
<sizepolicy>
66-
<hsizetype>7</hsizetype>
67-
<vsizetype>7</vsizetype>
68-
<horstretch>0</horstretch>
69-
<verstretch>6</verstretch>
70-
</sizepolicy>
71-
</property>
72-
<property name="text" >
73-
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style="font-size:11pt;font-family:Tahoma">
74-
&lt;p style="margin-top:16px" dir="ltr">&lt;span style="font-size:14pt;font-weight:600">Description&lt;/span>&lt;/p>
75-
&lt;p dir="ltr">This plugin can generate world files for rasters. You select points on the raster and give their world coordinates, and the plugin will compute the world file parameters. The more coordinates you can provide the better the result will be.&lt;/p>
76-
&lt;/body>&lt;/html>
77-
</string>
78-
</property>
79-
<property name="wordWrap" >
80-
<enum>Q3TextEdit::WidgetWidth</enum>
36+
<widget class="QTextEdit" name="textEdit" >
37+
<property name="html" >
38+
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:11pt; font-weight:600;">Description&lt;/span>&lt;/p>&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This plugin can generate world files for rasters. You select points on the raster and give their world coordinates, and the plugin will compute the world file parameters. The more coordinates you can provide the better the result will be.&lt;/p>&lt;/body>&lt;/html></string>
8139
</property>
8240
</widget>
8341
</item>
84-
<item rowspan="3" row="0" column="1" >
85-
<widget class="Line" name="line1" >
42+
<item rowspan="3" row="0" column="0" >
43+
<widget class="QLabel" name="pixmapLabel2" >
8644
<property name="maximumSize" >
8745
<size>
88-
<width>2</width>
46+
<width>150</width>
8947
<height>32767</height>
9048
</size>
9149
</property>
92-
<property name="frameShape" >
93-
<enum>QFrame::VLine</enum>
94-
</property>
95-
<property name="frameShadow" >
96-
<enum>QFrame::Sunken</enum>
50+
<property name="pixmap" >
51+
<pixmap resource="georeferencer.qrc" >:/georef.png</pixmap>
9752
</property>
98-
<property name="orientation" >
99-
<enum>Qt::Vertical</enum>
53+
<property name="scaledContents" >
54+
<bool>true</bool>
10055
</property>
10156
</widget>
10257
</item>
@@ -133,42 +88,63 @@
13388
</item>
13489
</layout>
13590
</item>
136-
<item rowspan="3" row="0" column="0" >
137-
<widget class="QLabel" name="pixmapLabel2" >
91+
<item rowspan="3" row="0" column="1" >
92+
<widget class="Line" name="line1" >
13893
<property name="maximumSize" >
13994
<size>
140-
<width>150</width>
95+
<width>2</width>
14196
<height>32767</height>
14297
</size>
14398
</property>
144-
<property name="pixmap" >
145-
<pixmap resource="georeferencer.qrc" >:/georef.png</pixmap>
99+
<property name="frameShape" >
100+
<enum>QFrame::VLine</enum>
146101
</property>
147-
<property name="scaledContents" >
148-
<bool>true</bool>
102+
<property name="frameShadow" >
103+
<enum>QFrame::Sunken</enum>
104+
</property>
105+
<property name="orientation" >
106+
<enum>Qt::Vertical</enum>
149107
</property>
150108
</widget>
151109
</item>
152-
<item row="1" column="2" >
153-
<widget class="QLabel" name="textLabel1" >
110+
<item row="2" column="3" colspan="2" >
111+
<widget class="QPushButton" name="pbnEnterWorldCoords" >
154112
<property name="text" >
155-
<string>Raster file:</string>
113+
<string>Enter world coordinates</string>
114+
</property>
115+
</widget>
116+
</item>
117+
<item row="1" column="4" >
118+
<widget class="QPushButton" name="pbnSelectRaster" >
119+
<property name="sizePolicy" >
120+
<sizepolicy>
121+
<hsizetype>0</hsizetype>
122+
<vsizetype>0</vsizetype>
123+
<horstretch>0</horstretch>
124+
<verstretch>0</verstretch>
125+
</sizepolicy>
126+
</property>
127+
<property name="text" >
128+
<string>...</string>
129+
</property>
130+
</widget>
131+
</item>
132+
<item row="1" column="3" >
133+
<widget class="QLineEdit" name="leSelectRaster" >
134+
<property name="sizePolicy" >
135+
<sizepolicy>
136+
<hsizetype>7</hsizetype>
137+
<vsizetype>0</vsizetype>
138+
<horstretch>0</horstretch>
139+
<verstretch>0</verstretch>
140+
</sizepolicy>
156141
</property>
157142
</widget>
158143
</item>
159144
</layout>
160145
</widget>
161146
<layoutdefault spacing="6" margin="11" />
162147
<pixmapfunction></pixmapfunction>
163-
<customwidgets>
164-
<customwidget>
165-
<class>Q3TextEdit</class>
166-
<extends></extends>
167-
<header>q3textedit.h</header>
168-
<container>0</container>
169-
<pixmap></pixmap>
170-
</customwidget>
171-
</customwidgets>
172148
<resources>
173149
<include location="georeferencer.qrc" />
174150
</resources>

‎src/plugins/georeferencer/qgsgeorefwarpoptionsdialog.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#include <iostream>
2-
3-
#include <qcheckbox.h>
4-
#include <QComboBox>
51

62
#include "qgsgeorefwarpoptionsdialog.h"
73

‎src/plugins/georeferencer/qgsimagewarper.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define QGSIMAGEWARPER_H
33

44
#include <gdalwarper.h>
5-
#include <qstring.h>
5+
#include <QString>
66

77

88
class QgsImageWarper {

‎src/plugins/georeferencer/qgsleastsquares.cpp‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
#include <gsl/gsl_linalg.h>
55

6+
#include <QObject>
7+
68
#include "qgsleastsquares.h"
79

810

@@ -11,8 +13,8 @@ void QgsLeastSquares::linear(std::vector<QgsPoint> mapCoords,
1113
QgsPoint& origin, double& pixelSize) {
1214
int n = mapCoords.size();
1315
if (n < 2) {
14-
throw std::domain_error("Fit to a linear transform requires at "
15-
"least 2 points.");
16+
throw std::domain_error(QObject::tr("Fit to a linear transform requires at "
17+
"least 2 points.").toLocal8Bit().constData());
1618
}
1719

1820
double sumPx(0), sumPy(0), sumPx2(0), sumPy2(0), sumPxMx(0), sumPyMy(0),
@@ -48,8 +50,8 @@ void QgsLeastSquares::helmert(std::vector<QgsPoint> mapCoords,
4850
double& rotation) {
4951
int n = mapCoords.size();
5052
if (n < 2) {
51-
throw std::domain_error("Fit to a Helmert transform requires at "
52-
"least 2 points.");
53+
throw std::domain_error(QObject::tr("Fit to a Helmert transform requires at "
54+
"least 2 points.").toLocal8Bit().constData());
5355
}
5456

5557
double A = 0, B = 0, C = 0, D = 0, E = 0, F = 0, G = 0, H = 0, I = 0, J = 0;
@@ -100,8 +102,8 @@ void QgsLeastSquares::affine(std::vector<QgsPoint> mapCoords,
100102
std::vector<QgsPoint> pixelCoords) {
101103
int n = mapCoords.size();
102104
if (n < 4) {
103-
throw std::domain_error("Fit to an affine transform requires at "
104-
"least 4 points.");
105+
throw std::domain_error(QObject::tr("Fit to an affine transform requires at "
106+
"least 4 points.").toLocal8Bit().constData());
105107
}
106108

107109
double A = 0, B = 0, C = 0, D = 0, E = 0, F = 0,

‎src/plugins/georeferencer/qgspointdialog.cpp‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include <cmath>
22

3-
#include <Q3Frame>
43
#include <QPushButton>
54
#include <QComboBox>
65
#include <QFileDialog>
@@ -223,15 +222,15 @@ void QgsPointDialog::on_pbnGenerateAndLoad_clicked()
223222
void QgsPointDialog::on_pbnSelectWorldFile_clicked()
224223
{
225224
QString filename = QFileDialog::getSaveFileName(this,
226-
"Choose a name for the world file", ".");
225+
tr("Choose a name for the world file"), ".");
227226
leSelectWorldFile->setText(filename);
228227
}
229228

230229

231230
void QgsPointDialog::on_pbnSelectModifiedRaster_clicked()
232231
{
233232
QString filename = QFileDialog::getSaveFileName(this,
234-
"Choose a name for the world file", ".");
233+
tr("Choose a name for the world file"), ".");
235234
if (filename.right(4) != ".tif")
236235
filename += ".tif";
237236
leSelectModifiedRaster->setText(filename);
@@ -264,29 +263,29 @@ bool QgsPointDialog::generateWorldFile()
264263
}
265264
else if (cmbTransformType->currentItem() == 1)
266265
{
267-
int res = QMessageBox::warning(this, "Warning",
268-
"A Helmert transform requires modifications in "
266+
int res = QMessageBox::warning(this, tr("Warning"),
267+
tr("A Helmert transform requires modifications in "
269268
"the raster layer.\nThe modifed raster will be "
270269
"saved in a new file and a world file will be "
271270
"generated for this new file instead.\nAre you "
272-
"sure that this is what you want?",
271+
"sure that this is what you want?"),
273272
QMessageBox::No, QMessageBox::Yes);
274273
if (res == QMessageBox::No)
275274
return false;
276275
QgsLeastSquares::helmert(mapCoords, pixelCoords, origin, pixelSize, rotation);
277276
}
278277
else if (cmbTransformType->currentItem() == 2)
279278
{
280-
QMessageBox::critical(this, "Not implemented!",
281-
"An affine transform requires changing the "
279+
QMessageBox::critical(this, tr("Not implemented!"),
280+
tr("An affine transform requires changing the "
282281
"original raster file. This is not yet "
283-
"supported.");
282+
"supported."));
284283
return false;
285284
}
286285
}
287286
catch (std::domain_error& e)
288287
{
289-
QMessageBox::critical(this, "Error", QString(e.what()));
288+
QMessageBox::critical(this, tr("Error"), QString(e.what()));
290289
return false;
291290
}
292291

@@ -308,8 +307,8 @@ bool QgsPointDialog::generateWorldFile()
308307
QFile file(leSelectWorldFile->text());
309308
if (!file.open(QIODevice::WriteOnly))
310309
{
311-
QMessageBox::critical(this, "Error",
312-
"Could not write to " + leSelectWorldFile->text());
310+
QMessageBox::critical(this, tr("Error"),
311+
tr("Could not write to ") + leSelectWorldFile->text());
313312
return false;
314313
}
315314
QTextStream stream(&file);

‎src/plugins/georeferencer/qgspointdialog.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414

1515
#include <vector>
1616

17-
#include <qcursor.h>
17+
//#include <QCursor>
18+
#include <QDialog>
1819

1920
#include <qgsmapcanvas.h>
2021

2122
#include "qgsrasterlayer.h"
2223

2324
#include <ui_qgspointdialogbase.h>
24-
#include <QDialog>
2525

2626
class QAction;
2727
class QActionGroup;

0 commit comments

Comments
 (0)