more consistent display of player name

[multypo.git] / qt / main.cpp

diff --git a/qt/main.cpp b/qt/main.cpp
index 5b778571fb21ddccdbe78cab30b16ab032568ef1..de96e688983d15205f80e029ce81428086fa36da 100644 (file)
--- 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 <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:
 {
 public:

-       QMyApplication(int argc, char **argv)
+       MultypoApplication(int &argc, char **argv)

                : QApplication(argc, argv) {}
 
        virtual bool x11EventFilter ( XEvent * event );
 };
 
                : 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);
 {
        if (!window) return false;
        return window->handleX11Event(event);


@@ -26,8 +22,8 @@ bool QMyApplication::x11EventFilter ( XEvent * event )
 
 int main(int argc, char *argv[])
 {
 
 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();
        
        window->setAttribute(Qt::WA_DeleteOnClose);
        window->show();