[ #30839 ] Cleanup, documentation

src/call.cpp

@@ -792,7 +792,7 @@ Call::State Call::stateChanged(const QString& newStateName)
 } //stateChanged
 
 ///An account have been performed
-Call::State Call::actionPerformed(Call::Action action)
+Call::State Call::performAction(Call::Action action)
 {
    const Call::State previousState = m_CurrentState;
    //update the state

src/call.h

@@ -264,7 +264,7 @@ public:
 
    //Automated function
    Call::State stateChanged(const QString & newState);
-   Call::State actionPerformed(Call::Action action);
+   Call::State performAction(Call::Action action);
 
    //Setters
    void setConference     ( bool               value      );

src/callmodel.cpp

@@ -290,7 +290,7 @@ Call* CallModel::addIncomingCall(const QString& callId)
    //Call without account is not possible
    if (dynamic_cast<Account*>(call->account())) {
       if (call->account()->isAutoAnswer()) {
-         call->actionPerformed(Call::Action::ACCEPT);
+         call->performAction(Call::Action::ACCEPT);
       }
    }
    else {
@@ -378,7 +378,7 @@ void CallModel::transfer(Call* toTransfer, QString target)
    qDebug() << "Transferring call " << toTransfer->id() << "to" << target;
    toTransfer->setTransferNumber ( target                 );
    toTransfer->changeCurrentState( Call::State::TRANSFERRED );
-   toTransfer->actionPerformed   ( Call::Action::TRANSFER   );
+   toTransfer->performAction     ( Call::Action::TRANSFER   );
    toTransfer->changeCurrentState( Call::State::OVER        );
 } //transfer
 
@@ -761,7 +761,7 @@ bool CallModel::dropMimeData(const QMimeData* mimedata, Qt::DropAction action, i
       qDebug() << "Phone number" << encodedPhoneNumber << "on call" << target;
       Call* newCall = addDialingCall(QString(),target->account());
       newCall->setDialNumber(encodedPhoneNumber);
-      newCall->actionPerformed(Call::Action::ACCEPT);
+      newCall->performAction(Call::Action::ACCEPT);
       createConferenceFromCall(newCall,target);
    }
    else if (mimedata->hasFormat(MIME_CONTACT)) {
@@ -773,7 +773,7 @@ bool CallModel::dropMimeData(const QMimeData* mimedata, Qt::DropAction action, i
          if (!number->uri().isEmpty()) {
             Call* newCall = addDialingCall();
             newCall->setDialNumber(number);
-            newCall->actionPerformed(Call::Action::ACCEPT);
+            newCall->performAction(Call::Action::ACCEPT);
             createConferenceFromCall(newCall,target);
          }
          else {
@@ -947,6 +947,11 @@ void CallModel::slotStoppedDecoding(const QString& callId, const QString& shmKey
 ///Update model if the data change
 void CallModel::slotCallChanged(Call* call)
 {
+   //Transfer is "local" state, it doesn't require the daemon, so it need to be
+   //handled "manually" instead of relying on the backend signals
+   if (call->state() == Call::State::TRANSFERRED) {
+      emit callStateChanged(call, Call::State::TRANSFERRED);
+   }
    InternalStruct* callInt = m_sPrivateCallList_call[call];
    if (callInt) {
       const int idxOf = m_lInternalModel.indexOf(callInt);

src/numbercompletionmodel.cpp

@@ -60,10 +60,13 @@ QVariant NumberCompletionModel::data(const QModelIndex& index, int role ) const
             case Qt::ToolTipRole:
                return QString("<table><tr><td>%1</td></tr><tr><td>%2</td></tr></table>").arg(n->primaryName()).arg(n->type());
                break;
-            case Qt::DecorationRole:
-               if (NumberCategoryModel::instance()->visitor())
-                  return NumberCategoryModel::instance()->nameToIndex(n->type()).data(Qt::DecorationRole);
-               break;
+            case Qt::DecorationRole: {
+               if (NumberCategoryModel::instance()->visitor()) {
+                  const QModelIndex idx2 = NumberCategoryModel::instance()->nameToIndex(n->type());
+                  if (idx2.isValid())
+                     return idx2.data(Qt::DecorationRole);
+               }
+               } break;
             case NumberCompletionModel::Role::ALTERNATE_ACCOUNT:
                if (needAcc)
                   return n->account()->alias();