diff options
| author | Luboš Doležel <lubos@dolezel.info> | 2016-03-21 12:01:41 +0100 |
|---|---|---|
| committer | Luboš Doležel <lubos@dolezel.info> | 2016-03-21 12:01:41 +0100 |
| commit | 64a081694351ecd5a58394247a4da10740f71176 (patch) | |
| tree | 873cec726a7b357c62d23c39d5374e76366dcad3 | |
| parent | 685b0c917a867b024200991caedbf839e535b960 (diff) | |
| parent | 7187a73dd394640cf93837e4e9be015a079c7f5a (diff) | |
| download | twinkle-64a081694351ecd5a58394247a4da10740f71176.tar twinkle-64a081694351ecd5a58394247a4da10740f71176.tar.gz twinkle-64a081694351ecd5a58394247a4da10740f71176.tar.lz twinkle-64a081694351ecd5a58394247a4da10740f71176.tar.xz twinkle-64a081694351ecd5a58394247a4da10740f71176.zip | |
Merge pull request #65 from palinek/warn_fix
Fix couple of wanrnings, typos, wrong usage
| -rw-r--r-- | src/events.cpp | 1 | ||||
| -rw-r--r-- | src/gui/gui.cpp | 7 | ||||
| -rw-r--r-- | src/gui/mphoneform.h | 4 | ||||
| -rw-r--r-- | src/parser/hdr_privacy.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/events.cpp b/src/events.cpp index a034d4d..dcd30d8 100644 --- a/src/events.cpp +++ b/src/events.cpp @@ -41,6 +41,7 @@ string event_type2str(t_event_type t) { case EV_ASYNC_RESPONSE: return "EV_ASYNC_RESPONSE"; case EV_BROKEN_CONNECTION: return "EV_BROKEN_CONNECTION"; case EV_TCP_PING: return "EV_TCP_PING"; + case EV_FN_CALL: return "EV_FN_CALL"; } return "UNKNOWN"; diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 0e91e58..752ae96 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -1487,7 +1487,7 @@ void t_gui::cb_invalid_reg_resp(t_user *user_config, const t_response *r, const QString s; emit mw_display_header(); - qApp->translate("GUI", "%1, registration failed: %2 %3") + s = qApp->translate("GUI", "%1, registration failed: %2 %3") .arg(user_config->get_profile_name().c_str()) .arg(r->code) .arg(r->reason.c_str()); @@ -2689,9 +2689,8 @@ bool t_gui::cb_message_request(t_user *user_config, t_request *r) { // Set error message if attachment could not be saved if (failed_to_save_attachment) { - QString s = qApp->translate("GUI", "Failed to save message attachment: %1"); - s.arg(attachment_error_msg.c_str()); - session->set_error(s.toStdString()); + QString s = qApp->translate("GUI", "Failed to save message attachment: %1").arg(attachment_error_msg.c_str()); + session->set_error(s.toStdString()); } unlock(); diff --git a/src/gui/mphoneform.h b/src/gui/mphoneform.h index 2695b34..1527e8d 100644 --- a/src/gui/mphoneform.h +++ b/src/gui/mphoneform.h @@ -143,8 +143,8 @@ public slots: void showAddressBook(); void selectedAddress( const QString & address ); void enableCallOptions( bool enable ); - void keyPressEvent( QKeyEvent * e ); - void mouseReleaseEvent( QMouseEvent * e ); + virtual void keyPressEvent( QKeyEvent * e ) override; + virtual void mouseReleaseEvent( QMouseEvent * e ) override; void processLeftMouseButtonRelease( QMouseEvent * e ); void processRightMouseButtonRelease( QMouseEvent * e ); void processCryptLabelClick( int line ); diff --git a/src/parser/hdr_privacy.h b/src/parser/hdr_privacy.h index e7d33e2..e40ce63 100644 --- a/src/parser/hdr_privacy.h +++ b/src/parser/hdr_privacy.h @@ -20,7 +20,7 @@ // Privacy header #ifndef _H_HDR_PRIVACY -#define _H_HDR_PRICACY +#define _H_HDR_PRIVACY #include <list> #include <string> |