X-Git-Url: https://git.ralfj.de/multypo.git/blobdiff_plain/d80ad6a5afce75add282ea1dce0d71927c0c459b..4978fd909202554270ec12c87d78a990001b17e4:/qt/main.cpp?ds=sidebyside

diff --git a/qt/main.cpp b/qt/main.cpp
index 5b77857..de96e68 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -1,24 +1,20 @@
-#include "multikbd.h"
-#include <QApplication>
+#include "multypo.h"
 
+#include <QApplication>
 #include <QDebug>
 
-#include <X11/Xlib.h>
-#include <X11/extensions/XInput2.h>
-#include <X11/Xutil.h>
-
-MultiKBD *window;
+MultypoWindow *window;
 
-class QMyApplication : public QApplication
+class MultypoApplication : public QApplication
 {
 public:
-	QMyApplication(int argc, char **argv)
+	MultypoApplication(int &argc, char **argv)
 		: QApplication(argc, argv) {}
 
 	virtual bool x11EventFilter ( XEvent * event );
 };
 
-bool QMyApplication::x11EventFilter ( XEvent * event )
+bool MultypoApplication::x11EventFilter ( XEvent * event )
 {
 	if (!window) return false;
 	return window->handleX11Event(event);
@@ -26,8 +22,8 @@ bool QMyApplication::x11EventFilter ( XEvent * event )
 
 int main(int argc, char *argv[])
 {
-	QMyApplication a(argc, argv);
-	window = new MultiKBD();
+	MultypoApplication a(argc, argv);
+	window = new MultypoWindow();
 	window->setAttribute(Qt::WA_DeleteOnClose);
 	window->show();