Fixed a broken merge

[irwi] / src / mainwidget.h

diff --git a/src/mainwidget.h b/src/mainwidget.h
index 4e211d9..da04052 100644 (file)
--- a/src/mainwidget.h
+++ b/src/mainwidget.h
@@ -2,8 +2,7 @@
 #define _MAINWIDGET_H_
 
 #include <QWidget>
-
-#include "iremote.h"
+#include "irctrl.h"
 
 class IEngine;
 class QGridLayout;
@@ -22,7 +21,12 @@ public slots:
     void showSettingsDialog();
 
 private slots:
-    void sendCmdClicked(IRemote::RemoteCmd cmd);
+    void sendCmdVolUp();
+    void sendCmdVolDown();
+    void sendCmdChUp();
+    void sendCmdChDown();
+    void sendCmdPower();
+    void sendCmdMute();
 
 protected:
     void paintEvent(QPaintEvent *event);
@@ -31,7 +35,8 @@ private:
     void resize();
 
 private:
-    IEngine *engine;
+    IrCtrl irCtrl;
+
     QSettings *settings;
     static const int BUTTON_COUNT = 6;
     QGridLayout *layout;