Browse Source

refactor: Rename signal and remove unused params

reviewable/pr4833/r2
Diadlo 8 years ago
parent
commit
9ac5f881c6
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
  1. 3
      src/core/core.cpp
  2. 2
      src/core/core.h
  3. 2
      src/nexus.cpp
  4. 11
      src/widget/widget.cpp
  5. 2
      src/widget/widget.h

3
src/core/core.cpp

@ -677,10 +677,9 @@ void Core::sendGroupMessageWithType(int groupId, const QString& message, TOX_MES
TOX_ERR_CONFERENCE_SEND_MESSAGE error; TOX_ERR_CONFERENCE_SEND_MESSAGE error;
bool ok = tox_conference_send_message(tox, groupId, type, cMsg.data(), cMsg.size(), &error); bool ok = tox_conference_send_message(tox, groupId, type, cMsg.data(), cMsg.size(), &error);
if (!ok || !parseConferenceSendMessageError(error)) { if (!ok || !parseConferenceSendMessageError(error)) {
emit groupSentResult(groupId, message, -1); emit groupSentFailed(groupId);
return; return;
} }
} }
} }

2
src/core/core.h

@ -156,7 +156,7 @@ signals:
void idSet(const ToxId& id); void idSet(const ToxId& id);
void messageSentResult(uint32_t friendId, const QString& message, int messageId); void messageSentResult(uint32_t friendId, const QString& message, int messageId);
void groupSentResult(int groupId, const QString& message, int result); void groupSentFailed(int groupId);
void actionSentResult(uint32_t friendId, const QString& action, int success); void actionSentResult(uint32_t friendId, const QString& action, int success);
void receiptRecieved(int friedId, int receipt); void receiptRecieved(int friedId, int receipt);

2
src/nexus.cpp

@ -228,7 +228,7 @@ void Nexus::showMainGUI()
connect(core, &Core::emptyGroupCreated, widget, &Widget::onEmptyGroupCreated); connect(core, &Core::emptyGroupCreated, widget, &Widget::onEmptyGroupCreated);
connect(core, &Core::friendTypingChanged, widget, &Widget::onFriendTypingChanged); connect(core, &Core::friendTypingChanged, widget, &Widget::onFriendTypingChanged);
connect(core, &Core::messageSentResult, widget, &Widget::onMessageSendResult); connect(core, &Core::messageSentResult, widget, &Widget::onMessageSendResult);
connect(core, &Core::groupSentResult, widget, &Widget::onGroupSendResult); connect(core, &Core::groupSentFailed, widget, &Widget::onGroupSendFailed);
connect(widget, &Widget::statusSet, core, &Core::setStatus); connect(widget, &Widget::statusSet, core, &Core::setStatus);
connect(widget, &Widget::friendRequested, core, &Core::requestFriendship); connect(widget, &Widget::friendRequested, core, &Core::requestFriendship);

11
src/widget/widget.cpp

@ -2040,19 +2040,16 @@ void Widget::onMessageSendResult(uint32_t friendId, const QString& message, int
} }
} }
void Widget::onGroupSendResult(int groupId, const QString& message, int result) void Widget::onGroupSendFailed(int groupId)
{ {
Q_UNUSED(message)
Group* g = GroupList::findGroup(groupId); Group* g = GroupList::findGroup(groupId);
if (!g) { if (!g) {
return; return;
} }
if (result == -1) { QString message = tr("Message failed to send");
QString message = tr("Message failed to send"); QDateTime curTime = QDateTime::currentDateTime();
QDateTime curTime = QDateTime::currentDateTime(); g->getChatForm()->addSystemInfoMessage(message, ChatMessage::INFO, curTime);
g->getChatForm()->addSystemInfoMessage(message, ChatMessage::INFO, curTime);
}
} }
void Widget::onFriendTypingChanged(int friendId, bool isTyping) void Widget::onFriendTypingChanged(int friendId, bool isTyping)

2
src/widget/widget.h

@ -170,7 +170,7 @@ public slots:
void onGroupNamelistChanged(int groupnumber, int peernumber, uint8_t change); void onGroupNamelistChanged(int groupnumber, int peernumber, uint8_t change);
void onGroupTitleChanged(int groupnumber, const QString& author, const QString& title); void onGroupTitleChanged(int groupnumber, const QString& author, const QString& title);
void onGroupPeerAudioPlaying(int groupnumber, int peernumber); void onGroupPeerAudioPlaying(int groupnumber, int peernumber);
void onGroupSendResult(int groupId, const QString& message, int result); void onGroupSendFailed(int groupId);
void onFriendTypingChanged(int friendId, bool isTyping); void onFriendTypingChanged(int friendId, bool isTyping);
void nextContact(); void nextContact();
void previousContact(); void previousContact();

Loading…
Cancel
Save