diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/gui.cpp | 7 | ||||
-rw-r--r-- | src/gui/gui.h | 4 | ||||
-rw-r--r-- | src/gui/userprofileform.cpp | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index bb5be62..743f15f 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -492,7 +492,7 @@ void t_gui::do_help(const list<t_command_arg> &al) { return; } -bool t_gui::gui_do_invite(const QString &destination, const QString &display, +void t_gui::gui_do_invite(const QString &destination, const QString &display, const QString &subject, bool immediate, bool anonymous) { @@ -671,7 +671,7 @@ void t_gui::gui_do_retrieve(void) } } -bool t_gui::gui_do_refer(const QString &destination, t_transfer_type transfer_type, +void t_gui::gui_do_refer(const QString &destination, t_transfer_type transfer_type, bool immediate) { if (mainWindow->callTransfer->isEnabled() && @@ -2789,7 +2789,8 @@ void t_gui::cmd_quit(void) { void t_gui::cmd_show(void) { lock(); if (mainWindow->isMinimized()) { - mainWindow->setWindowState(mainWindow->windowState() & ~Qt::WindowMinimized | Qt::WindowActive); + mainWindow->setWindowState((mainWindow->windowState() & ~Qt::WindowMinimized) | + Qt::WindowActive); mainWindow->raise(); } else { mainWindow->show(); diff --git a/src/gui/gui.h b/src/gui/gui.h index bd817aa..10f5ea2 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -148,7 +148,7 @@ protected: virtual void do_quit(void); virtual void do_help(const list<t_command_arg> &al); private slots: - bool gui_do_invite(const QString &destination, const QString &display, + void gui_do_invite(const QString &destination, const QString &display, const QString &subject, bool immediate, bool anonymous); void gui_do_redial(void); @@ -165,7 +165,7 @@ private slots: void gui_do_bye(void); void gui_do_hold(void); void gui_do_retrieve(void); - bool gui_do_refer(const QString &destination, + void gui_do_refer(const QString &destination, t_transfer_type transfer_type, bool immediate); void gui_do_conference(void); void gui_do_mute(bool toggle, bool enable); diff --git a/src/gui/userprofileform.cpp b/src/gui/userprofileform.cpp index 368a3fe..6a9e39b 100644 --- a/src/gui/userprofileform.cpp +++ b/src/gui/userprofileform.cpp @@ -1046,7 +1046,7 @@ bool UserProfileForm::validateValues() // RTP AUDIO // Codecs list<t_audio_codec> audio_codecs; - for (size_t i = 0; i < activeCodecListBox->count(); i++) { + for (int i = 0; i < activeCodecListBox->count(); i++) { audio_codecs.push_back(label2codec(activeCodecListBox->item(i)->text())); } current_profile->set_codecs(audio_codecs); @@ -1347,7 +1347,7 @@ void UserProfileForm::chooseRemoteReleaseScript() } void UserProfileForm::addCodec() { - for (size_t i = 0; i < availCodecListBox->count(); i++) { + for (int i = 0; i < availCodecListBox->count(); i++) { if (availCodecListBox->item(i)->isSelected()) { activeCodecListBox->addItem(availCodecListBox->item(i)->text()); @@ -1359,7 +1359,7 @@ void UserProfileForm::addCodec() { } void UserProfileForm::removeCodec() { - for (size_t i = 0; i < activeCodecListBox->count(); i++) { + for (int i = 0; i < activeCodecListBox->count(); i++) { if (activeCodecListBox->item(i)->isSelected()) { availCodecListBox->addItem(activeCodecListBox->item(i)->text()); availCodecListBox->item(availCodecListBox->count() - 1)->setSelected(true); |