--- a/QTfrontend/ui/widget/keybinder.h	Tue May 07 16:08:27 2019 +0200
+++ b/QTfrontend/ui/widget/keybinder.h	Tue May 07 18:45:14 2019 +0200
@@ -29,6 +29,7 @@
 class QTableWidget;
 class QBoxLayout;
 class QComboBox;
+class QLabel;
 
 // USAGE NOTE: Every time the widget comes into view, you must call resetInterface()
 
@@ -43,6 +44,9 @@
         void setBindIndex(int keyIndex, int bindIndex);
         int bindIndex(int keyIndex);
         void resetInterface();
+        bool hasConflicts();
+        bool checkConflicts();
+        bool checkConflictsWith(int bind, bool updateState);
 
     private:
         QHash<QObject *, QTableWidgetItem *> * bindComboBoxCellMappings;
@@ -51,8 +55,10 @@
         QListWidget * catList;
         QBoxLayout *bindingsPages;
         QComboBox * CBBind[BINDS_NUMBER];
+        QLabel * conflictLabel;
         QString defaultText;
         bool enableSignal;
+        bool p_hasConflicts;
 
     signals:
         void bindUpdate(int bindID);