Added combobox slot for changing the profile

14 years ago · 04bc42a5c7
parent 274bce22c3
commit 04bc42a5c7
1 changed files with 4 additions and 0 deletions
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@ -30,7 +30,11 @@ public slots:
    void masterSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
    void setCheckstate(QModelIndex index);
    void resizeRows();
+<<<<<<< HEAD
    void profileChanged(const QString &current, const QString &previous);
+=======
+    void profileChanged(const QString &profile);
+>>>>>>> 766e3f6... Added combobox slot for changing the profile

 private:
    QTableWidget *mMastersWidget;