#
#
# patch "src/view/dialogs/DatabaseDialogManager.h"
#  from [2b8707058b88264e418d76c9b7b6a738508f1bee]
#    to [a7b7d5e31e3cc79221cc27125bc817c2472a871e]
# 
# patch "src/view/dialogs/DialogManager.h"
#  from [7c69e02ec24c2381e6daaf60317167c1130e8838]
#    to [fb0c84bfd291c84c6ab6614f5b0f428ee284353b]
# 
# patch "src/view/dialogs/ServerDialogManager.h"
#  from [d13c5ecabc71d45ef641465f2160cabdc1bd083b]
#    to [c6fc35b5aef74c4989563d2be9c35f0f34501905]
# 
# patch "src/view/dialogs/WorkspaceDialogManager.h"
#  from [5fa1b3ab7ff31d3c0371082cda16f70c2105c841]
#    to [eae2f25603ff4f374e5599791636c7152aa2601a]
#
============================================================
--- src/view/dialogs/DialogManager.h	7c69e02ec24c2381e6daaf60317167c1130e8838
+++ src/view/dialogs/DialogManager.h	fb0c84bfd291c84c6ab6614f5b0f428ee284353b
@@ -46,8 +46,8 @@ public slots:
     void showCreateDatabase();
     void showKeyManagement();
     void showGenerateKeypair();
-    void showChangeKeyPassword(const QString &);
-    void showSourcePicker(const MonotoneHandle::Type &);
+    void showChangeKeyPassword(const QString & keyHash);
+    void showSourcePicker(const MonotoneHandle::Type & handleType);
 
 signals:
     void sourceSelected(const MonotoneHandlePtr &);
============================================================
--- src/view/dialogs/DatabaseDialogManager.h	2b8707058b88264e418d76c9b7b6a738508f1bee
+++ src/view/dialogs/DatabaseDialogManager.h	a7b7d5e31e3cc79221cc27125bc817c2472a871e
@@ -52,16 +52,16 @@ public slots:
 public slots:
     void showChangesetBrowser();
     void showCheckoutRevision();
-    void showFileDiff(const QString & file, const QString & base, const QString & target);
+    void showFileDiff(const QString & file, const QString & baseRevision, const QString & targetRevision);
     void showFileHistory(const QString & file, const QString & startRevision);
     void showNetsync();
     void showNewProjectSetup();
-    void showRevisionDiff(const QString & path, const QString & base, const QString & target);
+    void showRevisionDiff(const QString & path, const QString & baseRevision, const QString & targetRevision);
     void showRevisionManifest(const QString & revision);
     void showSelectRevision();
     void showSelectRevision(const QString & selector);
-    void showAnnotation(const QString &, const QString &);
-    void showCreateCert(const QString & rev, const QString & certName = QString());
+    void showAnnotation(const QString & revision, const QString & file);
+    void showCreateCert(const QString & revision, const QString & certName = QString());
 
 protected:
     ChangesetBrowser    * changesetBrowser;
============================================================
--- src/view/dialogs/WorkspaceDialogManager.h	5fa1b3ab7ff31d3c0371082cda16f70c2105c841
+++ src/view/dialogs/WorkspaceDialogManager.h	eae2f25603ff4f374e5599791636c7152aa2601a
@@ -45,12 +45,12 @@ public slots:
 
 public slots:
     void showCommitRevision();
-    void showCommitRevision(const QStringList &);
+    void showCommitRevision(const QStringList & paths);
     void checkForUnaccountedRenames();
     void showUpdateWorkspace();
-    void showFileDiff(const QString &);
-    void showFileHistory(const QString &);
-    void showAnnotation(const QString &);
+    void showFileDiff(const QString & file);
+    void showFileHistory(const QString & file);
+    void showAnnotation(const QString & file);
 
 protected:
     CommitRevision      * commitRevision;
============================================================
--- src/view/dialogs/ServerDialogManager.h	d13c5ecabc71d45ef641465f2160cabdc1bd083b
+++ src/view/dialogs/ServerDialogManager.h	c6fc35b5aef74c4989563d2be9c35f0f34501905
@@ -46,14 +46,14 @@ public slots:
 
 public slots:
     void showChangesetBrowser();
-    void showFileDiff(const QString & file, const QString & base, const QString & target);
+    void showFileDiff(const QString & file, const QString & baseRevision, const QString & targetRevision);
     void showFileHistory(const QString & file, const QString & startRevision);
     void showNetsync();
-    void showRevisionDiff(const QString & path, const QString & base, const QString & target);
+    void showRevisionDiff(const QString & path, const QString & baseRevision, const QString & targetRevision);
     void showRevisionManifest(const QString & revision);
     void showSelectRevision();
     void showSelectRevision(const QString & selector);
-    void showCreateCert(const QString & rev, const QString & certName = QString());
+    void showCreateCert(const QString & revision, const QString & certName = QString());
 
 protected:
     ChangesetBrowser    * changesetBrowser;