log message whitespace fixes (#7114)

danomatika · web-flow · commit 977cbf3797a1 · 2022-09-30T08:39:35.000-07:00
diff --git a/libs/openFrameworks/app/ofAppEGLWindow.cpp b/libs/openFrameworks/app/ofAppEGLWindow.cpp
@@ -1745,7 +1745,7 @@ void ofAppEGLWindow::processInput(int fd, const char * node){
 				axisValuePending = true;
 				break;
 			default:
-				ofLogNotice("ofAppEGLWindow") << "readMouseEvents(): unknown mouse axis (perhaps it's the scroll wheel?) : axis " << axis << " amount " << amount << endl;
+				ofLogNotice("ofAppEGLWindow") << "readMouseEvents(): unknown mouse axis (perhaps it's the scroll wheel?): axis " << axis << " amount " << amount << endl;
 				break;
 			}
 		}else if (ev.type == EV_ABS){
@@ -1803,7 +1803,7 @@ void ofAppEGLWindow::processInput(int fd, const char * node){
 					touchAxisValuePending = true;
 					break;
 				default:
-					ofLogNotice("ofAppEGLWindow") << "EV_ABS unknown axis : axis " << axis << " amount " << amount << endl;
+					ofLogNotice("ofAppEGLWindow") << "EV_ABS unknown axis: axis " << axis << " amount " << amount << endl;
 					break;
 			}
 		}else if(ev.type == EV_MSC){
diff --git a/libs/openFrameworks/app/ofAppGLFWWindow.cpp b/libs/openFrameworks/app/ofAppGLFWWindow.cpp
@@ -357,7 +357,7 @@ void ofAppGLFWWindow::setup(const ofGLFWWindowSettings & _settings){
 	}
 #endif
 
-	ofLogVerbose() << "GL Version:" << glGetString(GL_VERSION);
+	ofLogVerbose() << "GL Version: " << glGetString(GL_VERSION);
 
 	if(currentRenderer->getType()==ofGLProgrammableRenderer::TYPE){
 #ifndef TARGET_OPENGLES
diff --git a/libs/openFrameworks/gl/ofShader.cpp b/libs/openFrameworks/gl/ofShader.cpp
@@ -590,7 +590,7 @@ void ofShader::checkShaderInfoLog(GLuint shader, GLenum type, ofLogLevel logLeve
 				ofBuffer::Line line = buf.getLines().begin();
 				int  offendingLineNumber = ofToInt(matches[1]);
 				ostringstream msg;
-				msg << "ofShader: " + nameForType(type) + ", offending line " << offendingLineNumber << " :"<< endl;
+				msg << "ofShader: " + nameForType(type) + ", offending line " << offendingLineNumber << ":"<< endl;
 				for(int i=0; line != buf.getLines().end(); line++, i++ ){
 					string s = *line;
 					if ( i >= offendingLineNumber -3 && i < offendingLineNumber + 2 ){
diff --git a/libs/openFrameworks/graphics/ofCairoRenderer.cpp b/libs/openFrameworks/graphics/ofCairoRenderer.cpp
@@ -926,7 +926,7 @@ void ofCairoRenderer::viewport(ofRectangle v){
 void ofCairoRenderer::viewport(float x, float y, float width, float height, bool invertY){
 	if(width < 0) width = originalViewport.width;
 	if(height < 0) height = originalViewport.height;
-    ofLogVerbose("ofCairoRenderer::viewport") << "Setting viewport to:" << width << ", " << height;
+    ofLogVerbose("ofCairoRenderer::viewport") << "Setting viewport to: " << width << ", " << height;
 
 	if (invertY){
 		y = -y;
diff --git a/libs/openFrameworks/graphics/ofImage.cpp b/libs/openFrameworks/graphics/ofImage.cpp
@@ -41,7 +41,7 @@ FREE_IMAGE_TYPE getFreeImageType(const ofShortPixels& pix) {
 		case 3: return FIT_RGB16;
 		case 4: return FIT_RGBA16;
 		default:
-			ofLogError("ofImage") << "getFreeImageType(): unknown FreeImage type for number of channels:" << pix.getNumChannels();
+			ofLogError("ofImage") << "getFreeImageType(): unknown FreeImage type for number of channels: " << pix.getNumChannels();
 			return FIT_UNKNOWN;
 	}
 }
@@ -52,7 +52,7 @@ FREE_IMAGE_TYPE getFreeImageType(const ofFloatPixels& pix) {
 		case 3: return FIT_RGBF;
 		case 4: return FIT_RGBAF;
 		default:
-			ofLogError("ofImage") << "getFreeImageType(): unknown FreeImage type for number of channels:" << pix.getNumChannels();
+			ofLogError("ofImage") << "getFreeImageType(): unknown FreeImage type for number of channels: " << pix.getNumChannels();
 			return FIT_UNKNOWN;
 	}
 }
diff --git a/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp b/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp
@@ -176,14 +176,14 @@ void ofOpenALSoundPlayer::initialize(){
 		alContext = alcCreateContext( alDevice, nullptr );
 		if( !alContext ){
 			ALCenum err = alcGetError( alDevice ); 
-			ofLogError("ofOpenALSoundPlayer") << "initialize(): couldn't not create OpenAL context : "<< getALCErrorString( err );
+			ofLogError("ofOpenALSoundPlayer") << "initialize(): couldn't not create OpenAL context: "<< getALCErrorString( err );
 			close();
 			return;
 		}
 
 		if( alcMakeContextCurrent( alContext )==ALC_FALSE ){
 			ALCenum err = alcGetError( alDevice ); 
-			ofLogError("ofOpenALSoundPlayer") << "initialize(): couldn't not make current the create OpenAL context : "<< getALCErrorString( err );
+			ofLogError("ofOpenALSoundPlayer") << "initialize(): couldn't not make current the create OpenAL context: "<< getALCErrorString( err );
 			close();
 			return;
 		};
@@ -222,7 +222,7 @@ void ofOpenALSoundPlayer::close(){
 			alContext = nullptr;
 		}
 		if( alcCloseDevice( alDevice )==ALC_FALSE ){
-			ofLogNotice("ofOpenALSoundPlayer") << "initialize(): error closing OpenAL device.";
+			ofLogNotice("ofOpenALSoundPlayer") << "initialize(): error closing OpenAL device";
 		}
 		alDevice = nullptr;
 	}
@@ -503,7 +503,7 @@ bool ofOpenALSoundPlayer::load(const std::filesystem::path& _fileName, bool is_s
 		bLoadedOk = stream(fileName, buffer);
 	}
 	if( !bLoadedOk ) {
-		ofLogError("ofOpenALSoundPlayer::load : ERROR loading file from ") << fileName;
+		ofLogError("ofOpenALSoundPlayer") << "loadSound(): couldn't read \"" << fileName << "\"";
 		return false;
 	}
 
@@ -531,7 +531,7 @@ bool ofOpenALSoundPlayer::load(const std::filesystem::path& _fileName, bool is_s
 			alBufferData(buffers[i],format,&buffer[0],buffer.size()*2,samplerate);
 			err = alGetError();
 			if (err != AL_NO_ERROR){
-				ofLogError("ofOpenALSoundPlayer:") << "loadSound(): couldn't create buffer for \"" << fileName << "\": "
+				ofLogError("ofOpenALSoundPlayer") << "loadSound(): couldn't create buffer for \"" << fileName << "\": "
 				<< (int) err << " " << getALErrorString(err);
 				return false;
 			}
diff --git a/libs/openFrameworks/utils/ofFileUtils.cpp b/libs/openFrameworks/utils/ofFileUtils.cpp
@@ -950,7 +950,7 @@ bool ofFile::copyTo(const std::filesystem::path& _path, bool bRelativeToData, bo
 		}
 		std::filesystem::copy_file(myFile,path);
 	}catch(std::exception & except){
-		ofLogError("ofFile") <<  "copyTo(): unable to copy \"" << path << "\":" << except.what();
+		ofLogError("ofFile") <<  "copyTo(): unable to copy \"" << path << "\": " << except.what();
 		return false;
 	}
 
@@ -1008,7 +1008,7 @@ bool ofFile::moveTo(const std::filesystem::path& _path, bool bRelativeToData, bo
 		}
 	}
 	catch(std::exception & except){
-		ofLogError("ofFile") << "moveTo(): unable to move \"" << path << "\":" << except.what();
+		ofLogError("ofFile") << "moveTo(): unable to move \"" << path << "\": " << except.what();
 		return false;
 	}
 
diff --git a/libs/openFrameworks/utils/ofUtils.cpp b/libs/openFrameworks/utils/ofUtils.cpp
@@ -768,7 +768,7 @@ std::locale loc;
 	if( printonce ){
 		std::string current( setlocale(LC_ALL,NULL) );
 		setlocale (LC_ALL,"");
-		ofLogWarning("ofUtils") << "std::locale not supported. Using C locale  :" << current ;
+		ofLogWarning("ofUtils") << "std::locale not supported. Using C locale: " << current ;
 		printonce = false;
 	}
 #else
diff --git a/libs/openFrameworks/utils/ofXml.cpp b/libs/openFrameworks/utils/ofXml.cpp
@@ -23,7 +23,7 @@ bool ofXml::load(const std::filesystem::path & file){
 		xml = doc->root();
 		return true;
 	}else{
-		ofLogWarning("ofXml") << "Cannot load file " << file << ":" << res.description();
+		ofLogWarning("ofXml") << "Cannot load file " << file << ": " << res.description();
 		return false;
 	}
 }
@@ -50,7 +50,7 @@ bool ofXml::parse(const std::string & xmlStr){
 bool ofXml::save(const std::filesystem::path & file) const{
 	if(xml == doc->root()){
 		auto res = doc->save_file(ofToDataPath(file).c_str());
-		ofLogVerbose("ofXml")<<"ofXML Save : "<< res;
+		ofLogVerbose("ofXml")<<"save: "<< res;
 		ofLogVerbose("ofXml")<<this->toString();
 		return res;
 	}else{

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ void ofAppGLFWWindow::setup(const ofGLFWWindowSettings & _settings){`
`357`	`357`	`}`
`358`	`358`	`#endif`
`359`	`359`
`360`		`- ofLogVerbose() << "GL Version:" << glGetString(GL_VERSION);`
	`360`	`+ ofLogVerbose() << "GL Version: " << glGetString(GL_VERSION);`
`361`	`361`
`362`	`362`	`if(currentRenderer->getType()==ofGLProgrammableRenderer::TYPE){`
`363`	`363`	`#ifndef TARGET_OPENGLES`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ FREE_IMAGE_TYPE getFreeImageType(const ofShortPixels& pix) {`
`41`	`41`	`case 3: return FIT_RGB16;`
`42`	`42`	`case 4: return FIT_RGBA16;`
`43`	`43`	`default:`
`44`		`- ofLogError("ofImage") << "getFreeImageType(): unknown FreeImage type for number of channels:" << pix.getNumChannels();`
	`44`	`+ ofLogError("ofImage") << "getFreeImageType(): unknown FreeImage type for number of channels: " << pix.getNumChannels();`
`45`	`45`	`return FIT_UNKNOWN;`
`46`	`46`	`}`
`47`	`47`	`}`
`@@ -52,7 +52,7 @@ FREE_IMAGE_TYPE getFreeImageType(const ofFloatPixels& pix) {`
`52`	`52`	`case 3: return FIT_RGBF;`
`53`	`53`	`case 4: return FIT_RGBAF;`
`54`	`54`	`default:`
`55`		`- ofLogError("ofImage") << "getFreeImageType(): unknown FreeImage type for number of channels:" << pix.getNumChannels();`
	`55`	`+ ofLogError("ofImage") << "getFreeImageType(): unknown FreeImage type for number of channels: " << pix.getNumChannels();`
`56`	`56`	`return FIT_UNKNOWN;`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,14 +176,14 @@ void ofOpenALSoundPlayer::initialize(){`
`176`	`176`	`alContext = alcCreateContext( alDevice, nullptr );`
`177`	`177`	`if( !alContext ){`
`178`	`178`	`ALCenum err = alcGetError( alDevice );`
`179`		`- ofLogError("ofOpenALSoundPlayer") << "initialize(): couldn't not create OpenAL context : "<< getALCErrorString( err );`
	`179`	`+ ofLogError("ofOpenALSoundPlayer") << "initialize(): couldn't not create OpenAL context: "<< getALCErrorString( err );`
`180`	`180`	`close();`
`181`	`181`	`return;`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`if( alcMakeContextCurrent( alContext )==ALC_FALSE ){`
`185`	`185`	`ALCenum err = alcGetError( alDevice );`
`186`		`- ofLogError("ofOpenALSoundPlayer") << "initialize(): couldn't not make current the create OpenAL context : "<< getALCErrorString( err );`
	`186`	`+ ofLogError("ofOpenALSoundPlayer") << "initialize(): couldn't not make current the create OpenAL context: "<< getALCErrorString( err );`
`187`	`187`	`close();`
`188`	`188`	`return;`
`189`	`189`	`};`
`@@ -222,7 +222,7 @@ void ofOpenALSoundPlayer::close(){`
`222`	`222`	`alContext = nullptr;`
`223`	`223`	`}`
`224`	`224`	`if( alcCloseDevice( alDevice )==ALC_FALSE ){`
`225`		`- ofLogNotice("ofOpenALSoundPlayer") << "initialize(): error closing OpenAL device.";`
	`225`	`+ ofLogNotice("ofOpenALSoundPlayer") << "initialize(): error closing OpenAL device";`
`226`	`226`	`}`
`227`	`227`	`alDevice = nullptr;`
`228`	`228`	`}`
`@@ -503,7 +503,7 @@ bool ofOpenALSoundPlayer::load(const std::filesystem::path& _fileName, bool is_s`
`503`	`503`	`bLoadedOk = stream(fileName, buffer);`
`504`	`504`	`}`
`505`	`505`	`if( !bLoadedOk ) {`
`506`		`- ofLogError("ofOpenALSoundPlayer::load : ERROR loading file from ") << fileName;`
	`506`	`+ ofLogError("ofOpenALSoundPlayer") << "loadSound(): couldn't read \"" << fileName << "\"";`
`507`	`507`	`return false;`
`508`	`508`	`}`
`509`	`509`
`@@ -531,7 +531,7 @@ bool ofOpenALSoundPlayer::load(const std::filesystem::path& _fileName, bool is_s`
`531`	`531`	`alBufferData(buffers[i],format,&buffer[0],buffer.size()*2,samplerate);`
`532`	`532`	`err = alGetError();`
`533`	`533`	`if (err != AL_NO_ERROR){`
`534`		`- ofLogError("ofOpenALSoundPlayer:") << "loadSound(): couldn't create buffer for \"" << fileName << "\": "`
	`534`	`+ ofLogError("ofOpenALSoundPlayer") << "loadSound(): couldn't create buffer for \"" << fileName << "\": "`
`535`	`535`	`<< (int) err << " " << getALErrorString(err);`
`536`	`536`	`return false;`
`537`	`537`	`}`
Original file line number	Diff line number	Diff line change
`@@ -950,7 +950,7 @@ bool ofFile::copyTo(const std::filesystem::path& _path, bool bRelativeToData, bo`
`950`	`950`	`}`
`951`	`951`	`std::filesystem::copy_file(myFile,path);`
`952`	`952`	`}catch(std::exception & except){`
`953`		`- ofLogError("ofFile") << "copyTo(): unable to copy \"" << path << "\":" << except.what();`
	`953`	`+ ofLogError("ofFile") << "copyTo(): unable to copy \"" << path << "\": " << except.what();`
`954`	`954`	`return false;`
`955`	`955`	`}`
`956`	`956`
`@@ -1008,7 +1008,7 @@ bool ofFile::moveTo(const std::filesystem::path& _path, bool bRelativeToData, bo`
`1008`	`1008`	`}`
`1009`	`1009`	`}`
`1010`	`1010`	`catch(std::exception & except){`
`1011`		`- ofLogError("ofFile") << "moveTo(): unable to move \"" << path << "\":" << except.what();`
	`1011`	`+ ofLogError("ofFile") << "moveTo(): unable to move \"" << path << "\": " << except.what();`
`1012`	`1012`	`return false;`
`1013`	`1013`	`}`
`1014`	`1014`
Original file line number	Diff line number	Diff line change
`@@ -768,7 +768,7 @@ std::locale loc;`
`768`	`768`	`if( printonce ){`
`769`	`769`	`std::string current( setlocale(LC_ALL,NULL) );`
`770`	`770`	`setlocale (LC_ALL,"");`
`771`		`- ofLogWarning("ofUtils") << "std::locale not supported. Using C locale :" << current ;`
	`771`	`+ ofLogWarning("ofUtils") << "std::locale not supported. Using C locale: " << current ;`
`772`	`772`	`printonce = false;`
`773`	`773`	`}`
`774`	`774`	`#else`