← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lokalize/src/mergemode/mergeview.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/mergeview.h
65
65
    void slotNewEntryDisplayed(const DocPosition&);
66
66
    void slotUpdate(const DocPosition&);
67
67
 
68
 
    void gotoNextChanged();
 
68
    void gotoNextChanged(bool approvedOnly=false);
 
69
    void gotoNextChangedApproved();
69
70
    void gotoPrevChanged();
70
71
    void mergeAccept();
71
72
    void mergeAcceptAllForEmpty();