← Back to branch summary

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

« back to all changes in this revision

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

  • 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.h
81
81
    int lastChangedIndex() const {return m_mergeDiffIndex.isEmpty()?-1:m_mergeDiffIndex.last();}
82
82
    int nextChangedIndex(uint index) const {return findNextInList(m_mergeDiffIndex,index);}
83
83
    int prevChangedIndex(uint index) const {return findPrevInList(m_mergeDiffIndex,index);}
84
 
    int isChanged(uint index) const {return m_mergeDiffIndex.contains(index);}
85
 
    QLinkedList<int> changedEntries()const {return m_mergeDiffIndex;}
 
84
    int isDifferent(uint index) const {return m_mergeDiffIndex.contains(index);}
 
85
    QLinkedList<int> differentEntries()const {return m_mergeDiffIndex;}
86
86
 
87
87
    //override to use map
88
88
    QString msgstr(const DocPosition&) const;
94
94
 
95
95
    /// whether 'merge source' has entry with such msgid
96
96
    bool isPresent(const short int& entry) const;
 
97
    bool isModified(DocPos)const;
97
98
 
98
99
    ///@arg pos in baseCatalog's coordinates
99
100
    void copyToBaseCatalog(DocPosition& pos);
118
119
    QVector<int> m_map; //maps entries: m_baseCatalog -> this
119
120
    Catalog* m_baseCatalog;
120
121
    QLinkedList<int> m_mergeDiffIndex;//points to baseCatalog entries
 
122
    QMap<DocPos, uint> m_originalHashes; //for modified units only
121
123
    int m_unmatchedCount;
122
124
    bool m_modified; //need own var here cause we don't use qundostack system for merging
123
125
};