sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix compile errors

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@10111 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2009-02-05 14:25:51 +00:00
parent 2057f63428
commit 60d323f780
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
View File

@ -213,7 +213,7 @@ void QgsDelimitedTextPluginGui::updateFieldLists()
// put a few more lines into the sample box
int counter = 0;
line = QgsDelimitedTextPluginGui::readLine( stream );
while ( not line.isEmpty() && ( counter < 20 ) )
while ( !line.isEmpty() && ( counter < 20 ) )
{
txtSample->insertPlainText( line + "\n" );
counter++;
@ -273,15 +273,15 @@ QString QgsDelimitedTextPluginGui::readLine( QTextStream & stream )
// Strip leading newlines
c = stream.read( 1 );
if ( c == NULL or c.size() == 0 )
if ( c == NULL || c.size() == 0 )
{
// Reach end of file
return buffer;
}
while ( c == (char *)"\r" or c == (char *)"\n" )
while ( c == (char *)"\r" || c == (char *)"\n" )
{
c = stream.read( 1 );
if ( c == NULL or c.size() == 0 )
if ( c == NULL || c.size() == 0 )
{
// Reach end of file
return buffer;
@ -292,18 +292,18 @@ QString QgsDelimitedTextPluginGui::readLine( QTextStream & stream )
buffer.append( c );
c = stream.read( 1 );
if ( c == NULL or c.size() == 0 )
if ( c == NULL || c.size() == 0 )
{
// Reach end of file
return buffer;
}
while ( not ( c == (char *)"\r" or c == (char *)"\n" ) )
while ( !( c == (char *)"\r" || c == (char *)"\n" ) )
{
buffer.append( c );
c = stream.read( 1 );
if ( c == NULL or c.size() == 0 )
if ( c == NULL || c.size() == 0 )
{
// Reach end of file
return buffer;

8
src/plugins/georeferencer/mapcoordsdialog.cpp
View File

@ -21,10 +21,10 @@
MapCoordsDialog::MapCoordsDialog()
{
this->setWindowFlags(!Qt::Dialog);
this->setWindowFlags(Qt::WindowSystemMenuHint);
this->setWindowFlags(Qt::WindowMinimizeButtonHint);
this->setWindowFlags(Qt::WindowMaximizeButtonHint);
// setWindowFlags(!Qt::Dialog);
setWindowFlags(Qt::WindowSystemMenuHint);
setWindowFlags(Qt::WindowMinimizeButtonHint);
setWindowFlags(Qt::WindowMaximizeButtonHint);
}