summary refs log tree commit diff
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-04-24 23:57:49 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-04-24 23:57:49 +0300
commitb655a503a7d16789bd46911e444a8b0ef328da31 (patch)
treed0d81ffc6e31c5f5084fe728a4db21d3e9108d08
parentAdjust completion menu to fit its contents (diff)
downloadnheko-b655a503a7d16789bd46911e444a8b0ef328da31.tar.xz
Fix signal redefinition warning
-rw-r--r--include/ChatPage.h2
-rw-r--r--src/ChatPage.cc2
-rw-r--r--src/MainWindow.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/ChatPage.h b/include/ChatPage.h

index c456b66f..16c0c322 100644 --- a/include/ChatPage.h +++ b/include/ChatPage.h
@@ -83,7 +83,7 @@ public: signals: void contentLoaded(); - void close(); + void closing(); void changeWindowTitle(const QString &msg); void unreadMessages(int count); void showNotification(const QString &msg); diff --git a/src/ChatPage.cc b/src/ChatPage.cc
index f2efb684..f64f332d 100644 --- a/src/ChatPage.cc +++ b/src/ChatPage.cc
@@ -453,7 +453,7 @@ ChatPage::logout() resetUI(); - emit close(); + emit closing(); } void diff --git a/src/MainWindow.cc b/src/MainWindow.cc
index 5d5cb598..c59ce2d9 100644 --- a/src/MainWindow.cc +++ b/src/MainWindow.cc
@@ -93,7 +93,7 @@ MainWindow::MainWindow(QWidget *parent) }); connect(register_page_, SIGNAL(backButtonClicked()), this, SLOT(showWelcomePage())); - connect(chat_page_, SIGNAL(close()), this, SLOT(showWelcomePage())); + connect(chat_page_, &ChatPage::closing, this, &MainWindow::showWelcomePage); connect( chat_page_, &ChatPage::showOverlayProgressBar, this, &MainWindow::showOverlayProgressBar); connect(