comparison mainwindow.h @ 336:4229b6a8e9c6

Merge
author Chris Cannam
date Mon, 14 Mar 2011 10:00:29 +0000
parents acfe9390d5c6
children 93feb59187f5
comparison
equal deleted inserted replaced
335:aa852b477e4d 336:4229b6a8e9c6
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();
88 void hgUpdateToRev(QString); 87 void hgUpdateToRev(QString);
89 void hgMergeFrom(QString); 88 void hgMergeFrom(QString);
90 void hgAnnotate();
91 void hgResolveList(); 89 void hgResolveList();
92 void hgTag(QString); 90 void hgTag(QString);
93 void hgNewBranch(); 91 void hgNewBranch();
94 void hgNoBranch(); 92 void hgNoBranch();
95 void hgServe(); 93 void hgServe();
96 void hgIgnore(); 94 void hgIgnore();
95
96 void hgAnnotateFiles(QStringList);
97 void hgDiffFiles(QStringList);
98 void hgCommitFiles(QStringList);
99 void hgRevertFiles(QStringList);
100 void hgAddFiles(QStringList);
101 void hgRemoveFiles(QStringList);
102 void hgRedoFileMerges(QStringList);
103 void hgMarkFilesResolved(QStringList);
104 void hgIgnoreFiles(QStringList);
105 void hgUnIgnoreFiles(QStringList);
97 106
98 void fsDirectoryChanged(QString); 107 void fsDirectoryChanged(QString);
99 void fsFileChanged(QString); 108 void fsFileChanged(QString);
100 void checkFilesystem(); 109 void checkFilesystem();
101 void actuallyRestoreFileSystemWatcher(); 110 void actuallyRestoreFileSystemWatcher();
114 void updateToolBarStyle(); 123 void updateToolBarStyle();
115 void createStatusBar(); 124 void createStatusBar();
116 void readSettings(); 125 void readSettings();
117 void splitChangeSets(QStringList *list, QString hgLogOutput); 126 void splitChangeSets(QStringList *list, QString hgLogOutput);
118 void reportNewRemoteHeads(QString); 127 void reportNewRemoteHeads(QString);
119 void presentLongStdoutToUser(QString stdo);
120 void writeSettings(); 128 void writeSettings();
121 129
122 QStringList listAllUpIpV4Addresses(); 130 QStringList listAllUpIpV4Addresses();
123 QString filterTag(QString tag); 131 QString filterTag(QString tag);
124 132