Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Put braces around all calls to wxLogFunctions() inside an if statement.

Browse Source 
This suppresses all the remaining g++ -Wparentheses warnings and uses consistent style everywhere.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-07-20 16:47:54 +00:00
parent c9cc9a2f3e
commit 43b2d5e7c3
79 changed files with 476 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
utils/helpview/src/remhelp.cpp
View File

@@ -53,10 +53,10 @@ rhhcClient::rhhcClient( bool *isconn_a )
wxConnectionBase *rhhcClient::OnMakeConnection()
{
return new rhhcConnection( isconn_2 );
return new rhhcConnection( isconn_2 );
}
rhhcConnection::rhhcConnection( bool *isconn_a )
rhhcConnection::rhhcConnection( bool *isconn_a )
: wxConnection()
{
isconn_3 = isconn_a;
@@ -89,8 +89,8 @@ IMPLEMENT_CLASS(wxRemoteHtmlHelpController, wxHelpControllerBase)
wxRemoteHtmlHelpController::wxRemoteHtmlHelpController(int style )
{
m_style = style;
m_connection = NULL;
m_style = style;
m_connection = NULL;
m_client = NULL;
m_pid = 0;
isconn_1 = false;
@@ -113,7 +113,7 @@ wxRemoteHtmlHelpController::wxRemoteHtmlHelpController(int style )
m_appname = wxT("./helpview");
m_service = wxT("/tmp/") + thename + wxString(wxT("_helpservice"));
#else
m_appname = wxT("./helpview");
m_appname = wxT("./helpview");
m_service = wxT("4242");
#endif
@@ -154,7 +154,7 @@ wxRemoteHtmlHelpController::~wxRemoteHtmlHelpController()
delete m_process;
m_process = NULL;
}
if( m_client )
if( m_client )
delete m_client; //should be automatic?
}
@@ -179,7 +179,7 @@ bool wxRemoteHtmlHelpController::DoConnection()
wxLogNull nolog;
//first try to connect assuming server is running
if( !isconn_1 )
if( !isconn_1 )
m_connection = (rhhcConnection *)m_client->MakeConnection(hostName, m_service, wxT("HELP") );
//if not, start server
@@ -201,20 +201,20 @@ bool wxRemoteHtmlHelpController::DoConnection()
}
while ( !isconn_1 )
{
{
//try every second for a while, then leave it to user
wxSleep(1);
if( nsleep > 4 ) {
if ( wxMessageBox( wxT("Failed to make connection to Help server.\nRetry?") ,
wxT("wxRemoteHtmlHelpController Error"),
wxICON_ERROR | wxYES_NO | wxCANCEL ) != wxYES )
{
{
// no server
return false;
}
}
nsleep++;
m_connection = (rhhcConnection *)m_client->MakeConnection(hostName, m_service, wxT("HELP") );
}
}
@@ -254,11 +254,11 @@ bool wxRemoteHtmlHelpController::Quit()
default:
wxFAIL_MSG( _T("unexpected return value") );
// fall through
case -1:
// cancelled
return false;
case wxSIGNONE:
case wxSIGHUP:
case wxSIGINT:
@@ -282,9 +282,13 @@ bool wxRemoteHtmlHelpController::Quit()
if ( sig == 0 )
{
if ( wxProcess::Exists(m_pid) )
{
wxLogStatus(_T("Process %ld is running."), m_pid);
}
else
{
wxLogStatus(_T("No process with pid = %ld."), m_pid);
}
}
else // not SIGNONE
{
@@ -303,7 +307,7 @@ bool wxRemoteHtmlHelpController::Quit()
_T("no such process"),
_T("unspecified error"),
};
// sig = 3, 6, 9 or 12 all kill server with no apparent problem
// but give error message on MSW - timout?
//
@@ -321,8 +325,8 @@ void wxRemoteHtmlHelpController::Display(const wxString& helpfile)
if( !isconn_1 ) {
if( !DoConnection() ) return;
}
if (!m_connection->Execute( helpfile, -1 ) )
if (!m_connection->Execute( helpfile, -1 ) )
wxLogError(wxT("wxRemoteHtmlHelpController - Display Failed"));
}
@@ -335,8 +339,8 @@ void wxRemoteHtmlHelpController::Display(const int id)
wxString intstring;
intstring.Printf( "--intstring%d", id );
if (!m_connection->Execute( intstring, -1 ) )
if (!m_connection->Execute( intstring, -1 ) )
wxLogError(wxT("wxRemoteHtmlHelpController - Display Failed"));
}
@@ -349,7 +353,9 @@ bool wxRemoteHtmlHelpController::AddBook(const wxString& book, bool show_wait_ms
if( isconn_1 ) {
if (!m_connection->Poke( wxT("--AddBook"), (char*)book.c_str() ) )
{
wxLogError(wxT("wxRemoteHtmlHelpController - AddBook Failed"));
}
return false;
}
@@ -370,7 +376,9 @@ void wxRemoteHtmlHelpController::DisplayIndex()
{
if( isconn_1 ) {
if (!m_connection->Poke( wxT("--DisplayIndex"), wxT("") ) )
{
wxLogError(wxT("wxRemoteHtmlHelpController - DisplayIndex Failed"));
}
}
}
bool wxRemoteHtmlHelpController::KeywordSearch(const wxString& keyword)
@@ -391,7 +399,9 @@ void wxRemoteHtmlHelpController::SetTitleFormat(const wxString& format)
if( isconn_1 ) {
if (!m_connection->Poke( wxT("--SetTitleFormat"), (char*)format.c_str() ) )
{
wxLogError(wxT("wxRemoteHtmlHelpController - SetTitleFormat Failed"));
}
}
}
@@ -399,7 +409,9 @@ void wxRemoteHtmlHelpController::SetTempDir(const wxString& path)
{
if( isconn_1 ) {
if (!m_connection->Poke( wxT("--SetTempDir"), (char*)path.c_str() ) )
{
wxLogError(wxT("wxRemoteHtmlHelpController - SetTempDir Failed"));
}
}
}