More warning and error fixes (work in progress with Tinderbox).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-05-31 15:32:50 +00:00
parent effdccd8fd
commit fa1af598d6
6 changed files with 232 additions and 233 deletions

View File

@@ -6,7 +6,7 @@
// Created: 27/12/98
// RCS-ID: $Id$
// Copyright: (c) Aleskandars Gluchovas
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __IFCONTEXT_G__
@@ -18,24 +18,24 @@
class spBookmark
{
public:
size_t mFrom;
size_t mLen;
size_t mFileNo;
size_t mFrom;
size_t mLen;
size_t mFileNo;
inline spBookmark() {}
inline spBookmark() {}
inline spBookmark( int from, int len, int fileNo )
: mFrom( from ), mLen( len ), mFileNo( fileNo )
{}
inline spBookmark( int from, int len, int fileNo )
: mFrom( from ), mLen( len ), mFileNo( fileNo )
{}
};
#if defined( wxUSE_TEMPLATE_STL )
typedef vector<spBookmark) BookmarkListT
typedef vector<spBookmark) BookmarkListT
#else
typedef WXSTL_VECTOR_SHALLOW_COPY(spBookmark) BookmarkListT;
typedef WXSTL_VECTOR_SHALLOW_COPY(spBookmark) BookmarkListT;
#endif
@@ -44,56 +44,56 @@ class spInterFileContext : public spContext
{
protected:
BookmarkListT mDeletionMarks;
BookmarkListT mDeletionMarks;
BookmarkListT mFiltered;
BookmarkListT mFiltered;
size_t mCurFileNo;
size_t mCurFileNo;
CJSourceParser mParser;
CJSourceParser mParser;
protected:
size_t GetFileNoOfContext( spContext& ctx );
size_t GetFileNo( const string& fname );
size_t GetFileNoOfContext( spContext& ctx );
size_t GetFileNo( const string& fname );
void InsertBookmarkSorted( BookmarkListT& lst, spBookmark& mark );
void InsertBookmarkSorted( BookmarkListT& lst, spBookmark& mark );
void DoAppendSourceFragment( string& source,
string& result,
size_t pos, size_t len );
void DoAppendSourceFragment( string& source,
string& result,
size_t pos, size_t len );
void GenerateContextBody( spContext& ctx,
string& source,
string& result,
size_t& lastSavedPos,
size_t& lastKnownPos );
void GenerateContextBody( spContext& ctx,
string& source,
string& result,
size_t& lastSavedPos,
size_t& lastKnownPos );
public:
StrListT mFiles;
StrListT mContents;
StrListT mFiles;
StrListT mContents;
public:
spInterFileContext();
~spInterFileContext();
spInterFileContext();
~spInterFileContext();
void AddFile( const string& fname, const string& content );
void AddFile( const string& fname, const string& content );
void RemoveContext( spContext& ctx );
void RemoveContext( spContext& ctx );
void GenrateContents();
void GenrateContents();
void ParseContents( SourceParserPlugin* pPlugin = NULL );
void ParseContents( SourceParserPlugin* pPlugin = NULL );
void WriteToFiles();
void WriteToFiles();
// overriden method of the base class (finds out the source fragment)
// overriden method of the base class (finds out the source fragment)
virtual string GetBody( spContext* pCtx = NULL );
virtual wxString GetBody( spContext* pCtx = NULL );
virtual string GetHeader( spContext* pCtx = NULL );
virtual wxString GetHeader( spContext* pCtx = NULL );
};