X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.h;h=f2eaea8bc00aa0cd95fa40eafa54cdc6edfa67ed;hb=8ff7cd03f3c827602cb6603f758024cb973ea59e;hp=ed5e48696ebf6f7bf606e86b9fb89f21db4b716b;hpb=f245cb0d0453e0e8bd5c7d40720bd0a5b50454ee;p=nageru

diff --git a/glwidget.h b/glwidget.h
index ed5e486..f2eaea8 100644
--- a/glwidget.h
+++ b/glwidget.h
@@ -2,15 +2,16 @@
 #define GLWIDGET_H
 
 #include <epoxy/gl.h>
-#include <QGLWidget>
+#include <QGL>
+#include <QString>
 #include <string>
 #include <vector>
 
 #include "mixer.h"
-#include "qgl.h"
-#include "qobjectdefs.h"
 
 class QMouseEvent;
+class QObject;
+class QPoint;
 class QWidget;
 
 namespace movit {
@@ -46,10 +47,11 @@ protected:
 signals:
 	void clicked();
 	void transition_names_updated(std::vector<std::string> transition_names);
-	void resolution_updated(Mixer::Output output);
+	void name_updated(Mixer::Output output, const std::string &name);
+	void color_updated(Mixer::Output output, const std::string &color);
 
 private slots:
-	void show_context_menu(int signal_num, const QPoint &pos);
+	void show_context_menu(unsigned signal_num, const QPoint &pos);
 
 private:
 	Mixer::Output output;