Skip to content

Commit 9432742

Browse files
author
g_j_m
committedJan 29, 2006
Remove unnecessary Qt3 #includes and rename remaining to Qt4 form
git-svn-id: http://svn.osgeo.org/qgis/trunk@4778 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b7a7d3f commit 9432742

File tree

4 files changed

+12
-28
lines changed

4 files changed

+12
-28
lines changed
 

‎src/plugins/delimited_text/qgsdelimitedtextplugin.cpp

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,8 @@
2828
#include "qgsdelimitedtextplugin.h"
2929

3030

31-
#include <q3toolbar.h>
32-
#include <qmenubar.h>
33-
#include <qmessagebox.h>
34-
#include <q3popupmenu.h>
35-
#include <qlineedit.h>
36-
#include <qaction.h>
37-
#include <qapplication.h>
38-
#include <qcursor.h>
39-
#include <q3whatsthis.h>
40-
#include <qglobal.h>
31+
#include <QMenu>
32+
#include <QAction>
4133

4234
//non qt includes
4335
#include <iostream>
@@ -117,11 +109,7 @@ void QgsDelimitedTextPlugin::initGui()
117109
"X and Y fields are required and must contain coordinates in decimal units.");
118110

119111
// Create the action for tool
120-
#if QT_VERSION < 0x040000
121-
myQActionPointer = new QAction("Add Delimited Text Layer", QIcon(icon), "&Wmi",0, this, "run");
122-
#else
123112
myQActionPointer = new QAction(QIcon(icon), "Add Delimited Text Layer", this);
124-
#endif
125113

126114
myQActionPointer->setWhatsThis("Add a delimited text file as a map layer. "
127115
"The file must have a header row containing the field names. "

‎src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,20 @@
1313
***************************************************************************/
1414
/* $Id$ */
1515
#include <iostream>
16-
#include <QFileDialog>
17-
#include <qlineedit.h>
18-
#include <q3textedit.h>
19-
#include <qfile.h>
20-
#include <QComboBox>
21-
#include <qpushbutton.h>
22-
#include <qsettings.h>
23-
#include <qfileinfo.h>
24-
#include <qregexp.h>
25-
#include <qmessagebox.h>
2616
#include "qgsdelimitedtextplugingui.h"
2717
#include "qgscontexthelp.h"
28-
//Added by qt3to4:
29-
#include <QTextStream>
18+
3019
#include "qgisiface.h"
3120

21+
#include <QFileDialog>
22+
#include <QFile>
23+
#include <QComboBox>
24+
#include <QSettings>
25+
#include <QFileInfo>
26+
#include <QRegExp>
27+
#include <QMessageBox>
28+
#include <QTextStream>
29+
3230
QgsDelimitedTextPluginGui::QgsDelimitedTextPluginGui() : QDialog()
3331
{
3432
setupUi(this);

‎src/plugins/delimited_text/qgsdelimitedtextplugingui.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
#include "ui_qgsdelimitedtextpluginguibase.h"
1717

18-
#include <QDialog>
1918
class QgisIface;
2019

2120
/**

‎src/plugins/geoprocessing/qgsdlgpgbuffer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#include "qgsdlgpgbuffer.h"
2424
#include "qgscontexthelp.h"
25-
#include <qspinbox.h>
2625
#include "qgisiface.h"
2726

2827
QgsDlgPgBuffer::QgsDlgPgBuffer( QgisIface * _qI, QWidget * parent, Qt::WFlags fl)

0 commit comments

Comments
 (0)
Please sign in to comment.