Skip to content

Commit 60d323f

Browse files
author
jef
committed
fix compile errors
git-svn-id: http://svn.osgeo.org/qgis/trunk@10111 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 2057f63 commit 60d323f

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ void QgsDelimitedTextPluginGui::updateFieldLists()
213213
// put a few more lines into the sample box
214214
int counter = 0;
215215
line = QgsDelimitedTextPluginGui::readLine( stream );
216-
while ( not line.isEmpty() && ( counter < 20 ) )
216+
while ( !line.isEmpty() && ( counter < 20 ) )
217217
{
218218
txtSample->insertPlainText( line + "\n" );
219219
counter++;
@@ -273,15 +273,15 @@ QString QgsDelimitedTextPluginGui::readLine( QTextStream & stream )
273273
// Strip leading newlines
274274

275275
c = stream.read( 1 );
276-
if ( c == NULL or c.size() == 0 )
276+
if ( c == NULL || c.size() == 0 )
277277
{
278278
// Reach end of file
279279
return buffer;
280280
}
281-
while ( c == (char *)"\r" or c == (char *)"\n" )
281+
while ( c == (char *)"\r" || c == (char *)"\n" )
282282
{
283283
c = stream.read( 1 );
284-
if ( c == NULL or c.size() == 0 )
284+
if ( c == NULL || c.size() == 0 )
285285
{
286286
// Reach end of file
287287
return buffer;
@@ -292,18 +292,18 @@ QString QgsDelimitedTextPluginGui::readLine( QTextStream & stream )
292292
buffer.append( c );
293293

294294
c = stream.read( 1 );
295-
if ( c == NULL or c.size() == 0 )
295+
if ( c == NULL || c.size() == 0 )
296296
{
297297
// Reach end of file
298298
return buffer;
299299
}
300300

301-
while ( not ( c == (char *)"\r" or c == (char *)"\n" ) )
301+
while ( !( c == (char *)"\r" || c == (char *)"\n" ) )
302302
{
303303

304304
buffer.append( c );
305305
c = stream.read( 1 );
306-
if ( c == NULL or c.size() == 0 )
306+
if ( c == NULL || c.size() == 0 )
307307
{
308308
// Reach end of file
309309
return buffer;

src/plugins/georeferencer/mapcoordsdialog.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121

2222
MapCoordsDialog::MapCoordsDialog()
2323
{
24-
this->setWindowFlags(!Qt::Dialog);
25-
this->setWindowFlags(Qt::WindowSystemMenuHint);
26-
this->setWindowFlags(Qt::WindowMinimizeButtonHint);
27-
this->setWindowFlags(Qt::WindowMaximizeButtonHint);
24+
// setWindowFlags(!Qt::Dialog);
25+
setWindowFlags(Qt::WindowSystemMenuHint);
26+
setWindowFlags(Qt::WindowMinimizeButtonHint);
27+
setWindowFlags(Qt::WindowMaximizeButtonHint);
2828
}
2929

3030

0 commit comments

Comments
 (0)