← Back to branch summary

~ubuntu-branches/ubuntu/vivid/kdesdk/vivid

« back to all changes in this revision

Viewing changes to lokalize/src/mergemode/mergecatalog.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-06-06 11:49:54 UTC
  • mfrom: (0.4.21)
  • Revision ID: package-import@ubuntu.com-20120606114954-rdls73fzlpzxglbx
Tags: 4:4.8.80-0ubuntu1
* New uptream beta release
* Update dont_export_private_classes.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
lokalize/src/mergemode/mergecatalog.cpp
59
59
        if (m_storage->isApproved(ourPos)!=m_baseCatalog->isApproved(pos))
60
60
            //kWarning()<<ourPos.entry<<"SHIT";
61
61
            m_storage->setApproved(ourPos, m_baseCatalog->isApproved(pos));
 
62
        DocPos p(pos);
 
63
        if (!m_originalHashes.contains(p))
 
64
            m_originalHashes[p]=qHash(m_storage->target(ourPos));
62
65
        m_storage->setTarget(ourPos,m_baseCatalog->target(pos));
63
66
        setModified(ourPos, true);
64
67
 
239
242
    }*/
240
243
    m_unmatchedCount=numberOfEntries()-mergePositions.count();
241
244
    m_modified=false;
 
245
    m_originalHashes.clear();
242
246
 
243
247
    return 0;
244
248
}
245
249
 
 
250
bool MergeCatalog::isModified(DocPos pos) const
 
251
{
 
252
    return Catalog::isModified(pos) && m_originalHashes.value(pos)!=qHash(target(pos.toDocPosition()));
 
253
}
 
254
 
246
255
bool MergeCatalog::save()
247
256
{
248
257
    bool ok = !m_modified || Catalog::save();
249
258
    if (ok) m_modified=false;
 
259
    m_originalHashes.clear();
250
260
    return ok;
251
261
}
252
262
 
288
298
    DocPosition pos;
289
299
    pos.offset=0;
290
300
    bool insHappened=false;
291
 
    QLinkedList<int> changed=changedEntries();
 
301
    QLinkedList<int> changed=differentEntries();
292
302
    foreach(int entry, changed)
293
303
    {
294
304
        pos.entry=entry;