[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]

RE: [XaraXtreme-dev] includes, XARLIB and camtypes.h

I haven't really done any chopping yet.  I've only changed camtypes.h so
that the files required by XarLib build using the reduced header set in
XarLib.  This required a few files to be directly included where they
were being pulled in indirectly via headers that aren't in XarLib.

I think we're talking at cross-purposes here.  I'm fairly sure that
ccfile.h didn't used to be included in camtypes.h.  After your changes
it was included indirectly via camfiltr.h and the direct includes of it
in cpp files were removed.  I have added ccfile.h directly to camtypes.h
because camfiltr.h isn't part of XarLib.  What I am asking is whether
you think I should now remove the include of ccfile.h in camfiltr.h as
it is not necessary anymore?

If you think it should be removed then I will do so as part of the
spaghetti chopping once I have some more RAM in this machine.


-----Original Message-----
From: owner-dev@xxxxxxxxxxxxxxxx [mailto:owner-dev@xxxxxxxxxxxxxxxx] On
Behalf Of Alex Bligh
Sent: 09 June 2006 17:22
To: dev@xxxxxxxxxxxxxx
Cc: Alex Bligh
Subject: Re: [XaraXtreme-dev] includes, XARLIB and camtypes.h


>> Well, I have tweaked camtypes.h so that it successfully builds XarLib
>> and also still builds XaraLX but it looks a bit ugly due to include
>> ordering issues (diffs attached).
>> What do you think?  Should we just live with it like this and remove
>> those headers I've added from being included elsewhere (e.g. ccfile.h
>> from camfiltr.h)?
> I think you should attach the diffs :-)

I'd apply it. camtypes.h is ugly anyway, and we have substantially
tidied things up by not including camtypes from other h files, and
by your spaghetti chopping. It's never going to be the mona lisa,

Assuming you haven't actually caused any new headers to be added to
camtypes.pch (ccfile.h and camfiltr.h were included before, albeit
indirectly) then I have /already/ removed them from the source
(that's what I meant be removing even the indirectly applied ones).
So you won't find (e.g.) ccfile.h being included from any file
(.h or .cpp) except for .h files which are already in camtypes.h.