697695 - Coalesce some Places source files

Status: RESOLVED WONTFIX

(Toolkit :: Places, defect)

Description

[Marco Bonardo [:mak]]

There are more than 60 files in the componen folder, some of these are pretty much small and not really useful by themselves. I'd like to coalesce some sources.
My suggestions:

nsMaybeWeakPtr.cpp/h => Helpers.cpp/h
nsPlacesMacros.h     => Helpers.h
PlaceInfo.cpp/h      => Helpers.cpp/h
VisitInfo.cpp/h      => Helpers.cpp/h

nsPlacesIndexes.h    => Schema.h
nsPlacesTables.h     => Schema.h
nsPlacesTriggers.h   => Schema.h
SQLFunctions.cpp/h   => Schema.cpp/h

this should remove about 10 files from the global count, without losing clarity, Schema is an even clearer concept, Helpers is already a shared code module.

Comment 1

[Marco Bonardo [:mak]]

and likely rename AsyncFaviconHelpers.cpp/h to Favicons.cpp/h to follow History.cpp/h style.

Comment 2

[Marco Bonardo [:mak]]

Not working on this, it's a good first bug though.

Comment 3

[Mike de Boer [:mikedeboer]]

Attachment: files coalesced according to comment 0

please review the patch thoroughly, C++ is not my first language!

Comment 4

[Mike de Boer [:mikedeboer]]

Marco: I did not rename AsyncFaviconHelpers.cpp/h. I could still do that, if you'd like.

Comment 5

[Marco Bonardo [:mak]]

I'm delaying this a bit cause it would bitrot the deprecation patches, and those have an higher priority atm.

Looking at the patch it's likely I'll take only some pieces of it, mostly to avoid overwriting all of the blame, originally I didn't think enough to consequences of so many changes on blame information. So I will probably request to split the patch into pieces once I decide which parts we'll take.

At first glance I'd say the new plan may be:

nsPlacesMacros.h     => Helpers.h

(in this order)
nsPlacesTables.h     => Schema.h
nsPlacesIndexes.h    => Schema.h
nsPlacesTriggers.h   => Schema.h

AsyncFaviconHelpers.cpp/h => Favicons.cpp/h

This should just lose less important blame.
But I suggest waiting for bug 834457 to avoid bitrotting each other.

Comment 6

[Marco Bonardo [:mak]]

Comment on attachment 719061 [details] [diff] [review]
files coalesced according to comment 0

clearing per previous comment.

Comment 7

[Marco Bonardo [:mak]]

I think I'm going to wontfix this to avoid losing blame info, sorry.