[commit] r1573 - in trunk/GME/XmlBackEnd: . SVNCode

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Oct  3 16:05:00 2011
New Revision: 1573

Log:
Remove static method

Modified:
   trunk/GME/XmlBackEnd/DOMErrorPrinter.cpp
   trunk/GME/XmlBackEnd/MsgConsole.cpp
   trunk/GME/XmlBackEnd/MsgConsole.h
   trunk/GME/XmlBackEnd/SVNCode/Util.cpp

Modified: trunk/GME/XmlBackEnd/DOMErrorPrinter.cpp
==============================================================================
--- trunk/GME/XmlBackEnd/DOMErrorPrinter.cpp	Mon Oct  3 16:04:45 2011	(r1572)
+++ trunk/GME/XmlBackEnd/DOMErrorPrinter.cpp	Mon Oct  3 16:05:00 2011	(r1573)
@@ -26,7 +26,6 @@
 
 	// send msg
 	if( m_consolePtr) m_consolePtr->sendMsg( msg, mt);
-	else               MsgConsole::ssendMsg( msg, mt);
 	
 
 	// location info available?
@@ -42,7 +41,6 @@
 
 		// send msg
 		if( m_consolePtr) m_consolePtr->sendMsg( linfo, mt);
-		else               MsgConsole::ssendMsg( linfo, mt);
 	}
 
     // Instructs the serializer to continue serialization if possible.

Modified: trunk/GME/XmlBackEnd/MsgConsole.cpp
==============================================================================
--- trunk/GME/XmlBackEnd/MsgConsole.cpp	Mon Oct  3 16:04:45 2011	(r1572)
+++ trunk/GME/XmlBackEnd/MsgConsole.cpp	Mon Oct  3 16:05:00 2011	(r1573)
@@ -3,32 +3,23 @@
 
 
 // MsgConsole
-MsgConsole::MsgConsole( bool p_create)
+MsgConsole::MsgConsole(bool p_create)
 {
 	if( p_create)
 		m_gme.CoCreateInstance( L"GME.Application");
 }
 
-void MsgConsole::sendMsg( const std::string& p_msg, int p_mtype)
+void MsgConsole::sendMsg( const char* p_msg, int p_mtype)
 {
 	if( m_gme)
 	{
 		m_gme->put_Visible( VARIANT_TRUE);
-		CComBSTR msg( p_msg.c_str());
-		m_gme->ConsoleMessage( msg, (msgtype_enum) p_mtype);
+		m_gme->ConsoleMessage( _bstr_t(p_msg), (msgtype_enum) p_mtype);
 	}
 }
 
-//static
-void MsgConsole::ssendMsg( const std::string& p_msg, int p_mtype)
+void MsgConsole::sendMsg( const std::string& p_msg, int p_mtype)
 {
-	CComPtr<IGMEOLEApp> gme;
-	gme.CoCreateInstance( L"GME.Application");
-	if( gme)
-	{
-		gme->put_Visible( VARIANT_TRUE);
-		CComBSTR msg( p_msg.c_str());
-		gme->ConsoleMessage( msg, (msgtype_enum) p_mtype);
-	}
+	sendMsg(p_msg.c_str(), p_mtype);
 }
 

Modified: trunk/GME/XmlBackEnd/MsgConsole.h
==============================================================================
--- trunk/GME/XmlBackEnd/MsgConsole.h	Mon Oct  3 16:04:45 2011	(r1572)
+++ trunk/GME/XmlBackEnd/MsgConsole.h	Mon Oct  3 16:05:00 2011	(r1573)
@@ -6,9 +6,9 @@
 {
 	CComPtr<IGMEOLEApp>   m_gme;
 public:
-	MsgConsole( bool p_create);
-	void          sendMsg  ( const std::string&, int mtype );
-	
-	static void   ssendMsg ( const std::string&, int mtype );
+	MsgConsole(bool gme);
+	void sendMsg(const std::string&, int mtype);
+	void sendMsg(const char* p_msg, int p_mtype);
+
 };
 

Modified: trunk/GME/XmlBackEnd/SVNCode/Util.cpp
==============================================================================
--- trunk/GME/XmlBackEnd/SVNCode/Util.cpp	Mon Oct  3 16:04:45 2011	(r1572)
+++ trunk/GME/XmlBackEnd/SVNCode/Util.cpp	Mon Oct  3 16:05:00 2011	(r1573)
@@ -262,7 +262,7 @@
 		buffer.erase( p, 1);
 		p = buffer.find( "\r");
 	}
-	MsgConsole::ssendMsg( buffer, MSG_ERROR);
+	// FIXME: MsgConsole::ssendMsg( buffer, MSG_ERROR);
 	//std::cout << "Error " << buffer << std::endl;
 
 	//if( p_err->apr_err == SVN_ERR_RA_ILLEGAL_URL)