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

MinGW warning fixes. Source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-02-01 20:37:14 +00:00
parent e7694e3be8
commit eda6fa912b
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
utils/HelpGen/src/srcparser.cpp
View File

@@ -37,8 +37,8 @@ void spVisitor::VisitAll( spContext& atContext,
bool sortContent
)
{
mSiblingSkipped = FALSE;
mChildSkipped = FALSE;
mSiblingSkipped = false;
mChildSkipped = false;
mContextMask = SP_CTX_ANY; // FIXME:: should be an arg.
if ( sortContent && !atContext.IsSorted() )
@@ -56,7 +56,7 @@ void spVisitor::VisitAll( spContext& atContext,
for( size_t i = 0; i != members.size(); ++i )
{
if ( mSiblingSkipped )
return;
if ( !mChildSkipped )
@@ -84,12 +84,12 @@ void spVisitor::RemoveCurrentContext()
void spVisitor::SkipSiblings()
{
mSiblingSkipped = TRUE;
mSiblingSkipped = true;
}
void spVisitor::SkipChildren()
{
mChildSkipped = TRUE;
mChildSkipped = true;
}
void spVisitor::SetFilter( int contextMask )
@@ -125,7 +125,7 @@ spContext::spContext()
: mpParent ( NULL ),
mpFirstOccurence( NULL ),
mAlreadySorted ( FALSE ),
mAlreadySorted ( false ),
mSrcLineNo (-1),
mSrcOffset (-1),
@@ -140,8 +140,8 @@ spContext::spContext()
mVisibility( SP_VIS_PRIVATE ),
mIsVirtualContext ( FALSE ),
mVirtualContextHasChildren( FALSE ),
mIsVirtualContext ( false ),
mVirtualContextHasChildren( false ),
mpUserData( NULL )
{}
@@ -149,7 +149,7 @@ spContext::spContext()
void spContext::RemoveChildren()
{
for( size_t i = 0; i != mMembers.size(); ++i )
delete mMembers[i];
mMembers.erase( mMembers.begin(), mMembers.end() );
@@ -160,7 +160,7 @@ spContext::~spContext()
RemoveChildren();
for( size_t i = 0; i != mComments.size(); ++i )
delete mComments[i];
}
@@ -201,7 +201,7 @@ void spContext::RemoveChild( spContext* pChild )
return;
}
// the given child should exist on the parent's list
// the given child should exist on the parent's list
wxASSERT( 0 );
}
@@ -209,8 +209,8 @@ spContext* spContext::GetEnclosingContext( int mask )
{
spContext* cur = this->GetParent();
while ( cur && !(cur->GetContextType() & mask) )
while ( cur && !(cur->GetContextType() & mask) )
cur = cur->GetParent();
return cur;
@@ -246,7 +246,7 @@ string spContext::GetFooterOfVirtualContextBody()
}
void spContext::SetVirtualContextBody( const string& body,
void spContext::SetVirtualContextBody( const string& body,
bool hasChildren,
const string& footer )
{
@@ -257,13 +257,13 @@ void spContext::SetVirtualContextBody( const string& body,
// atuomaticllay becomes virtual context
mIsVirtualContext = TRUE;
mIsVirtualContext = true;
}
string spContext::GetBody( spContext* pCtx )
{
if ( ( pCtx == NULL || pCtx == this ) && mIsVirtualContext )
if ( ( pCtx == NULL || pCtx == this ) && mIsVirtualContext )
return mVirtualContextBody;
if ( GetParent() )
@@ -289,7 +289,7 @@ bool spContext::IsFirstOccurence()
spContext* spContext::GetFirstOccurence()
{
// this object should not itself be
// this object should not itself be
// the first occurence of the context
wxASSERT( mpFirstOccurence != 0 );
@@ -322,7 +322,7 @@ spContext* spContext::FindContext( const string& identifier,
{
spContext& member = *mMembers[i];
if ( member.GetName() == identifier &&
if ( member.GetName() == identifier &&
( contextType & member.GetContextType() )
)
@@ -330,7 +330,7 @@ spContext* spContext::FindContext( const string& identifier,
if ( searchSubMembers )
{
spContext* result =
spContext* result =
member.FindContext( identifier, contextType, 1 );
if ( result ) return result;
@@ -414,7 +414,7 @@ void spClass::SortMembers()
spOperation::spOperation()
: mHasDefinition( FALSE )
: mHasDefinition( false )
{
mIsConstant =
mIsVirtual =
@@ -428,7 +428,7 @@ string spOperation::GetFullName(MarkupTagsT tags)
txt += mName;
txt += "( ";
txt += tags[TAG_BOLD].end;
for( size_t i = 0; i != mMembers.size(); ++i )
{
// DBG::
@@ -438,9 +438,9 @@ string spOperation::GetFullName(MarkupTagsT tags)
if ( i != 0 )
txt += ", ";
txt += tags[TAG_BOLD].start;
txt += param.mType;
txt += tags[TAG_BOLD].end;
@@ -479,15 +479,15 @@ string spPreprocessorLine::CPP_GetIncludedFileNeme() const
size_t i = 0;
while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '<' )
while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '<' )
++i;
++i;
size_t start = i;
while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '>' )
while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '>' )
++i;
@@ -567,7 +567,7 @@ void spContext::Dump(const wxString& indent) const
}
}
void spContext::DumpThis(const wxString& indent) const
void spContext::DumpThis(const wxString& WXUNUSED(indent)) const
{
wxFAIL_MSG("abstract base class can't be found in parser tree!");
}

16
utils/emulator/src/emulator.cpp
View File

@@ -77,14 +77,14 @@ IMPLEMENT_APP(wxEmulatorApp)
static const wxCmdLineEntryDesc sg_cmdLineDesc[] =
{
{ wxCMD_LINE_OPTION, _T("u"), _T("use-display"), _T("display number to use (default 100)") },
{ wxCMD_LINE_OPTION, _T("u"), _T("use-display"), _T("display number to use (default 100)"), (wxCmdLineParamType)0, 0 },
{ wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("displays help on the command line parameters") },
{ wxCMD_LINE_SWITCH, _T("v"), _T("version"), _T("print version") },
{ wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("displays help on the command line parameters"), (wxCmdLineParamType)0, 0 },
{ wxCMD_LINE_SWITCH, _T("v"), _T("version"), _T("print version"), (wxCmdLineParamType)0, 0 },
{ wxCMD_LINE_PARAM, NULL, NULL, _T("config file 1"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
{ wxCMD_LINE_NONE }
{ wxCMD_LINE_NONE, NULL, NULL, NULL, (wxCmdLineParamType)0, 0 }
};
@@ -487,7 +487,7 @@ bool wxEmulatorInfo::Load(const wxString& appDir)
m_emulatorScreenSize = wxSize(w, h);
}
if (!m_emulatorBackgroundBitmapName.IsEmpty())
if (!m_emulatorBackgroundBitmapName.empty())
{
wxString absoluteBackgroundBitmapName = rootPath + wxString(wxFILE_SEP_PATH) + m_emulatorBackgroundBitmapName;
if ( !wxFile::Exists(absoluteBackgroundBitmapName) )
@@ -575,10 +575,10 @@ wxString wxFindAppPath(const wxString& argv0, const wxString& cwd, const wxStrin
wxString str;
// Try appVariableName
if (!appVariableName.IsEmpty())
if (!appVariableName.empty())
{
str = wxGetenv(appVariableName);
if (!str.IsEmpty())
if (!str.empty())
return str;
}
@@ -602,7 +602,7 @@ wxString wxFindAppPath(const wxString& argv0, const wxString& cwd, const wxStrin
wxPathList pathList;
pathList.AddEnvList(wxT("PATH"));
str = pathList.FindAbsoluteValidPath(argv0);
if (!str.IsEmpty())
if (!str.empty())
return wxPathOnly(str);
// Failed

2
utils/emulator/src/emulator.h
View File

@@ -24,7 +24,7 @@ class wxEmulatorInfo: public wxObject
public:
wxEmulatorInfo() { Init(); }
wxEmulatorInfo(const wxEmulatorInfo& info) { Init(); Copy(info); }
wxEmulatorInfo(const wxEmulatorInfo& info) : wxObject() { Init(); Copy(info); }
void operator= (const wxEmulatorInfo& info) { Copy(info); }
void Copy(const wxEmulatorInfo& info);