Skip to content
GitLab
Commit bd68d770 authored by Emmanuel Lepage Vallee's avatar Emmanuel Lepage Vallee
Browse files

[ #13801 ] Normalize SIGNAL and SLOTS

parent 06f8dff8
Hide whitespace changes
Inline Side-by-side
kde/src/CallView.cpp
View file @ bd68d770
......@@ -244,17 +244,17 @@ CallView::CallView(QWidget* parent) : QTreeWidget(parent),m_pActiveOverlay(0),m_
}
//User Interface even
// SENDER SIGNAL RECEIVER SLOT /
/**/connect(this , SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int) ) , this, SLOT( itemDoubleClicked(QTreeWidgetItem*,int)) );
/**/connect(this , SIGNAL(itemClicked(QTreeWidgetItem*,int) ) , this, SLOT( itemClicked(QTreeWidgetItem*,int)) );
/**/connect(this , SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)) , this, SLOT( itemClicked(QTreeWidgetItem*)) );
/**/connect(SFLPhone::model() , SIGNAL(conferenceCreated(Call*) ) , this, SLOT( addConference(Call*)) );
/**/connect(SFLPhone::model() , SIGNAL(conferenceChanged(Call*) ) , this, SLOT( conferenceChanged(Call*)) );
/**/connect(SFLPhone::model() , SIGNAL(aboutToRemoveConference(Call*) ) , this, SLOT( conferenceRemoved(Call*)) );
/**/connect(SFLPhone::model() , SIGNAL(callAdded(Call*,Call*) ) , this, SLOT( addCall(Call*,Call*)) );
/**/connect(m_pTransferB , SIGNAL(clicked() ) , this, SLOT( transfer()) );
/**/connect(m_pTransferLE , SIGNAL(returnPressed() ) , this, SLOT( transfer()) );
/* */
// SENDER SIGNAL RECEIVER SLOT /
/**/connect(this , SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)) , this, SLOT(itemDoubleClicked(QTreeWidgetItem*,int)) );
/**/connect(this , SIGNAL(itemClicked(QTreeWidgetItem*,int)) , this, SLOT(itemClicked(QTreeWidgetItem*,int)) );
/**/connect(this , SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)) , this, SLOT(itemClicked(QTreeWidgetItem*)) );
/**/connect(SFLPhone::model() , SIGNAL(conferenceCreated(Call*)) , this, SLOT(addConference(Call*)) );
/**/connect(SFLPhone::model() , SIGNAL(conferenceChanged(Call*)) , this, SLOT(conferenceChanged(Call*)) );
/**/connect(SFLPhone::model() , SIGNAL(aboutToRemoveConference(Call*)) , this, SLOT(conferenceRemoved(Call*)) );
/**/connect(SFLPhone::model() , SIGNAL(callAdded(Call*,Call*)) , this, SLOT(addCall(Call*,Call*)) );
/**/connect(m_pTransferB , SIGNAL(clicked()) , this, SLOT(transfer()) );
/**/connect(m_pTransferLE , SIGNAL(returnPressed()) , this, SLOT(transfer()) );
/* */
} //CallView
......@@ -704,9 +704,9 @@ CallTreeItem* CallView::insertItem(QTreeWidgetItem* item, QTreeWidgetItem* paren
parent->addChild(item);
CallTreeItem* callItem = new CallTreeItem();
connect(callItem, SIGNAL(askTransfer(Call*)) , this, SLOT(showTransferOverlay(Call*) ));
connect(callItem, SIGNAL(transferDropEvent(Call*,QMimeData*)) , this, SLOT(transferDropEvent(Call*,QMimeData*) ));
connect(callItem, SIGNAL(conversationDropEvent(Call*,QMimeData*)), this, SLOT(conversationDropEvent(Call*,QMimeData*) ));
connect(callItem, SIGNAL(askTransfer(Call*)) , this, SLOT(showTransferOverlay(Call*)) );
connect(callItem, SIGNAL(transferDropEvent(Call*,QMimeData*)) , this, SLOT(transferDropEvent(Call*,QMimeData*)) );
connect(callItem, SIGNAL(conversationDropEvent(Call*,QMimeData*)), this, SLOT(conversationDropEvent(Call*,QMimeData*)));
SFLPhone::model()->updateWidget(SFLPhone::model()->getCall(item), callItem);
callItem->setCall(SFLPhone::model()->getCall(item));
......
kde/src/SFLPhone.cpp
View file @ bd68d770
......@@ -287,18 +287,18 @@ void SFLPhone::setupActions()
action_configureShortcut = new KAction(KIcon(KIcon("configure-shortcuts")), i18n("Configure Shortcut"), this);
// SENDER SIGNAL RECEIVER SLOT /
/**/connect(action_accept, SIGNAL(triggered()), m_pView , SLOT(accept() ));
/**/connect(action_refuse, SIGNAL(triggered()), m_pView , SLOT(refuse() ));
/**/connect(action_hold, SIGNAL(triggered()), m_pView , SLOT(hold() ));
/**/connect(action_transfer, SIGNAL(triggered()), m_pView , SLOT(transfer() ));
/**/connect(action_record, SIGNAL(triggered()), m_pView , SLOT(record() ));
/**/connect(action_mailBox, SIGNAL(triggered()), m_pView , SLOT(mailBox() ));
/**/connect(action_displayVolumeControls, SIGNAL(toggled(bool)), m_pView , SLOT(displayVolumeControls(bool) ));
/**/connect(action_displayDialpad, SIGNAL(toggled(bool)), m_pView , SLOT(displayDialpad(bool) ));
/**/connect(action_displayMessageBox, SIGNAL(toggled(bool)), m_pView , SLOT(displayMessageBox(bool) ));
/**/connect(action_accountCreationWizard, SIGNAL(triggered()), m_pView , SLOT(accountCreationWizard() ));
/**/connect(action_pastenumber, SIGNAL(triggered()), m_pView , SLOT(paste() ));
/**/connect(action_configureShortcut, SIGNAL(triggered()), this , SLOT(showShortCutEditor() ));
/**/connect(action_accept, SIGNAL(triggered()), m_pView , SLOT(accept()) );
/**/connect(action_refuse, SIGNAL(triggered()), m_pView , SLOT(refuse()) );
/**/connect(action_hold, SIGNAL(triggered()), m_pView , SLOT(hold()) );
/**/connect(action_transfer, SIGNAL(triggered()), m_pView , SLOT(transfer()) );
/**/connect(action_record, SIGNAL(triggered()), m_pView , SLOT(record()) );
/**/connect(action_mailBox, SIGNAL(triggered()), m_pView , SLOT(mailBox()) );
/**/connect(action_displayVolumeControls, SIGNAL(toggled(bool)), m_pView , SLOT(displayVolumeControls(bool)) );
/**/connect(action_displayDialpad, SIGNAL(toggled(bool)), m_pView , SLOT(displayDialpad(bool)) );
/**/connect(action_displayMessageBox, SIGNAL(toggled(bool)), m_pView , SLOT(displayMessageBox(bool)) );
/**/connect(action_accountCreationWizard, SIGNAL(triggered()), m_pView , SLOT(accountCreationWizard()) );
/**/connect(action_pastenumber, SIGNAL(triggered()), m_pView , SLOT(paste()) );
/**/connect(action_configureShortcut, SIGNAL(triggered()), this , SLOT(showShortCutEditor()) );
/* */
......
kde/src/SFLPhoneView.cpp
View file @ bd68d770
......@@ -129,16 +129,16 @@ SFLPhoneView::SFLPhoneView(QWidget *parent)
m_pMessageBoxW->setVisible(false);
// SENDER SIGNAL RECEIVER SLOT /
/**/connect(SFLPhone::model() , SIGNAL(incomingCall(Call*)) , this , SLOT(on1_incomingCall(Call*) ));
/**/connect(SFLPhone::model() , SIGNAL(voiceMailNotify(const QString &, int)) , this , SLOT(on1_voiceMailNotify(const QString &, int) ));
/**/connect(callView , SIGNAL(itemChanged(Call*)) , this , SLOT(updateWindowCallState() ));
/**/connect(SFLPhone::model() , SIGNAL(incomingCall(Call*)) , this , SLOT(on1_incomingCall(Call*)) );
/**/connect(SFLPhone::model() , SIGNAL(voiceMailNotify(QString,int)) , this , SLOT(on1_voiceMailNotify(QString,int)) );
/**/connect(callView , SIGNAL(itemChanged(Call*)) , this , SLOT(updateWindowCallState()) );
/**///connect(SFLPhone::model() , SIGNAL(volumeChanged(const QString &, double)), this , SLOT(on1_volumeChanged(const QString &, double) ));
/**/connect(SFLPhone::model() , SIGNAL(callStateChanged(Call*)) , this , SLOT(updateWindowCallState() ));
/**/connect(AccountList::getInstance() , SIGNAL(accountStateChanged(Account*,QString)) , this , SLOT(updateStatusMessage() ));
/**/connect(AccountList::getInstance() , SIGNAL(accountListUpdated()) , this , SLOT(updateStatusMessage() ));
/**/connect(AccountList::getInstance() , SIGNAL(accountListUpdated()) , this , SLOT(updateWindowCallState() ));
/**/connect(m_pSendMessageLE , SIGNAL(returnPressed()) , this , SLOT(sendMessage() ));
/**/connect(m_pSendMessagePB , SIGNAL(clicked()) , this , SLOT(sendMessage() ));
/**/connect(SFLPhone::model() , SIGNAL(callStateChanged(Call*)) , this , SLOT(updateWindowCallState()) );
/**/connect(AccountList::getInstance() , SIGNAL(accountStateChanged(Account*,QString)) , this , SLOT(updateStatusMessage()) );
/**/connect(AccountList::getInstance() , SIGNAL(accountListUpdated()) , this , SLOT(updateStatusMessage()) );
/**/connect(AccountList::getInstance() , SIGNAL(accountListUpdated()) , this , SLOT(updateWindowCallState()) );
/**/connect(m_pSendMessageLE , SIGNAL(returnPressed()) , this , SLOT(sendMessage()) );
/**/connect(m_pSendMessagePB , SIGNAL(clicked()) , this , SLOT(sendMessage()) );
/* */
AccountList::getInstance()->updateAccounts();
......@@ -712,7 +712,7 @@ void SFLPhoneView::contextMenuEvent(QContextMenuEvent *event)
QAction* action = new ActionSetAccountFirst(nullptr, &menu);
action->setChecked(AccountList::getPriorAccoundId().isEmpty());
connect(action, SIGNAL(setFirst(Account *)), this , SLOT(setAccountFirst(Account *)));
connect(action, SIGNAL(setFirst(Account*)), this , SLOT(setAccountFirst(Account*)));
menu.addAction(action);
QVector<Account *> accounts = AccountList::getInstance()->registeredAccounts();
......@@ -720,7 +720,7 @@ void SFLPhoneView::contextMenuEvent(QContextMenuEvent *event)
Account* account = accounts.at(i);
QAction* action = new ActionSetAccountFirst(account, &menu);
action->setChecked(account->getAccountId() == AccountList::getPriorAccoundId());
connect(action, SIGNAL(setFirst(Account *)), this , SLOT(setAccountFirst(Account *)));
connect(action, SIGNAL(setFirst(Account*)), this , SLOT(setAccountFirst(Account*)));
menu.addAction(action);
}
menu.exec(event->globalPos());
......
kde/src/conf/dlgaccounts.cpp
View file @ bd68d770
......@@ -68,59 +68,59 @@ DlgAccounts::DlgAccounts(KConfigDialog* parent)
accountListHasChanged = false;
//SLOTS
// SENDER SIGNAL RECEIVER SLOT /
/**/connect(edit1_alias, SIGNAL(textEdited(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(edit2_protocol, SIGNAL(activated(int)) , this , SLOT(changedAccountList() ));
/**/connect(edit3_server, SIGNAL(textEdited(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(edit4_user, SIGNAL(textEdited(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(edit5_password, SIGNAL(textEdited(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(edit6_mailbox, SIGNAL(textEdited(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(spinbox_regExpire, SIGNAL(editingFinished()) , this , SLOT(changedAccountList() ));
/**/connect(comboBox_ni_local_address, SIGNAL(currentIndexChanged (int)) , this , SLOT(changedAccountList() ));
/**/connect(button_accountUp, SIGNAL(clicked()) , this , SLOT(changedAccountList() ));
/**/connect(button_accountDown, SIGNAL(clicked()) , this , SLOT(changedAccountList() ));
/**/connect(button_accountAdd, SIGNAL(clicked()) , this , SLOT(otherAccountChanged() ));
/**/connect(button_accountRemove, SIGNAL(clicked()) , this , SLOT(otherAccountChanged() ));
/**/connect(button_audiocodecDown, SIGNAL(clicked()) , this , SLOT(changedAccountList() ));
/**/connect(button_audiocodecUp, SIGNAL(clicked()) , this , SLOT(changedAccountList() ));
/**/connect(edit_tls_private_key_password, SIGNAL(textEdited(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(spinbox_tls_listener, SIGNAL(editingFinished()) , this , SLOT(changedAccountList() ));
/**/connect(m_pBitrateSB, SIGNAL(editingFinished()) , this , SLOT(changedAccountList() ));
/**/connect(file_tls_authority, SIGNAL(textChanged(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(file_tls_endpoint, SIGNAL(textChanged(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(file_tls_private_key, SIGNAL(textChanged(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(combo_tls_method, SIGNAL(currentIndexChanged(int)) , this , SLOT(changedAccountList() ));
/**/connect(edit_tls_cipher, SIGNAL(textEdited(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(edit_tls_outgoing, SIGNAL(textEdited(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(spinbox_tls_timeout_sec, SIGNAL(editingFinished()) , this , SLOT(changedAccountList() ));
/**/connect(spinbox_tls_timeout_msec, SIGNAL(editingFinished()) , this , SLOT(changedAccountList() ));
/**/connect(check_tls_incoming, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList() ));
/**/connect(check_tls_answer, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList() ));
/**/connect(check_tls_requier_cert, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList() ));
/**/connect(group_security_tls, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList() ));
/**/connect(radioButton_pa_same_as_local, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList() ));
/**/connect(radioButton_pa_custom, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList() ));
/**/connect(m_pRingtoneListLW, SIGNAL(currentRowChanged(int)) , this , SLOT(changedAccountList() ));
/**/connect(m_pUseCustomFileCK, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList() ));
/**/connect(m_pCodecsLW, SIGNAL(itemChanged(QListWidgetItem*)) , this , SLOT(changedAccountList() ));
/**/connect(edit_credential_realm, SIGNAL(textEdited(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(edit_credential_auth, SIGNAL(textEdited(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(edit_credential_password, SIGNAL(textEdited(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(m_pCodecsLW, SIGNAL(currentTextChanged(QString)) , this , SLOT(loadVidCodecDetails(QString) ));
///**/connect(&configurationManager, SIGNAL(accountsChanged()) , this , SLOT(updateAccountStates() ));
/**/connect(edit_tls_private_key_password, SIGNAL(textEdited(const QString &)) , this , SLOT(changedAccountList() ));
/**/connect(this, SIGNAL(updateButtons()) , parent , SLOT(updateButtons() ));
/**/connect(combo_security_STRP, SIGNAL(currentIndexChanged(int)) , this , SLOT(updateCombo(int) ));
/**/connect(button_add_credential, SIGNAL(clicked()) , this , SLOT(addCredential() ));
/**/connect(button_remove_credential, SIGNAL(clicked()) , this , SLOT(removeCredential() ));
/**/connect(edit5_password, SIGNAL(textEdited(const QString &)) , this , SLOT(main_password_field_changed() ));
/**/connect(edit_credential_password, SIGNAL(textEdited(const QString &)) , this , SLOT(main_credential_password_changed() ));
/**/connect(button_audiocodecUp, SIGNAL(clicked()) , this , SLOT(moveAudioCodecUp() ));
/**/connect(button_audiocodecDown, SIGNAL(clicked()) , this , SLOT(moveAudioCodecDown() ));
/**/connect(m_pVCodecUpPB, SIGNAL(clicked()) , this , SLOT(moveVideoCodecUp() ));
/**/connect(m_pVCodecDownPB, SIGNAL(clicked()) , this , SLOT(moveVideoCodecDown() ));
/**/connect(AccountList::getInstance(), SIGNAL(accountEnabledChanged(Account*)), this , SLOT(otherAccountChanged() ));
/* */
// SENDER SIGNAL RECEIVER SLOT /
/**/connect(edit1_alias, SIGNAL(textEdited(QString)) , this , SLOT(changedAccountList()) );
/**/connect(edit2_protocol, SIGNAL(activated(int)) , this , SLOT(changedAccountList()) );
/**/connect(edit3_server, SIGNAL(textEdited(QString)) , this , SLOT(changedAccountList()) );
/**/connect(edit4_user, SIGNAL(textEdited(QString)) , this , SLOT(changedAccountList()) );
/**/connect(edit5_password, SIGNAL(textEdited(QString)) , this , SLOT(changedAccountList()) );
/**/connect(edit6_mailbox, SIGNAL(textEdited(QString)) , this , SLOT(changedAccountList()) );
/**/connect(spinbox_regExpire, SIGNAL(editingFinished()) , this , SLOT(changedAccountList()) );
/**/connect(comboBox_ni_local_address, SIGNAL(currentIndexChanged(int)) , this , SLOT(changedAccountList()) );
/**/connect(button_accountUp, SIGNAL(clicked()) , this , SLOT(changedAccountList()) );
/**/connect(button_accountDown, SIGNAL(clicked()) , this , SLOT(changedAccountList()) );
/**/connect(button_accountAdd, SIGNAL(clicked()) , this , SLOT(otherAccountChanged()) );
/**/connect(button_accountRemove, SIGNAL(clicked()) , this , SLOT(otherAccountChanged()) );
/**/connect(button_audiocodecDown, SIGNAL(clicked()) , this , SLOT(changedAccountList()) );
/**/connect(button_audiocodecUp, SIGNAL(clicked()) , this , SLOT(changedAccountList()) );
/**/connect(edit_tls_private_key_password, SIGNAL(textEdited(QString)) , this , SLOT(changedAccountList()) );
/**/connect(spinbox_tls_listener, SIGNAL(editingFinished()) , this , SLOT(changedAccountList()) );
/**/connect(m_pBitrateSB, SIGNAL(editingFinished()) , this , SLOT(changedAccountList()) );
/**/connect(file_tls_authority, SIGNAL(textChanged(QString)) , this , SLOT(changedAccountList()) );
/**/connect(file_tls_endpoint, SIGNAL(textChanged(QString)) , this , SLOT(changedAccountList()) );
/**/connect(file_tls_private_key, SIGNAL(textChanged(QString)) , this , SLOT(changedAccountList()) );
/**/connect(combo_tls_method, SIGNAL(currentIndexChanged(int)) , this , SLOT(changedAccountList()) );
/**/connect(edit_tls_cipher, SIGNAL(textEdited(QString)) , this , SLOT(changedAccountList()) );
/**/connect(edit_tls_outgoing, SIGNAL(textEdited(QString)) , this , SLOT(changedAccountList()) );
/**/connect(spinbox_tls_timeout_sec, SIGNAL(editingFinished()) , this , SLOT(changedAccountList()) );
/**/connect(spinbox_tls_timeout_msec, SIGNAL(editingFinished()) , this , SLOT(changedAccountList()) );
/**/connect(check_tls_incoming, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList()) );
/**/connect(check_tls_answer, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList()) );
/**/connect(check_tls_requier_cert, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList()) );
/**/connect(group_security_tls, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList()) );
/**/connect(radioButton_pa_same_as_local, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList()) );
/**/connect(radioButton_pa_custom, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList()) );
/**/connect(m_pRingtoneListLW, SIGNAL(currentRowChanged(int)) , this , SLOT(changedAccountList()) );
/**/connect(m_pUseCustomFileCK, SIGNAL(clicked(bool)) , this , SLOT(changedAccountList()) );
/**/connect(m_pCodecsLW, SIGNAL(itemChanged(QListWidgetItem*)) , this , SLOT(changedAccountList()) );
/**/connect(edit_credential_realm, SIGNAL(textEdited(QString)) , this , SLOT(changedAccountList()) );
/**/connect(edit_credential_auth, SIGNAL(textEdited(QString)) , this , SLOT(changedAccountList()) );
/**/connect(edit_credential_password, SIGNAL(textEdited(QString)) , this , SLOT(changedAccountList()) );
/**/connect(m_pCodecsLW, SIGNAL(currentTextChanged(QString)) , this , SLOT(loadVidCodecDetails(QString)) );
///**/connect(&configurationManager, SIGNAL(accountsChanged()) , this , SLOT(updateAccountStates() ));
/**/connect(edit_tls_private_key_password, SIGNAL(textEdited(QString)) , this , SLOT(changedAccountList()) );
/**/connect(this, SIGNAL(updateButtons()) , parent , SLOT(updateButtons()) );
/**/connect(combo_security_STRP, SIGNAL(currentIndexChanged(int)) , this , SLOT(updateCombo(int)) );
/**/connect(button_add_credential, SIGNAL(clicked()) , this , SLOT(addCredential()) );
/**/connect(button_remove_credential, SIGNAL(clicked()) , this , SLOT(removeCredential()) );
/**/connect(edit5_password, SIGNAL(textEdited(QString)) , this , SLOT(main_password_field_changed()) );
/**/connect(edit_credential_password, SIGNAL(textEdited(QString)) , this , SLOT(main_credential_password_changed()));
/**/connect(button_audiocodecUp, SIGNAL(clicked()) , this , SLOT(moveAudioCodecUp()) );
/**/connect(button_audiocodecDown, SIGNAL(clicked()) , this , SLOT(moveAudioCodecDown()) );
/**/connect(m_pVCodecUpPB, SIGNAL(clicked()) , this , SLOT(moveVideoCodecUp()) );
/**/connect(m_pVCodecDownPB, SIGNAL(clicked()) , this , SLOT(moveVideoCodecDown()) );
/**/connect(AccountList::getInstance(), SIGNAL(accountEnabledChanged(Account*)), this , SLOT(otherAccountChanged()) );
/* */
connect(listView_accountList->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(accountListChanged(QModelIndex,QModelIndex)));
connect(listView_accountList->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(updateAccountListCommands()));
......@@ -335,22 +335,22 @@ void DlgAccounts::loadAccount(QModelIndex item)
account->getVideoCodecModel()->reload();
disconnect(list_credential->selectionModel(),SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(selectCredential (QModelIndex,QModelIndex)));
disconnect(list_credential->selectionModel(),SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(selectCredential(QModelIndex,QModelIndex)));
list_credential->setModel(account->getCredentialsModel());
connect(list_credential->selectionModel() ,SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(selectCredential (QModelIndex,QModelIndex)));
connect(list_credential->selectionModel() ,SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(selectCredential(QModelIndex,QModelIndex)));
disconnect(list_audiocodec->selectionModel(),SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(selectedCodecChanged(const QModelIndex&,const QModelIndex&)));
disconnect(list_audiocodec->selectionModel(),SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(selectedCodecChanged(QModelIndex,QModelIndex)));
disconnect(list_audiocodec->model(),SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(changedAccountList()));
list_audiocodec->setModel(account->getAudioCodecModel());
connect(list_audiocodec->model(),SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(changedAccountList()));
connect(list_audiocodec->selectionModel() ,SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(selectedCodecChanged(const QModelIndex&,const QModelIndex&)));
connect(list_audiocodec->selectionModel() ,SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(selectedCodecChanged(QModelIndex,QModelIndex)));
#ifdef ENABLE_VIDEO
disconnect(m_pCodecsLW->selectionModel(),SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(loadVidCodecDetails(const QModelIndex&,const QModelIndex&)));
disconnect(m_pCodecsLW->selectionModel(),SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(loadVidCodecDetails(QModelIndex,QModelIndex)));
disconnect(m_pCodecsLW->model(),SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(changedAccountList()));
m_pCodecsLW->setModel(account->getVideoCodecModel());
connect(m_pCodecsLW->model(),SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(changedAccountList()));
connect(m_pCodecsLW->selectionModel() ,SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(loadVidCodecDetails(const QModelIndex&,const QModelIndex&)));
connect(m_pCodecsLW->selectionModel() ,SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(loadVidCodecDetails(QModelIndex,QModelIndex)));
#endif
......
kde/src/conf/dlgaccountsbase.ui
View file @ bd68d770
......@@ -224,7 +224,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="edit1_alias">
<widget class="KLineEdit" name="edit1_alias">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -250,7 +250,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="edit2_protocol">
<widget class="KComboBox" name="edit2_protocol">
<item>
<property name="text">
<string>SIP</string>
......@@ -274,7 +274,7 @@
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="edit3_server">
<widget class="KLineEdit" name="edit3_server">
<property name="minimumSize">
<size>
<width>0</width>
......@@ -294,7 +294,7 @@
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="edit4_user"/>
<widget class="KLineEdit" name="edit4_user"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label5_password">
......@@ -307,9 +307,9 @@
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="edit5_password">
<widget class="KLineEdit" name="edit5_password">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
<enum>KLineEdit::Password</enum>
</property>
</widget>
</item>
......@@ -324,7 +324,7 @@
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="edit6_mailbox"/>
<widget class="KLineEdit" name="edit6_mailbox"/>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label7_state">
......@@ -419,7 +419,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBox_ni_local_address"/>
<widget class="KComboBox" name="comboBox_ni_local_address"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_ni_local_port">
......@@ -493,7 +493,7 @@
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEdit_pa_published_address"/>
<widget class="KLineEdit" name="lineEdit_pa_published_address"/>
</item>
<item row="3" column="3">
<spacer name="horizontalSpacer_9">
......@@ -797,7 +797,7 @@
<bool>false</bool>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
<enum>KLineEdit::Password</enum>
</property>
</widget>
</item>
......@@ -975,7 +975,7 @@
</widget>
</item>
<item row="5" column="1" colspan="3">
<widget class="QComboBox" name="combo_tls_method">
<widget class="KComboBox" name="combo_tls_method">
<item>
<property name="text">
<string>Default</string>
......@@ -1164,7 +1164,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QComboBox" name="combo_security_STRP">
<widget class="KComboBox" name="combo_security_STRP">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -1278,7 +1278,7 @@
<customwidgets>
<customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<extends>KLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
<customwidget>
......
kde/src/conf/dlggeneral.cpp
View file @ bd68d770
......@@ -57,9 +57,9 @@ DlgGeneral::DlgGeneral(KConfigDialog *parent)
i->setCheckState((checked)?Qt::Checked:Qt::Unchecked);
m_pDetailsList->addItem(m_lItemList[iter.value()] = i);
}
connect(m_pDetailsList , SIGNAL(itemChanged(QListWidgetItem*)) , this , SLOT( changed() ));
connect(m_pAlwaysRecordCK, SIGNAL(clicked(bool) ) , this , SLOT( changed() ));
connect(this , SIGNAL(updateButtons() ) , parent, SLOT( updateButtons()));
connect(m_pDetailsList , SIGNAL(itemChanged(QListWidgetItem*)) , this , SLOT(changed()) );
connect(m_pAlwaysRecordCK, SIGNAL(clicked(bool)) , this , SLOT(changed()) );
connect(this , SIGNAL(updateButtons()) , parent, SLOT(updateButtons()));
}
DlgGeneral::~DlgGeneral()
......
kde/src/conf/dlgvideo.cpp
View file @ bd68d770
......@@ -33,11 +33,11 @@ DlgVideo::DlgVideo(QWidget *parent)
m_pDeviceCB->addItem(dev->getDeviceId());
}
connect(m_pDeviceCB ,SIGNAL(currentIndexChanged(QString)),this,SLOT(loadDevice(QString) ));
connect(m_pChannelCB ,SIGNAL(currentIndexChanged(QString)),this,SLOT(loadResolution(QString) ));
connect(m_pResolutionCB,SIGNAL(currentIndexChanged(QString)),this,SLOT(loadRate(QString) ));
connect(m_pRateCB ,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeRate(QString) ));
connect(m_pPreviewPB ,SIGNAL(clicked() ),this,SLOT(startStopPreview() ));
connect(m_pDeviceCB ,SIGNAL(currentIndexChanged(QString)),this,SLOT(loadDevice(QString)) );
connect(m_pChannelCB ,SIGNAL(currentIndexChanged(QString)),this,SLOT(loadResolution(QString)));
connect(m_pResolutionCB,SIGNAL(currentIndexChanged(QString)),this,SLOT(loadRate(QString)) );
connect(m_pRateCB ,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeRate(QString)) );
connect(m_pPreviewPB ,SIGNAL(clicked()) ,this,SLOT(startStopPreview()) );
m_pConfGB->setEnabled(devices.size());
......
kde/src/conf/dlgvideobase.ui
View file @ bd68d770
......@@ -30,7 +30,7 @@
</widget>
</item>
<item>
<widget class="QComboBox" name="m_pDeviceCB">
<widget class="KComboBox" name="m_pDeviceCB">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -60,7 +60,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="m_pChannelCB">
<widget class="KComboBox" name="m_pChannelCB">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -77,7 +77,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="m_pResolutionCB">
<widget class="KComboBox" name="m_pResolutionCB">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -94,7 +94,7 @@
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="m_pRateCB">
<widget class="KComboBox" name="m_pRateCB">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......
kde/src/klib/AkonadiBackend.cpp
View file @ bd68d770
......@@ -59,7 +59,7 @@ AkonadiBackend::AkonadiBackend(QObject* parent) : ContactBackend(parent)
// fetching all collections containing emails recursively, starting at the root collection
Akonadi::CollectionFetchJob *job = new Akonadi::CollectionFetchJob( Akonadi::Collection::root(), Akonadi::CollectionFetchJob::Recursive, this );
job->fetchScope().setContentMimeTypes( QStringList() << "text/directory" );
connect( job, SIGNAL( collectionsReceived( const Akonadi::Collection::List& ) ), this, SLOT( collectionsReceived( const Akonadi::Collection::List& ) ) );
connect( job, SIGNAL(collectionsReceived(Akonadi::Collection::List)), this, SLOT(collectionsReceived(Akonadi::Collection::List)) );
} //AkonadiBackend
///Destructor
......
kde/src/klib/dataengine/sflphonEngine.cpp
View file @ bd68d770
......@@ -62,12 +62,12 @@ SFLPhoneEngine::SFLPhoneEngine(QObject* parent, const QVariantList& args)
//m_pModel->initHistory();
}
/* SOURCE SIGNAL DESTINATION SLOT */
/**/connect(m_pModel , SIGNAL( callStateChanged(Call*)) , this , SLOT( callStateChangedSignal(Call*) ));
/**/connect(m_pModel , SIGNAL( callAdded(Call*)) , this , SLOT( callStateChangedSignal(Call*) ));
/**/connect(m_pModel , SIGNAL( callStateChanged(Call*)) , this , SLOT( callStateChangedSignal(Call*) ));
/**/connect(AkonadiBackend::getInstance(), SIGNAL( collectionChanged()) , this , SLOT( updateCollection() ));
/* */
/* SOURCE SIGNAL DESTINATION SLOT */
/**/connect(m_pModel , SIGNAL(callStateChanged(Call*)) , this , SLOT(callStateChangedSignal(Call*)) );
/**/connect(m_pModel , SIGNAL(callAdded(Call*)) , this , SLOT(callStateChangedSignal(Call*)) );
/**/connect(m_pModel , SIGNAL(callStateChanged(Call*)) , this , SLOT(callStateChangedSignal(Call*)) );
/**/connect(AkonadiBackend::getInstance(), SIGNAL(collectionChanged()) , this , SLOT(updateCollection()) );
/* */
}
......
kde/src/klib/dataengine/sflphonEngine.h
View file @ bd68d770
......@@ -17,7 +17,6 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***********************************************************************************/
#ifndef SFLPHONEENGINE_H
#define SFLPHONEENGINE_H
......
kde/src/lib/Call.cpp
View file @ bd68d770
......@@ -37,16 +37,16 @@ const call_state Call::actionPerformedStateMap [13][5] =
// ACCEPT REFUSE TRANSFER HOLD RECORD /**/
/*INCOMING */ {CALL_STATE_INCOMING , CALL_STATE_INCOMING , CALL_STATE_ERROR , CALL_STATE_INCOMING , CALL_STATE_INCOMING },/**/
/*RINGING */ {CALL_STATE_ERROR , CALL_STATE_RINGING , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_RINGING },/**/
/*CURRENT */ {CALL_STATE_ERROR , CALL_STATE_CURRENT , CALL_STATE_TRANSFERRED , CALL_STATE_CURRENT , CALL_STATE_CURRENT },/**/
/*CURRENT */ {CALL_STATE_ERROR , CALL_STATE_CURRENT , CALL_STATE_TRANSFERRED , CALL_STATE_CURRENT , CALL_STATE_CURRENT },/**/
/*DIALING */ {CALL_STATE_DIALING , CALL_STATE_OVER , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR },/**/
/*HOLD */ {CALL_STATE_ERROR , CALL_STATE_HOLD , CALL_STATE_TRANSF_HOLD , CALL_STATE_HOLD , CALL_STATE_HOLD },/**/
/*FAILURE */ {CALL_STATE_ERROR , CALL_STATE_FAILURE , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR },/**/
/*BUSY */ {CALL_STATE_ERROR , CALL_STATE_BUSY , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR },/**/
/*TRANSFER */ {CALL_STATE_TRANSFERRED , CALL_STATE_TRANSFERRED , CALL_STATE_CURRENT , CALL_STATE_TRANSFERRED , CALL_STATE_TRANSFERRED },/**/
/*TRANSFER */ {CALL_STATE_TRANSFERRED, CALL_STATE_TRANSFERRED , CALL_STATE_CURRENT , CALL_STATE_TRANSFERRED , CALL_STATE_TRANSFERRED },/**/
/*TRANSF_HOLD */ {CALL_STATE_TRANSF_HOLD, CALL_STATE_TRANSF_HOLD , CALL_STATE_HOLD , CALL_STATE_TRANSF_HOLD , CALL_STATE_TRANSF_HOLD },/**/
/*OVER */ {CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR },/**/
/*ERROR */ {CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR },/**/
/*CONF */ {CALL_STATE_ERROR , CALL_STATE_CURRENT , CALL_STATE_TRANSFERRED , CALL_STATE_CURRENT , CALL_STATE_CURRENT },/**/
/*CONF */ {CALL_STATE_ERROR , CALL_STATE_CURRENT , CALL_STATE_TRANSFERRED , CALL_STATE_CURRENT , CALL_STATE_CURRENT },/**/
/*CONF_HOLD */ {CALL_STATE_ERROR , CALL_STATE_HOLD , CALL_STATE_TRANSF_HOLD , CALL_STATE_HOLD , CALL_STATE_HOLD },/**/
};//
......@@ -72,21 +72,21 @@ const function Call::actionPerformedFunctionMap[13][5] =
const call_state Call::stateChangedStateMap [13][6] =
{
// RINGING CURRENT BUSY HOLD HUNGUP FAILURE /**/
/*INCOMING */ {CALL_STATE_INCOMING , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*RINGING */ {CALL_STATE_RINGING , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*CURRENT */ {CALL_STATE_CURRENT , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*DIALING */ {CALL_STATE_RINGING , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*HOLD */ {CALL_STATE_HOLD , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*FAILURE */ {CALL_STATE_FAILURE , CALL_STATE_FAILURE , CALL_STATE_BUSY , CALL_STATE_FAILURE , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*BUSY */ {CALL_STATE_BUSY , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_BUSY , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*TRANSFER */ {CALL_STATE_TRANSFERRED , CALL_STATE_TRANSFERRED , CALL_STATE_BUSY , CALL_STATE_TRANSF_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*TRANSF_HOLD */ {CALL_STATE_TRANSF_HOLD , CALL_STATE_TRANSFERRED , CALL_STATE_BUSY , CALL_STATE_TRANSF_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*OVER */ {CALL_STATE_OVER , CALL_STATE_OVER , CALL_STATE_OVER , CALL_STATE_OVER , CALL_STATE_OVER , CALL_STATE_OVER },/**/
/*ERROR */ {CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR },/**/
/*CONF */ {CALL_STATE_CURRENT , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*CONF_HOLD */ {CALL_STATE_HOLD , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
};//
// RINGING CURRENT BUSY HOLD HUNGUP FAILURE /**/
/*INCOMING */ {CALL_STATE_INCOMING , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*RINGING */ {CALL_STATE_RINGING , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*CURRENT */ {CALL_STATE_CURRENT , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*DIALING */ {CALL_STATE_RINGING , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*HOLD */ {CALL_STATE_HOLD , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*FAILURE */ {CALL_STATE_FAILURE , CALL_STATE_FAILURE , CALL_STATE_BUSY , CALL_STATE_FAILURE , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*BUSY */ {CALL_STATE_BUSY , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_BUSY , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*TRANSFER */ {CALL_STATE_TRANSFERRED , CALL_STATE_TRANSFERRED, CALL_STATE_BUSY , CALL_STATE_TRANSF_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*TRANSF_HOLD */ {CALL_STATE_TRANSF_HOLD , CALL_STATE_TRANSFERRED, CALL_STATE_BUSY , CALL_STATE_TRANSF_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*OVER */ {CALL_STATE_OVER , CALL_STATE_OVER , CALL_STATE_OVER , CALL_STATE_OVER , CALL_STATE_OVER , CALL_STATE_OVER },/**/
/*ERROR */ {CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR },/**/
/*CONF */ {CALL_STATE_CURRENT , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*CONF_HOLD */ {CALL_STATE_HOLD , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
};//
const function Call::stateChangedFunctionMap[13][6] =
{
......@@ -132,8 +132,8 @@ Call::Call(call_state startState, QString callId, QString peerName, QString peer