[Scummvm-cvs-logs] SF.net SVN: scummvm:[49859] scummvm/trunk/common

[fingolfin at users.sourceforge.net]

Revision: 49859
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49859&view=rev
Author:   fingolfin
Date:     2010-06-15 15:39:59 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
Code formatting

Modified Paths:
--------------
    scummvm/trunk/common/translation.cpp
    scummvm/trunk/common/translation.h

Modified: scummvm/trunk/common/translation.cpp
===================================================================
--- scummvm/trunk/common/translation.cpp	2010-06-15 15:02:52 UTC (rev 49858)
+++ scummvm/trunk/common/translation.cpp	2010-06-15 15:39:59 UTC (rev 49859)
@@ -49,7 +49,7 @@
 TranslationManager::TranslationManager() {
 #ifdef DETECTLANG
 	// Activating current locale settings
-	const char* locale = setlocale(LC_ALL, "");
+	const char *locale = setlocale(LC_ALL, "");
 
 	// Detect the language from the locale
 	if (!locale) {
@@ -82,7 +82,7 @@
 #endif // TERMCONV
 }
 
-void TranslationManager::setLanguage(const char* lang) {
+void TranslationManager::setLanguage(const char *lang) {
 	if (*lang == '\0')
 		po2c_setlang(_syslang);
 	else
@@ -90,10 +90,10 @@
 
 #ifdef TERMCONV
 	// Get the locale character set (for terminal output)
-	const char* charset_term = nl_langinfo(CODESET);
+	const char *charset_term = nl_langinfo(CODESET);
 
 	// Get the messages character set
-	const char* charset_po = po2c_getcharset();
+	const char *charset_po = po2c_getcharset();
 
 	// Delete previous conversion
 	if (_conversion)
@@ -104,23 +104,23 @@
 #endif // TERMCONV
 }
 
-const char* TranslationManager::getTranslation(const char* message) {
+const char *TranslationManager::getTranslation(const char *message) {
 	return po2c_gettext(message);
 }
 
 #ifdef TERMCONV
-bool TranslationManager::convert(const char* message) {
+bool TranslationManager::convert(const char *message) {
 	// Preparing conversion origin
 	size_t len = strlen(message);
-	char* msgcpy = new char[len + 1];
+	char *msgcpy = new char[len + 1];
 	strcpy(msgcpy, message);
-	char* msg = msgcpy;
-	char** pmsg = &msg;
+	char *msg = msgcpy;
+	char **pmsg = &msg;
 
 	// Preparing conversion destination
 	size_t len2 = _sizeconv;
 	char *conv = _convmsg;
-	char** pconv = &conv;
+	char **pconv = &conv;
 
 	// Clean previous conversions
 	iconv(_conversion, NULL, NULL, pconv, &len2);
@@ -134,7 +134,7 @@
 }
 #endif // TERMCONV
 
-const char* TranslationManager::convertTerm(const char* message) {
+const char *TranslationManager::convertTerm(const char *message) {
 #ifdef TERMCONV
 	size_t len = strlen(message);
 	if (!_convmsg) {
@@ -206,13 +206,13 @@
 
 TranslationManager::~TranslationManager() {}
 
-void TranslationManager::setLanguage(const char* lang) {}
+void TranslationManager::setLanguage(const char *lang) {}
 
-const char* TranslationManager::getTranslation(const char* message) {
+const char *TranslationManager::getTranslation(const char *message) {
 	return message;
 }
 
-const char* TranslationManager::convertTerm(const char* message) {
+const char *TranslationManager::convertTerm(const char *message) {
 	return message;
 }
 

Modified: scummvm/trunk/common/translation.h
===================================================================
--- scummvm/trunk/common/translation.h	2010-06-15 15:02:52 UTC (rev 49858)
+++ scummvm/trunk/common/translation.h	2010-06-15 15:39:59 UTC (rev 49859)
@@ -65,10 +65,10 @@
 
 #ifdef TERMCONV
 	iconv_t _conversion;
-	char* _convmsg;
+	char *_convmsg;
 	int _sizeconv;
 
-	bool convert(const char* message);
+	bool convert(const char *message);
 #endif // TERMCONV
 
 public:
@@ -98,13 +98,13 @@
 	 * message. In case the message isn't found in the translation catalog,
 	 * it returns the original untranslated message.
 	 */
-	const char* getTranslation(const char* message);
+	const char *getTranslation(const char *message);
 
 	/**
 	 * Converts the message into the terminal character set (which may be
 	 * different than the GUI's "native" one.
 	 */
-	const char* convertTerm(const char* message);
+	const char *convertTerm(const char *message);
 
 	const TLangArray getSupportedLanguages() const;
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.