diff --git a/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp b/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp index 4de4423e2ba..5cb2cdadf40 100644 --- 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 index 9c061447f6d..a661b2125e5 100644 --- 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); }