fix compile errors

git-svn-id: http://svn.osgeo.org/qgis/trunk@10111 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 5, 2009 · 60d323f · 60d323f
1 parent 2057f63
commit 60d323f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp b/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
@@ -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;

diff --git a/src/plugins/georeferencer/mapcoordsdialog.cpp b/src/plugins/georeferencer/mapcoordsdialog.cpp
@@ -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);
 }