Andre Poenitz wrote:
I just renamed the .ui files. This was straightforward. However, the
stuff in qt4/* is harder as there'll be clashes with headers in
src/*.h.
So I'd keep it as it is at the moment and rather merge
QFooDialog.[Ch] into QFoo.[Ch] whenever it makes sense.
The dependencies are pretty strong (#include "QBoxDialog.h" in
QBox.h, QBoxDialog is friend of QBox etc) in general, yet the files
themselves are tiny (i.e. poison for build times [and
navigation...]).
Comments?
Did you read mine? I repeat them just in case:
Andre Poenitz wrote:
In the medium term (i.e. not today, but before 1.5.0 proper) I'd like
to merge in src/frontend the Foo.{h,C} and FooDialog.{h,C} files to a
single one.
I think you mean in src/frontend/qt4. Do you mean "putting the two
classes into one file" or "merging the two classes"?
Looking at possible name clashes, I'd prefer the 'FooDialog' version.
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).
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.
Same goes for QToc and TocWidget. QToc can be renamed to TocModel.
Abdel.
