diff options
| author | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-04-08 08:34:35 +0000 |
|---|---|---|
| committer | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-04-08 08:34:35 +0000 |
| commit | 1b21dade7c7203050449377f61615e17d2b98825 (patch) | |
| tree | 42eed454462bd563a5515a1ee998f0b74656b81b | |
| parent | f3ade25de71804c56cbb047bbd8629d09c24a50c (diff) | |
| download | navit-svn-1b21dade7c7203050449377f61615e17d2b98825.tar.gz | |
Fix:gui/qml:Shutdown procedure improved
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit/navit@3142 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | gui/qml/gui_qml.cpp | 10 | ||||
| -rw-r--r-- | gui/qml/navitProxy.h | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/gui/qml/gui_qml.cpp b/gui/qml/gui_qml.cpp index ccd85b43..27871541 100644 --- a/gui/qml/gui_qml.cpp +++ b/gui/qml/gui_qml.cpp @@ -99,13 +99,21 @@ public: this->object=this_; } protected: - virtual void resizeEvent(QResizeEvent *) { + void resizeEvent(QResizeEvent *) { this->object->w=this->width(); this->object->h=this->height(); //YES, i KNOW about signal/slot thing this->object->guiProxy->setWidth(this->width()); this->object->guiProxy->setHeight(this->height()); } + void closeEvent(QCloseEvent * event) { + struct attr navit; + navit.type=attr_navit; + navit.u.navit=this->object->nav; + navit_destroy(navit.u.navit); + event_main_loop_quit(); + event->accept(); + } private: struct gui_priv* object; }; diff --git a/gui/qml/navitProxy.h b/gui/qml/navitProxy.h index 3667052b..5e2c800d 100644 --- a/gui/qml/navitProxy.h +++ b/gui/qml/navitProxy.h @@ -11,11 +11,6 @@ public: public slots: void quit() { - struct attr navit; - navit.type=attr_navit; - navit.u.navit=this->object->nav; - navit_destroy(navit.u.navit); - event_main_loop_quit(); this->object->mainWindow->close(); } void setObjectByName(const QString& attr_name,const QString& attr_value) { |