comparison mainwindow.h @ 329:ef977e7482cd

Merge from branch "filelist_right_button_menu"
author Chris Cannam
date Fri, 11 Mar 2011 18:08:35 +0000
parents 6e1fdda1dff2
children acfe9390d5c6
comparison
equal deleted inserted replaced
322:913d213dd427 329:ef977e7482cd
76 void hgDiffToCurrent(QString); 76 void hgDiffToCurrent(QString);
77 void hgDiffToParent(QString, QString); 77 void hgDiffToParent(QString, QString);
78 void hgUpdate(); 78 void hgUpdate();
79 void hgRevert(); 79 void hgRevert();
80 void hgMerge(); 80 void hgMerge();
81 void hgMarkResolved(QStringList); 81 void hgRedoMerge();
82 void hgRetryMerge();
83 void hgCloneFromRemote(); 82 void hgCloneFromRemote();
84 void hgInit(); 83 void hgInit();
85 void hgIncoming(); 84 void hgIncoming();
86 void hgPush(); 85 void hgPush();
87 void hgPull(); 86 void hgPull();
92 void hgTag(QString); 91 void hgTag(QString);
93 void hgNewBranch(); 92 void hgNewBranch();
94 void hgNoBranch(); 93 void hgNoBranch();
95 void hgServe(); 94 void hgServe();
96 void hgIgnore(); 95 void hgIgnore();
96
97 void hgAnnotateFiles(QStringList);
98 void hgDiffFiles(QStringList);
99 void hgCommitFiles(QStringList);
100 void hgRevertFiles(QStringList);
101 void hgAddFiles(QStringList);
102 void hgRemoveFiles(QStringList);
103 void hgRedoFileMerges(QStringList);
104 void hgMarkFilesResolved(QStringList);
105 void hgIgnoreFiles(QStringList);
106 void hgUnIgnoreFiles(QStringList);
97 107
98 void fsDirectoryChanged(QString); 108 void fsDirectoryChanged(QString);
99 void fsFileChanged(QString); 109 void fsFileChanged(QString);
100 void checkFilesystem(); 110 void checkFilesystem();
101 void actuallyRestoreFileSystemWatcher(); 111 void actuallyRestoreFileSystemWatcher();