Skip to content

Commit 0c57c55

Browse files
author
g_j_m
committed
Move some debugging output to QgsLogger::debug
Remove unnecessary #includes Move from Qt3 to Qt4 style of includes git-svn-id: http://svn.osgeo.org/qgis/trunk@5785 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 7b05bca commit 0c57c55

File tree

6 files changed

+32
-39
lines changed

6 files changed

+32
-39
lines changed

src/plugins/grid_maker/graticulecreator.cpp

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
#include "graticulecreator.h"
2+
23
#include <stdio.h>
34
#include <cassert>
4-
#include <qtextstream.h>
55
#include <iostream>
66
#include <fstream>
7-
#include <qfileinfo.h>
8-
#include <qstringlist.h>
7+
8+
#include <QTextStream>
9+
#include <QFileInfo>
10+
#include <QStringList>
11+
912
#include <qgis.h>
13+
#include <qgslogger.h>
14+
1015
GraticuleCreator::GraticuleCreator(QString theOutputFileName,ShapeType theType)
1116
{
12-
std::cout << "GraticuleCreator constructor called with " << theOutputFileName.toLocal8Bit().data()
13-
<< " for output file " << std::endl;
17+
QgsLogger::debug("GraticuleCreator constructor called with " +
18+
theOutputFileName + " for output file ");
1419
/* Open and prepare output files */
1520
createDbf(theOutputFileName);
1621
createShapeFile(theOutputFileName,theType);
@@ -80,7 +85,7 @@ void GraticuleCreator::writeDbfRecord ( int theRecordIdInt, QString theLabel)
8085
std::cerr << "DBFWriteStringAttribute failed. : " << theRecordIdInt << " - " << theLabel.toLocal8Bit().data() <<std::endl;
8186
//exit(ERR_DBFWRITEINTEGERATTRIBUTE);
8287
}
83-
std::cerr << " - OK! " << std::endl;
88+
QgsLogger::debug(" - OK! ");
8489
}
8590
//DBFWriteIntegerAttribute(mDbfHandle, theRecordIdInt, 0, theRecordIdInt);
8691
//DBFWriteStringAttribute(mDbfHandle, theRecordIdInt, 1, theLabel);

src/plugins/grid_maker/graticulecreator.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#include "utils.h"
66

77
//qt includes
8-
#include <qstring.h>
9-
#include <qfile.h>
8+
#include <QString>
9+
//#include <qfile.h>
1010

1111
class GraticuleCreator
1212
{

src/plugins/grid_maker/main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
#include <qgsconfig.h>
33
#endif
44

5-
#include <stdio.h>
6-
#include <stdlib.h>
5+
#include <cstdio>
6+
#include <cstdlib>
77
#include "plugingui.h"
8-
#include <qapplication.h>
9-
#include <qtextcodec.h>
10-
#include <qtranslator.h>
8+
9+
#include <QApplication>
10+
#include <QTranslator>
1111
#include <QString>
1212

1313
int main(int argc, char *argv[])

src/plugins/grid_maker/plugin.cpp

+1-10
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,7 @@ email : tim@linfiniti.com
2727
#include "qgsmaplayer.h"
2828
#include "plugin.h"
2929

30-
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 <qglobal.h>
30+
#include <QAction>
4031

4132
//non qt includes
4233
#include <iostream>

src/plugins/grid_maker/plugin.h

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#ifndef QGSGRIDMAKERPLUGIN
2121
#define QGSGRIDMAKERPLUGIN
2222
#include "../qgisplugin.h"
23-
#include <qwidget.h>
2423
#include <qgisapp.h>
2524

2625
/**

src/plugins/grid_maker/plugingui.cpp

+13-15
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
#include "plugingui.h"
1313

1414
//qt includes
15-
#include <qpushbutton.h>
16-
#include <qlineedit.h>
1715
#include <QFileDialog>
18-
#include <qmessagebox.h>
19-
#include <qfile.h>
20-
#include <qradiobutton.h>
16+
#include <QMessageBox>
17+
2118
#include "graticulecreator.h"
19+
#include <qgslogger.h>
20+
2221
//standard includes
2322
#include <iostream>
2423

@@ -38,15 +37,14 @@ void QgsGridMakerPluginGui::on_pbnOK_clicked()
3837
{
3938
//check input file exists
4039
//
41-
std::cout << "GrativuleCreator called with: " <<
42-
leOutputShapeFile->text().toLocal8Bit().data() <<
43-
leLongitudeInterval->text().toLocal8Bit().data() <<
44-
leLatitudeInterval->text().toLocal8Bit().data() <<
45-
leOriginLongitude->text().toLocal8Bit().data() <<
46-
leOriginLatitude->text().toLocal8Bit().data() <<
47-
leEndPointLongitude->text().toLocal8Bit().data() <<
48-
leEndPointLatitude->text().toLocal8Bit().data()
49-
<< std::endl;
40+
QgsLogger::debug("GrativuleCreator called with: " +
41+
leOutputShapeFile->text() + " " +
42+
leLongitudeInterval->text() + " " +
43+
leLatitudeInterval->text() + " " +
44+
leOriginLongitude->text() + " " +
45+
leOriginLatitude->text() + " " +
46+
leEndPointLongitude->text() + " " +
47+
leEndPointLatitude->text());
5048

5149
if (leOutputShapeFile->text().isEmpty())
5250
{
@@ -158,7 +156,7 @@ void QgsGridMakerPluginGui::on_pbnOK_clicked()
158156

159157
void QgsGridMakerPluginGui::on_pbnSelectOutputFile_clicked()
160158
{
161-
std::cout << " Gps File Importer Gui::pbnSelectOutputFile_clicked() " << std::endl;
159+
QgsLogger::debug(" Gps File Importer Gui::pbnSelectOutputFile_clicked()");
162160
QString myOutputFileNameQString = QFileDialog::getSaveFileName(
163161
this,
164162
tr("Choose a filename to save under"),

0 commit comments

Comments
 (0)