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

src/plugins/delimited_text/qgsdelimitedtextplugin.cpp

@@ -28,16 +28,8 @@
 #include "qgsdelimitedtextplugin.h"
 
 
-#include <q3toolbar.h>
-#include <qmenubar.h>
-#include <qmessagebox.h>
-#include <q3popupmenu.h>
-#include <qlineedit.h>
-#include <qaction.h>
-#include <qapplication.h>
-#include <qcursor.h>
-#include <q3whatsthis.h>
-#include <qglobal.h>
+#include <QMenu>
+#include <QAction>
 
 //non qt includes
 #include <iostream>
@@ -117,11 +109,7 @@ void QgsDelimitedTextPlugin::initGui()
       "X and Y fields are required and must contain coordinates in decimal units.");
 
   // Create the action for tool
-#if QT_VERSION < 0x040000
-  myQActionPointer = new QAction("Add Delimited Text Layer", QIcon(icon), "&Wmi",0, this, "run");
-#else
   myQActionPointer = new QAction(QIcon(icon), "Add Delimited Text Layer", this);
-#endif
 
   myQActionPointer->setWhatsThis("Add a delimited text file as a map layer. "
       "The file must have a header row containing the field names. "

src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp

@@ -13,22 +13,20 @@
  ***************************************************************************/
 /* $Id$ */
 #include <iostream>
-#include <QFileDialog>
-#include <qlineedit.h>
-#include <q3textedit.h>
-#include <qfile.h>
-#include <QComboBox>
-#include <qpushbutton.h>
-#include <qsettings.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
-#include <qmessagebox.h>
 #include "qgsdelimitedtextplugingui.h"
 #include "qgscontexthelp.h"
-//Added by qt3to4:
-#include <QTextStream>
+
 #include "qgisiface.h"
 
+#include <QFileDialog>
+#include <QFile>
+#include <QComboBox>
+#include <QSettings>
+#include <QFileInfo>
+#include <QRegExp>
+#include <QMessageBox>
+#include <QTextStream>
+
 QgsDelimitedTextPluginGui::QgsDelimitedTextPluginGui() : QDialog()
 {
   setupUi(this);

src/plugins/delimited_text/qgsdelimitedtextplugingui.h

@@ -15,7 +15,6 @@
 
 #include "ui_qgsdelimitedtextpluginguibase.h"
 
-#include <QDialog>
 class QgisIface;
 
 /**

src/plugins/geoprocessing/qgsdlgpgbuffer.cpp

@@ -22,7 +22,6 @@
 
 #include "qgsdlgpgbuffer.h"
 #include "qgscontexthelp.h"
-#include <qspinbox.h>
 #include "qgisiface.h"
 
 QgsDlgPgBuffer::QgsDlgPgBuffer( QgisIface * _qI, QWidget * parent, Qt::WFlags fl)