[QGIS Commit] r10111 - in trunk/qgis/src/plugins: delimited_text georeferencer

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-02-05 09:25:51 -0500 (Thu, 05 Feb 2009)
New Revision: 10111

Modified:
   trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
   trunk/qgis/src/plugins/georeferencer/mapcoordsdialog.cpp
Log:
fix compile errors

Modified: trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
===================================================================
--- trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp	2009-02-05 12:08:40 UTC (rev 10110)
+++ trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp	2009-02-05 14:25:51 UTC (rev 10111)
@@ -213,7 +213,7 @@
       // 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 @@
   // 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 @@
   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;

Modified: trunk/qgis/src/plugins/georeferencer/mapcoordsdialog.cpp
===================================================================
--- trunk/qgis/src/plugins/georeferencer/mapcoordsdialog.cpp	2009-02-05 12:08:40 UTC (rev 10110)
+++ trunk/qgis/src/plugins/georeferencer/mapcoordsdialog.cpp	2009-02-05 14:25:51 UTC (rev 10111)
@@ -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);
 }