On Tue, Apr 24, 2007 at 11:41:53AM +0200, Abdelrazak Younes wrote: > I think you mean in src/frontend/qt4. Do you mean "putting the two > classes into one file" or "merging the two classes"?
Right now I mean "putting two classes into one file". I have not thought too much about the latter, in any case this would be non-mechanical, i.e. post-1.5.0 stuff. The main reason for the renamings _now_ was that patches later will easier apply to 1.5.x and 1.6.x-svn. > Or FooWidget? I'd like to get rid of the QDialog inheritance and switch > to QWidget for all dialogs (so that it can be embedded in other dialogs > or in a dock widget). Fine with me. But this is more than I want to do now myself. > >Both files are interdependent anyway and tiny, and with look at our > >compile times this situation should be avoided. > > Note though that not all of them shall be merged. For example QCitation > and QCitationDialog shall _not_ be merged. If you want to rename them, > that would be: > > QCitation -> CitationModel > CitationDialog -> CitationWidget > > CitationModel derives from ControlCitation so this is not only a model > but also a controller. But it's a good compromise as "ControlCitation" > is already taken. Post 1.5, we could probably re-factor that to get the > Model/Control separation. Correct me if I am wrong, but 'usually' one has a model and a sort-of-combined view/controller. Not model/controler vs view. Andre'