Fix crash when running debug build; use QString instead of C string

diff --git a/qt/main.cpp b/qt/main.cpp
index 5b778571fb21ddccdbe78cab30b16ab032568ef1..281bc971d6aa837a39cfd9a782a2a2f105f18a44 100644 (file)
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -12,7 +12,7 @@ MultiKBD *window;
 class QMyApplication : public QApplication
 {
 public:
 class QMyApplication : public QApplication
 {
 public:

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

                : QApplication(argc, argv) {}
 
        virtual bool x11EventFilter ( XEvent * event );
                : QApplication(argc, argv) {}
 
        virtual bool x11EventFilter ( XEvent * event );

diff --git a/qt/multikbd.cpp b/qt/multikbd.cpp
index c43dd20d18c80ac694dc701f7453de85ebaba33a..fb30f2125bf923e4748ae6fd955a7185dcecd1aa 100644 (file)
--- a/qt/multikbd.cpp
+++ b/qt/multikbd.cpp
@@ -59,7 +59,7 @@ void MultiKBD::showEvent ( QShowEvent * )
        setFocus(Qt::OtherFocusReason);*/
 }
 
        setFocus(Qt::OtherFocusReason);*/
 }
 

-void MultiKBD::handleKeyPress(int device, const char *string)
+void MultiKBD::handleKeyPress(int device, QString string)

 {
        qDebug() << "Device" << device << "String" << string;
 }
 {
        qDebug() << "Device" << device << "String" << string;
 }

diff --git a/qt/multikbd.h b/qt/multikbd.h
index d7fd3c9d9605e5548cf92c63ceed0946378ab5b0..0244467e59634094cc349252ea509d67d43fe1c5 100644 (file)
--- a/qt/multikbd.h
+++ b/qt/multikbd.h
@@ -21,7 +21,7 @@ protected:
        virtual void showEvent (QShowEvent *);
 
 private:
        virtual void showEvent (QShowEvent *);
 
 private:

-       void handleKeyPress(int device, const char *string);
+       void handleKeyPress(int device, QString string);

 
 private:
        Ui::MultiKBD *ui;
 
 private:
        Ui::MultiKBD *ui;