Remove all trailing spaces
No real changes, just clean up sources by removing trailing spaces from all the non-generated files. This should hopefully avoid future commits mixing significant changes with insignificant whitespace ones.
This commit is contained in:
Vadim Zeitlin
@@ -71,8 +71,8 @@ void wxObjectWriter::ClearObjectContext()
|
||||
m_data->m_nextId = 0;
|
||||
}
|
||||
|
||||
void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo,
|
||||
wxObjectWriterCallback *writercallback, const wxString &name,
|
||||
void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo,
|
||||
wxObjectWriterCallback *writercallback, const wxString &name,
|
||||
const wxStringToAnyHashMap &metadata )
|
||||
{
|
||||
DoBeginWriteTopLevelEntry( name );
|
||||
@@ -80,8 +80,8 @@ void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *clas
|
||||
DoEndWriteTopLevelEntry( name );
|
||||
}
|
||||
|
||||
void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo,
|
||||
wxObjectWriterCallback *writercallback, bool isEmbedded,
|
||||
void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo,
|
||||
wxObjectWriterCallback *writercallback, bool isEmbedded,
|
||||
const wxStringToAnyHashMap &metadata )
|
||||
{
|
||||
if ( !classInfo->BeforeWriteObject( object, this, writercallback, metadata) )
|
||||
@@ -115,8 +115,8 @@ void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *clas
|
||||
}
|
||||
|
||||
void wxObjectWriter::FindConnectEntry(const wxEvtHandler * evSource,
|
||||
const wxEventSourceTypeInfo* dti,
|
||||
const wxObject* &sink,
|
||||
const wxEventSourceTypeInfo* dti,
|
||||
const wxObject* &sink,
|
||||
const wxHandlerInfo *&handler)
|
||||
{
|
||||
size_t cookie;
|
||||
@@ -146,8 +146,8 @@ void wxObjectWriter::FindConnectEntry(const wxEvtHandler * evSource,
|
||||
}
|
||||
}
|
||||
}
|
||||
void wxObjectWriter::WriteAllProperties( const wxObject * obj, const wxClassInfo* ci,
|
||||
wxObjectWriterCallback *writercallback,
|
||||
void wxObjectWriter::WriteAllProperties( const wxObject * obj, const wxClassInfo* ci,
|
||||
wxObjectWriterCallback *writercallback,
|
||||
wxObjectWriterInternalPropertiesData * data )
|
||||
{
|
||||
wxPropertyInfoMap map;
|
||||
@@ -195,13 +195,13 @@ public:
|
||||
wxObjectPropertyWriter(const wxClassTypeInfo* cti,
|
||||
wxObjectWriterCallback *writercallback,
|
||||
wxObjectWriter* writer,
|
||||
wxStringToAnyHashMap &props) :
|
||||
wxStringToAnyHashMap &props) :
|
||||
m_cti(cti),m_persister(writercallback),m_writer(writer),m_props(props)
|
||||
{}
|
||||
|
||||
virtual void operator()(const wxObject *vobj)
|
||||
{
|
||||
m_writer->WriteObject( vobj, (vobj ? vobj->GetClassInfo() : m_cti->GetClassInfo() ),
|
||||
m_writer->WriteObject( vobj, (vobj ? vobj->GetClassInfo() : m_cti->GetClassInfo() ),
|
||||
m_persister, m_cti->GetKind()== wxT_OBJECT, m_props );
|
||||
}
|
||||
private:
|
||||
@@ -211,8 +211,8 @@ private:
|
||||
wxStringToAnyHashMap& m_props;
|
||||
};
|
||||
|
||||
void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* ci,
|
||||
const wxPropertyInfo* pi, wxObjectWriterCallback *writercallback,
|
||||
void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* ci,
|
||||
const wxPropertyInfo* pi, wxObjectWriterCallback *writercallback,
|
||||
wxObjectWriterInternalPropertiesData *WXUNUSED(data) )
|
||||
{
|
||||
if ( pi->GetFlags() & wxPROP_DONT_STREAM )
|
||||
@@ -227,7 +227,7 @@ void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* c
|
||||
{
|
||||
wxAnyList data;
|
||||
pi->GetAccessor()->GetPropertyCollection(obj, data);
|
||||
const wxTypeInfo * elementType =
|
||||
const wxTypeInfo * elementType =
|
||||
wx_dynamic_cast( const wxCollectionTypeInfo*, pi->GetTypeInfo() )->GetElementType();
|
||||
if ( !data.empty() )
|
||||
{
|
||||
@@ -238,7 +238,7 @@ void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* c
|
||||
const wxAny* valptr = *iter;
|
||||
if ( writercallback->BeforeWriteProperty( this, obj, pi, *valptr ) )
|
||||
{
|
||||
const wxClassTypeInfo* cti =
|
||||
const wxClassTypeInfo* cti =
|
||||
wx_dynamic_cast( const wxClassTypeInfo*, elementType );
|
||||
if ( cti )
|
||||
{
|
||||
@@ -260,7 +260,7 @@ void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* c
|
||||
}
|
||||
else
|
||||
{
|
||||
const wxEventSourceTypeInfo* dti =
|
||||
const wxEventSourceTypeInfo* dti =
|
||||
wx_dynamic_cast( const wxEventSourceTypeInfo* , pi->GetTypeInfo() );
|
||||
if ( dti )
|
||||
{
|
||||
@@ -278,7 +278,7 @@ void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* c
|
||||
DoBeginWriteProperty( pi );
|
||||
if ( IsObjectKnown( sink ) )
|
||||
{
|
||||
DoWriteDelegate( obj, ci, pi, sink, GetObjectID( sink ),
|
||||
DoWriteDelegate( obj, ci, pi, sink, GetObjectID( sink ),
|
||||
sink->GetClassInfo(), handler );
|
||||
DoEndWriteProperty( pi );
|
||||
}
|
||||
@@ -307,7 +307,7 @@ void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* c
|
||||
|
||||
if ( pi->GetFlags() & wxPROP_ENUM_STORE_LONG )
|
||||
{
|
||||
const wxEnumTypeInfo *eti =
|
||||
const wxEnumTypeInfo *eti =
|
||||
wx_dynamic_cast(const wxEnumTypeInfo*, pi->GetTypeInfo() );
|
||||
if ( eti )
|
||||
{
|
||||
@@ -320,7 +320,7 @@ void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* c
|
||||
}
|
||||
|
||||
// avoid streaming out default values
|
||||
if ( pi->GetTypeInfo()->HasStringConverters() &&
|
||||
if ( pi->GetTypeInfo()->HasStringConverters() &&
|
||||
!pi->GetDefaultValue().IsNull() ) // TODO Verify
|
||||
{
|
||||
if ( wxAnyGetAsString(value) == wxAnyGetAsString(pi->GetDefaultValue()) )
|
||||
@@ -328,7 +328,7 @@ void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* c
|
||||
}
|
||||
|
||||
// avoid streaming out null objects
|
||||
const wxClassTypeInfo* cti =
|
||||
const wxClassTypeInfo* cti =
|
||||
wx_dynamic_cast( const wxClassTypeInfo* , pi->GetTypeInfo() );
|
||||
|
||||
if ( cti && cti->GetKind() == wxT_OBJECT_PTR && wxAnyGetAsObjectPtr(value) == NULL )
|
||||
@@ -583,7 +583,7 @@ void wxObjectRuntimeReaderCallback::SetPropertyAsObject(int objectID,
|
||||
wxObject *o, *valo;
|
||||
o = m_data->GetObject(objectID);
|
||||
valo = m_data->GetObject(valueObjectId);
|
||||
const wxClassInfo* valClassInfo =
|
||||
const wxClassInfo* valClassInfo =
|
||||
(wx_dynamic_cast(const wxClassTypeInfo*,propertyInfo->GetTypeInfo()))->GetClassInfo();
|
||||
|
||||
// if this is a dynamic object and we are asked for another class
|
||||
@@ -605,14 +605,14 @@ void wxObjectRuntimeReaderCallback::SetConnect(int eventSourceObjectID,
|
||||
const wxHandlerInfo* handlerInfo,
|
||||
int eventSinkObjectID )
|
||||
{
|
||||
wxEvtHandler *ehsource =
|
||||
wxEvtHandler *ehsource =
|
||||
wx_dynamic_cast( wxEvtHandler* , m_data->GetObject( eventSourceObjectID ) );
|
||||
wxEvtHandler *ehsink =
|
||||
wxEvtHandler *ehsink =
|
||||
wx_dynamic_cast( wxEvtHandler *,m_data->GetObject(eventSinkObjectID) );
|
||||
|
||||
if ( ehsource && ehsink )
|
||||
{
|
||||
const wxEventSourceTypeInfo *delegateTypeInfo =
|
||||
const wxEventSourceTypeInfo *delegateTypeInfo =
|
||||
wx_dynamic_cast(const wxEventSourceTypeInfo*,delegateInfo->GetTypeInfo());
|
||||
if( delegateTypeInfo && delegateTypeInfo->GetLastEventType() == -1 )
|
||||
{
|
||||
@@ -622,7 +622,7 @@ void wxObjectRuntimeReaderCallback::SetConnect(int eventSourceObjectID,
|
||||
}
|
||||
else
|
||||
{
|
||||
for ( wxEventType iter = delegateTypeInfo->GetEventType();
|
||||
for ( wxEventType iter = delegateTypeInfo->GetEventType();
|
||||
iter <= delegateTypeInfo->GetLastEventType(); ++iter )
|
||||
{
|
||||
ehsource->Connect( -1, iter,
|
||||
@@ -656,9 +656,9 @@ void wxObjectRuntimeReaderCallback::AddToPropertyCollectionAsObject(int objectID
|
||||
wxObject *o, *valo;
|
||||
o = m_data->GetObject(objectID);
|
||||
valo = m_data->GetObject(valueObjectId);
|
||||
const wxCollectionTypeInfo * collectionTypeInfo =
|
||||
const wxCollectionTypeInfo * collectionTypeInfo =
|
||||
wx_dynamic_cast( const wxCollectionTypeInfo *, propertyInfo->GetTypeInfo() );
|
||||
const wxClassInfo* valClassInfo =
|
||||
const wxClassInfo* valClassInfo =
|
||||
(wx_dynamic_cast(const wxClassTypeInfo*,collectionTypeInfo->GetElementType()))->GetClassInfo();
|
||||
|
||||
// if this is a dynamic object and we are asked for another class
|
||||
|
||||
Reference in New Issue
Block a user