# HG changeset patch
# User sheepluva
# Date 1364564821 -3600
# Node ID 6f93822e0b2eec7b1a567e3c1dce84cec3cedfca
# Parent  509d812ca21972af2ede591b6b2ef31e0a79eeaf# Parent  01e13871f578b7f97aadc921ec290778bba8d608
merge

diff -r 01e13871f578 -r 6f93822e0b2e QTfrontend/util/MessageDialog.h
--- a/QTfrontend/util/MessageDialog.h	Fri Mar 29 08:10:44 2013 -0400
+++ b/QTfrontend/util/MessageDialog.h	Fri Mar 29 14:47:01 2013 +0100
@@ -29,6 +29,14 @@
         static int ShowFatalMessage(const QString & msg, QWidget * parent = 0);
         static int ShowErrorMessage(const QString & msg, QWidget * parent = 0);
         static int ShowInfoMessage(const QString & msg, QWidget * parent = 0);
+        /**
+         * @brief Displays a message.
+         * @param title message title or <code>NULL</code> if no/default title
+         * @param msg message to display
+         * @param icon (optional) icon to be displayed next to the message
+         * @param parent parent Widget
+         * @return a QMessageBox::StandardButton value indicating which button was clicked
+         */
         static int ShowMessage(const QString & title, const QString & msg, QMessageBox::Icon icon = QMessageBox::NoIcon, QWidget * parent = 0);
 };