[Kde-games-devel] KMahjongg archaeology

[Roney Gomes]

2015-01-12 1:57 GMT-03:00 Ian Wadham <iandw.au at gmail.com>:
> Hi guys,
>
> On 12/01/2015, at 3:36 AM, Roney Gomes wrote:
>> Replying to Ian now: yes, I can test KF5 games. :-)
>
> Great, Roney!
>
> I have been collecting some information about the degree of difference
> between qgraphic and master in KMahjongg.  See the attached .txt file.
>
> I used the git "triple-dot" notation in "git diff", which tells you what has
> changed in one branch since it diverged from another branch.
>
> You will see that there are huge changes in qgraphic, but not so much
> in master.  Many changes in master are not code-changes: i.e. some
> documentation cleanup, copyright info added and a lot of new
> translation lines in *.desktop files, particularly those that describe
> the many puzzle layouts.
>
> The code-changes in master are quite minor, so I do not expect many
> conflicts when merging into qgraphic --- then the fun will begin… ;-)
>
> I spent some time browsing some of the larger diffs of individual
> files, between today's master and today's qgraphic, using Kompare,
> but did not learn much from that.  Part of the problem is that there
> have been (needed) white-space and indentation changes.  Even
> when I set the diff program to ignore white space, there are many
> instances where braces have been added or rearranged, in line with
> KDE and Qt standards, causing changes that are necessary but
> not substantial, i.e. the code will still do the same thing.

Good news comrades!

Today I gave our first step towards porting the QGraphicsView version
of KMahjongg to Frameworks. I decided to begin by rebasing 'qgraphic'
to frameworks' current HEAD then proceed solving the inevitable
conflicts as they arrived. The history is now looking as if Christian
started working after the KF5 porting was done.

I just fixed the last compilation error and now we have a running
version of KMahjongg under Frameworks. Still untested as I didn't have
the time to look for eventual bugs. That's just the first step though,
we still need to see what Christian left pending and what pieces of
code are using the old API's.

However, there's a problem: I cannot submit my work. As rebasing
rewrites history and I'm not KMahjongg's project manager I cannot
"push force" my changes nor set up a new branch. So I'm stuck for now,
what do you suggest?
-- 
Roney