diff -BrauN springlobby-0.44.orig/src/filelister/filelistdialog.cpp springlobby-0.44/src/filelister/filelistdialog.cpp --- springlobby-0.44.orig/src/filelister/filelistdialog.cpp 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/filelister/filelistdialog.cpp 2009-12-28 09:37:12.000000000 +0100 @@ -143,7 +143,7 @@ { wxString hash = *it; if (torrent().RequestFileByHash(hash) != TorrentWrapper::success) - wxLogError(_("unknown hash ") + hash ); + wxLogError(_("unknown hash ") + hash, NULL ); } diff -BrauN springlobby-0.44.orig/src/globalsmanager.h springlobby-0.44/src/globalsmanager.h --- springlobby-0.44.orig/src/globalsmanager.h 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/globalsmanager.h 2009-12-28 09:34:03.000000000 +0100 @@ -63,7 +63,7 @@ { GlobalObjectHolder::count += 1; assert( (GlobalObjectHolder::count) == 1 ); - wxLogError( _T("GOBAL_LINE: ") + i.m ) ; + wxLogError( _T("GOBAL_LINE: ") + i.m, NULL ) ; if ( RegisterSelf() ) { private_ptr = new T; diff -BrauN springlobby-0.44.orig/src/httpdownloader.cpp springlobby-0.44/src/httpdownloader.cpp --- springlobby-0.44.orig/src/httpdownloader.cpp 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/httpdownloader.cpp 2009-12-28 09:37:02.000000000 +0100 @@ -81,14 +81,14 @@ } if ( m_noticeOk != wxEmptyString ) notice.SetString( m_noticeOk ); notice.SetInt( FileDownloading.GetError() ); - wxLogMessage( notice.GetString() ); + wxLogMessage( notice.GetString(), NULL ); wxPostEvent( &m_parent, notice ); } return NULL; } catch ( ... ) { - wxLogMessage( _T( "exception on download of" ) + m_fileurl ); + wxLogMessage( _T( "exception on download of" ) + m_fileurl, NULL ); } } @@ -102,7 +102,7 @@ notice.SetString( m_noticeErr ); notice.SetString( notice.GetString() + _( "\nError number: " ) + TowxString( FileDownloading.GetError() ) ); notice.SetInt( FileDownloading.GetError() ); - wxLogError( notice.GetString() ); + wxLogError( notice.GetString(), NULL ); wxPostEvent( &m_parent, notice ); } @@ -133,14 +133,14 @@ { if ( !wxDirExists( file ) ) wxFileName::Mkdir( file, 0775, wxPATH_MKDIR_FULL ); - wxLogWarning( path ); + wxLogWarning( path, NULL ); } else { - wxLogMessage( _T("unzipping: ")+ file ); + wxLogMessage( _T("unzipping: ")+ file, NULL ); wxFFileOutputStream out( file ); if( !out.IsOk() ) - wxLogError( _T("unzipping failed on: ")+ file ); + wxLogError( _T("unzipping failed on: ")+ file, NULL ); else { out.Write( zip ); out.Close(); @@ -150,7 +150,7 @@ } catch ( std::exception& e ) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); return false; } diff -BrauN springlobby-0.44.orig/src/ibattle.cpp springlobby-0.44/src/ibattle.cpp --- springlobby-0.44.orig/src/ibattle.cpp 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/ibattle.cpp 2009-12-28 09:37:34.000000000 +0100 @@ -917,7 +917,7 @@ { for ( std::map::iterator itor = options.begin(); itor != options.end(); itor++ ) { - wxLogWarning( itor->first + _T(" ::: ") + itor->second ); + wxLogWarning( itor->first + _T(" ::: ") + itor->second, NULL ); CustomBattleOptions().setSingleOption( itor->first, itor->second, (OptionsWrapper::GameOption)i ); } } diff -BrauN springlobby-0.44.orig/src/mapgridctrl.cpp springlobby-0.44/src/mapgridctrl.cpp --- springlobby-0.44.orig/src/mapgridctrl.cpp 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/mapgridctrl.cpp 2009-12-28 09:38:12.000000000 +0100 @@ -484,7 +484,7 @@ m_selected_map = map; if ( m_selected_map != NULL ) { - wxLogMessage( _T("MapGridCtrl: Selected map: ") + m_selected_map->name ); + wxLogMessage( _T("MapGridCtrl: Selected map: ") + m_selected_map->name, NULL ); wxCommandEvent evt( MapSelectedEvt, GetId() ); evt.SetEventObject( this ); diff -BrauN springlobby-0.44.orig/src/serverevents.cpp springlobby-0.44/src/serverevents.cpp --- springlobby-0.44.orig/src/serverevents.cpp 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/serverevents.cpp 2009-12-28 09:39:11.000000000 +0100 @@ -192,7 +192,7 @@ } catch (...) { - wxLogWarning( _("OnUserStatus() failed ! (exception)") ); + wxLogWarning( _("OnUserStatus() failed ! (exception)"), NULL ); } } @@ -966,7 +966,7 @@ void ServerEvents::OnSpringDownloadEvent( wxCommandEvent& event ) { int code = event.GetInt(); - wxLogMessage(event.GetString()); + wxLogMessage(event.GetString(), NULL ); if ( code != 0) { customMessageBox(SL_MAIN_ICON, _("There was an error downloading for the latest version.\n"), _("Error")); diff -BrauN springlobby-0.44.orig/src/settings++/se_utils.cpp springlobby-0.44/src/settings++/se_utils.cpp --- springlobby-0.44.orig/src/settings++/se_utils.cpp 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/settings++/se_utils.cpp 2009-12-28 09:47:48.000000000 +0100 @@ -38,7 +38,7 @@ { if ( !wxLaunchDefaultBrowser( url ) ) { - wxLogWarning( _( "can't launch default browser" ) ); + wxLogWarning( _( "can't launch default browser" ), NULL ); customMessageBox( SL_MAIN_ICON, _( "Couldn't launch browser. URL is: " ) + url, _( "Couldn't launch browser." ) ); } } diff -BrauN springlobby-0.44.orig/src/spring.cpp springlobby-0.44/src/spring.cpp --- springlobby-0.44.orig/src/spring.cpp 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/spring.cpp 2009-12-28 09:39:48.000000000 +0100 @@ -78,7 +78,7 @@ bool Spring::RunReplay ( const wxString& filename ) { - wxLogMessage( _T("launching spring with replay: ") + filename ); + wxLogMessage( _T("launching spring with replay: ") + filename, NULL ); return LaunchSpring( _T("\"") + filename + _T("\"") ); } diff -BrauN springlobby-0.44.orig/src/springunitsync.cpp springlobby-0.44/src/springunitsync.cpp --- springlobby-0.44.orig/src/springunitsync.cpp 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/springunitsync.cpp 2009-12-28 09:40:16.000000000 +0100 @@ -113,7 +113,7 @@ m_map_array.Add( name ); } catch (...) { - wxLogError( _T("Found map with hash collision: ") + name + _T(" hash: ") + hash ); + wxLogError( _T("Found map with hash collision: ") + name + _T(" hash: ") + hash, NULL ); } } int numMods = susynclib().GetPrimaryModCount(); @@ -139,7 +139,7 @@ m_mod_array.Add( name ); } catch (...) { - wxLogError( _T("Found mod with hash collision: ") + name + _T(" hash: ") + hash ); + wxLogError( _T("Found mod with hash collision: ") + name + _T(" hash: ") + hash, NULL ); } } } diff -BrauN springlobby-0.44.orig/src/tasserver.cpp springlobby-0.44/src/tasserver.cpp --- springlobby-0.44.orig/src/tasserver.cpp 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/tasserver.cpp 2009-12-28 09:40:41.000000000 +0100 @@ -951,7 +951,7 @@ bstatus.colour = wxColour( color.color.red, color.color.green, color.color.blue ); ai = GetSentenceParam( params ); if ( ai.IsEmpty() ) { - wxLogWarning( wxString::Format( _T("Recieved illegal ADDBOT (empty dll field) from %s for battle %d"), nick.c_str(), id ) ); + wxLogWarning( wxString::Format( _T("Recieved illegal ADDBOT (empty dll field) from %s for battle %d"), nick.c_str(), id ), NULL ); ai = _T("INVALID|INVALID"); } if( usync().VersionSupports( IUnitSync::USYNC_GetSkirmishAI ) ) diff -BrauN springlobby-0.44.orig/src/torrentwrapper.cpp springlobby-0.44/src/torrentwrapper.cpp --- springlobby-0.44.orig/src/torrentwrapper.cpp 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/torrentwrapper.cpp 2009-12-28 09:46:09.000000000 +0100 @@ -360,7 +360,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } try { @@ -368,7 +368,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } #ifndef __WXMSW__ @@ -378,7 +378,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } try { @@ -386,7 +386,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } #endif m_socket_class = new Socket( *this ); @@ -404,7 +404,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } try { @@ -412,7 +412,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } try { @@ -420,7 +420,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } m_socket_class->SetTimeout( 1 ); DisconnectFromP2PSystem(); @@ -496,7 +496,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); // TODO (BrainDamage#1#): add message to user on failure + wxLogError( TowxString( e.what() ), NULL ); // TODO (BrainDamage#1#): add message to user on failure } } @@ -595,7 +595,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); // TODO (BrainDamage#1#): add message to user on failure + wxLogError( TowxString( e.what() ), NULL ); // TODO (BrainDamage#1#): add message to user on failure } } @@ -702,7 +702,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); return false; } return true; @@ -795,7 +795,7 @@ wxLogMessage(_T("(1) Joining torrent, name=%s"),row->name.c_str()); if (ingame) return false; - wxLogMessage(_T("(2) Joining torrent. IsSeed: ") + TowxString(IsSeed) + _T(" status: ") + TowxString(row->status) ); + wxLogMessage(_T("(2) Joining torrent. IsSeed: ") + TowxString(IsSeed) + _T(" status: ") + TowxString(row->status), NULL ); if ( IsSeed && ( row->status != P2P::stored ) ) return false; if ( !IsSeed && ( row->status != P2P::queued ) && ( row->status != P2P::not_stored ) ) return false; @@ -866,7 +866,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); wxLogMessage( _T("Local filepath couldn't be determined") ); return false; } @@ -1203,8 +1203,8 @@ /* Move file from temporary download directory to final destination. `false' for * parameter 3 means don't overwrite the file if it already exists. */ - if ( ! wxRenameFile(sourceName, targetName, false) ) wxLogError(wxString::Format(_T("torrent: Failed to move \"%s\" to \"%s\""), sourceName.c_str(), targetName.c_str())); - else wxLogMessage(wxString::Format(_T("torrent: Moved \"%s\" to \"%s\""), sourceName.c_str(), targetName.c_str())); + if ( ! wxRenameFile(sourceName, targetName, false) ) wxLogError(wxString::Format(_T("torrent: Failed to move \"%s\" to \"%s\""), sourceName.c_str(), targetName.c_str()), NULL ); + else wxLogMessage(wxString::Format(_T("torrent: Moved \"%s\" to \"%s\""), sourceName.c_str(), targetName.c_str()), NULL ); GetTorrentTable().AddRowToDependencyCheckQueue( it->second ); @@ -1212,7 +1212,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } } @@ -1224,7 +1224,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } } } @@ -1420,7 +1420,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); // TODO (BrainDamage#1#): add message to user on failure + wxLogError( TowxString( e.what() ), NULL ); // TODO (BrainDamage#1#): add message to user on failure } GetTorrentTable().FlushData(); // flush the torrent data @@ -1448,7 +1448,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); // TODO (BrainDamage#1#): add message to user on failure + wxLogError( TowxString( e.what() ), NULL ); // TODO (BrainDamage#1#): add message to user on failure } } @@ -1458,7 +1458,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); // TODO (BrainDamage#1#): add message to user on failure + wxLogError( TowxString( e.what() ), NULL ); // TODO (BrainDamage#1#): add message to user on failure } diff -BrauN springlobby-0.44.orig/src/updater/updater.cpp springlobby-0.44/src/updater/updater.cpp --- springlobby-0.44.orig/src/updater/updater.cpp 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/updater/updater.cpp 2009-12-28 09:35:24.000000000 +0100 @@ -127,7 +127,7 @@ wxString current = TowxString(VERSION); long minor = std::numeric_limits::max(); bool convert_ok = current.AfterLast( '.' ).ToLong( &minor ); - wxLogMessage( wxString::Format( _T("Got minor rev %d"), minor ) ); + wxLogMessage( wxString::Format( _T("Got minor rev %d"), minor ), NULL ); if ( minor > 43 || !convert_ok ) //0.43 was the last build on old mingw return true; //all is well, we're already on a mingw4.4 build wxString base = wxPathOnly( wxStandardPaths::Get().GetExecutablePath() ) + wxFileName::GetPathSeparator() ; diff -BrauN springlobby-0.44.orig/src/utils/platform.cpp springlobby-0.44/src/utils/platform.cpp --- springlobby-0.44.orig/src/utils/platform.cpp 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/utils/platform.cpp 2009-12-28 09:34:57.000000000 +0100 @@ -181,7 +181,7 @@ // first make sure that the source dir exists if(!wxDir::Exists(from)) { - wxLogError(from + _T(" does not exist. Can not copy directory.") ); + wxLogError(from + _T(" does not exist. Can not copy directory."), NULL ); return false; } @@ -225,7 +225,7 @@ // first make sure that the source dir exists if(!wxDir::Exists(from)) { - wxLogError(from + _T(" does not exist. Can not copy directory.") ); + wxLogError(from + _T(" does not exist. Can not copy directory."), NULL ); return false; } @@ -248,7 +248,7 @@ //if files exists move it to backup, this way we can use this func on windows to replace 'active' files if ( wxFileExists( to + filename ) ) { if ( !wxRenameFile( to + filename, to + filename + _T(".old") ) ) { - wxLogError( wxString::Format( _T("could not rename %s, copydir aborted"), (to + filename).c_str() ) ); + wxLogError( wxString::Format( _T("could not rename %s, copydir aborted"), (to + filename).c_str() ), NULL ); return false; } } diff -BrauN springlobby-0.44.orig/src/widgets/widget.cpp springlobby-0.44/src/widgets/widget.cpp --- springlobby-0.44.orig/src/widgets/widget.cpp 2009-12-13 22:04:29.000000000 +0100 +++ springlobby-0.44/src/widgets/widget.cpp 2009-12-28 09:46:52.000000000 +0100 @@ -129,7 +129,7 @@ } catch (...) { - wxLogMessage(_T("exception on download of") + fileurl); + wxLogMessage(_T("exception on download of") + fileurl, NULL ); return false; } } @@ -236,7 +236,7 @@ } catch (...) { - wxLogMessage(_T("exception on download of") + fileurl); + wxLogMessage(_T("exception on download of") + fileurl, NULL ); return false; } }