fixes clang and gcc misleading indentation warnings

replace tabs with spaces; another cause of misleading indentation

change back

change back

change back

Author: psi29a

src/osg/Texture2DArray.cpp

@@ -372,10 +372,10 @@ void Texture2DArray::apply(State& state) const
             }
             else
             {
-            // Override compressed source format with safe GL_RGBA value which not generate error
-            // We can safely do this as source format is not important when source data is NULL
-            if( isCompressedInternalFormat( sourceFormat ) )
-                sourceFormat = GL_RGBA;
+                // Override compressed source format with safe GL_RGBA value which not generate error
+                // We can safely do this as source format is not important when source data is NULL
+                if( isCompressedInternalFormat( sourceFormat ) )
+                    sourceFormat = GL_RGBA;
 
                 extensions->glTexImage3D( GL_TEXTURE_2D_ARRAY, 0, _internalFormat,
                          _textureWidth, _textureHeight, textureDepth, _borderWidth,

src/osgPlugins/osc/osc/OscReceivedElements.cpp

@@ -61,8 +61,8 @@ static inline const char* FindStr4End( const char *p, const char *end )
     if( p >= end )
         return 0;
 
-	if( p[0] == '\0' )    // special case for SuperCollider integer address pattern
-		return p + 4;
+    if( p[0] == '\0' )    // special case for SuperCollider integer address pattern
+        return p + 4;
 
     p += 3;
     end -= 1;

src/osgPlugins/txp/trpage_material.cpp

@@ -243,19 +243,20 @@ bool trpgMatTable::Read(trpgReadBuffer &buf)
         buf.Get(nMat);
         if (nTable <= 0 || nMat < 0) throw 1;
         // Read the materials
-        for (i=0;i<nTable;i++)
+        for (i=0;i<nTable;i++) {
             for (j=0;j<nMat;j++) {
-                buf.GetToken(matTok,len);
+                buf.GetToken(matTok, len);
                 if (matTok != TRPGMATERIAL) throw 1;
                 buf.PushLimit(len);
                 mat.Reset();
                 status = mat.Read(buf);
                 buf.PopLimit();
                 if (!status) throw 1;
-                AddMaterial(mat,false);
+                AddMaterial(mat, false);
             }
-            numTable += nTable;
-            numMat = materialMap.size();
+        }
+        numTable += nTable;
+        numMat = materialMap.size();
     }
     catch (...) {
         return false;

src/osgPlugins/zip/unzip.cpp

@@ -3486,15 +3486,12 @@ int unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
 	uLong pos_in_central_dirSaved;
 
 
-	if (file==NULL)
-		return UNZ_PARAMERROR;
+	if (file==NULL) return UNZ_PARAMERROR;
 
-    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
-        return UNZ_PARAMERROR;
+	if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP) return UNZ_PARAMERROR;
 
 	s=(unz_s*)file;
-	if (!s->current_file_ok)
-		return UNZ_END_OF_LIST_OF_FILE;
+	if (!s->current_file_ok) return UNZ_END_OF_LIST_OF_FILE;
 
 	num_fileSaved = s->num_file;
 	pos_in_central_dirSaved = s->pos_in_central_dir;
@@ -3540,12 +3537,12 @@ int unzlocal_CheckCurrentFileCoherencyHeader (unz_s *s,uInt *piSizeVar,
 
 
 	if (err==UNZ_OK)
-        {
+	{
 		if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK)
 			err=UNZ_ERRNO;
 		else if (uMagic!=0x04034b50)
 			err=UNZ_BADZIPFILE;
-        }
+	}
 
 	if (unzlocal_getShort(s->file,&uData) != UNZ_OK)
 		err=UNZ_ERRNO;
@@ -3559,17 +3556,16 @@ int unzlocal_CheckCurrentFileCoherencyHeader (unz_s *s,uInt *piSizeVar,
 	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
 		err=UNZ_BADZIPFILE;
 
-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
-                         (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
+	if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) && (s->cur_file_info.compression_method!=Z_DEFLATED)) {
+		err = UNZ_BADZIPFILE;
+	}
 
 	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) // date/time
 		err=UNZ_ERRNO;
 
 	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) // crc
 		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
-		                      ((uFlags & 8)==0))
+	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && ((uFlags & 8)==0))
 		err=UNZ_BADZIPFILE;
 
 	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) // size compr
@@ -3625,8 +3621,9 @@ int unzOpenCurrentFile (unzFile file, const char *password)
 	if (!s->current_file_ok)
 		return UNZ_PARAMERROR;
 
-    if (s->pfile_in_zip_read != NULL)
-        unzCloseCurrentFile(file);
+	if (s->pfile_in_zip_read != NULL) {
+		unzCloseCurrentFile(file);
+	}
 
 	if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
 				&offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)

src/osgText/Text.cpp

@@ -367,7 +367,7 @@ String::iterator Text::computeLastCharacterOnLine(osg::Vec2& cursor, String::ite
                 return lastValidChar;
 
             // Subtract off glyphs from the cursor position (to correctly center text)
-                if(*prevChar != '-')
+            if(*prevChar != '-')
             {
                 Glyph* glyph = activefont->getGlyph(_fontSize, *prevChar);
                 if (glyph)

src/osgText/Text3D.cpp

@@ -207,7 +207,7 @@ String::iterator Text3D::computeLastCharacterOnLine(osg::Vec2& cursor, String::i
                 return lastValidChar;
 
             // Subtract off glyphs from the cursor position (to correctly center text)
-                if(*prevChar != '-')
+            if(*prevChar != '-')
             {
                 Glyph3D* glyph = _font->getGlyph3D(_fontSize, *prevChar);
                 if (glyph)

src/osgViewer/DarwinUtils.mm

@@ -43,26 +43,24 @@ -(void) setDisplaySettings: (osg::DisplaySettings*) display_settings
 -(void) hide
 {
     if(_displaySettings.valid()) _menubarBehavior = _displaySettings->getOSXMenubarBehavior();
-    
-    if (_menubarBehavior == osg::DisplaySettings::MENUBAR_FORCE_SHOW)
-        return;
-    
+
+    if (_menubarBehavior == osg::DisplaySettings::MENUBAR_FORCE_SHOW) return;
+
     #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
         NSApplicationPresentationOptions options;
         switch(_menubarBehavior) {
             case osg::DisplaySettings::MENUBAR_AUTO_HIDE:
                 options = NSApplicationPresentationAutoHideMenuBar | NSApplicationPresentationAutoHideDock;
                 break;
-            
+
             case osg::DisplaySettings::MENUBAR_FORCE_HIDE:
                 options = NSApplicationPresentationHideMenuBar | NSApplicationPresentationHideDock;
                 break;
-            
+
             default:
                 options = NSApplicationPresentationDefault;
-                
         }
-    
+
         [[NSApplication sharedApplication] setPresentationOptions: options];
     #else
         SystemUIMode mode = kUIModeAllHidden;