Merge with branch1.1

1 files changed, 49 insertions, 47 deletions

diff --git a/src/selectiondialog.h b/src/selectiondialog.h
index a2844e97..fc04291e 100644
--- a/src/selectiondialog.h
+++ b/src/selectiondialog.h
@@ -17,50 +17,52 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef SELECTIONDIALOG_H

-#define SELECTIONDIALOG_H

-

-#include <QDialog>

-#include <QAbstractButton>

-

-namespace Ui {

-class SelectionDialog;

-}

-

-class SelectionDialog : public QDialog

-{

-  Q_OBJECT

-  

-public:

-

-  explicit SelectionDialog(const QString &description, QWidget *parent = 0);

-

-  ~SelectionDialog();

-

-  /**

-   * @brief add a choice to the dialog

-   * @param buttonText the text to be displayed on the button

-   * @param description the description that shows up under in small letters inside the button

-   * @param data data to be stored with the button. Please note that as soon as one choice has data associated with it (non-invalid QVariant)

-   *             all buttons that contain no data will be treated as "cancel" buttons

-   */

-  void addChoice(const QString &buttonText, const QString &description, const QVariant &data);

-

-  QVariant getChoiceData();

-  QString getChoiceString();

-

-private slots:

-

-  void on_buttonBox_clicked(QAbstractButton *button);

-

-  void on_cancelButton_clicked();

-

-private:

-

-  Ui::SelectionDialog *ui;

-  QAbstractButton *m_Choice;

-  bool m_ValidateByData;

-

-};

-

-#endif // SELECTIONDIALOG_H

+#ifndef SELECTIONDIALOG_H
+#define SELECTIONDIALOG_H
+
+#include <QDialog>
+#include <QAbstractButton>
+
+namespace Ui {
+class SelectionDialog;
+}
+
+class SelectionDialog : public QDialog
+{
+  Q_OBJECT
+  
+public:
+
+  explicit SelectionDialog(const QString &description, QWidget *parent = 0);
+
+  ~SelectionDialog();
+
+  /**
+   * @brief add a choice to the dialog
+   * @param buttonText the text to be displayed on the button
+   * @param description the description that shows up under in small letters inside the button
+   * @param data data to be stored with the button. Please note that as soon as one choice has data associated with it (non-invalid QVariant)
+   *             all buttons that contain no data will be treated as "cancel" buttons
+   */
+  void addChoice(const QString &buttonText, const QString &description, const QVariant &data);
+
+  int numChoices() const;
+
+  QVariant getChoiceData();
+  QString getChoiceString();
+
+private slots:
+
+  void on_buttonBox_clicked(QAbstractButton *button);
+
+  void on_cancelButton_clicked();
+
+private:
+
+  Ui::SelectionDialog *ui;
+  QAbstractButton *m_Choice;
+  bool m_ValidateByData;
+
+};
+
+#endif // SELECTIONDIALOG_H