Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup: Another typo fix, avaliable -> available. #178

Merged
merged 1 commit into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ void Core::onConferenceTitleChange(Tox* tox, uint32_t conferenceId, uint32_t pee
void Core::onReadReceiptCallback(Tox* tox, uint32_t friendId, uint32_t receipt, void* core)
{
std::ignore = tox;
emit static_cast<Core*>(core)->receiptRecieved(friendId, ReceiptNum{receipt});
emit static_cast<Core*>(core)->receiptReceived(friendId, ReceiptNum{receipt});
}

void Core::acceptFriendRequest(const ToxPk& friendPk)
Expand Down
2 changes: 1 addition & 1 deletion src/core/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public slots:
void conferenceJoined(int conferencenumber, ConferenceId conferenceId);
void actionSentResult(uint32_t friendId, const QString& action, int success);

void receiptRecieved(int friedId, ReceiptNum receipt);
void receiptReceived(int friedId, ReceiptNum receipt);

void failedToRemoveFriend(uint32_t friendId);

Expand Down
2 changes: 1 addition & 1 deletion src/persistence/db/upgrades/dbto11.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ bool DbTo11::appendSplitPeersQueries(RawDatabase& db, QVector<RawDatabase::Query
// splitting peers table into separate chat and authors table.
// peers had a dual-meaning of each friend having their own chat, but also each peer
// being authors of messages. This wasn't true for self which was in the peers table
// but had no related chat. For upcomming group history, the confusion is amplified
// but had no related chat. For upcoming group history, the confusion is amplified
// since each group is a chat so is in peers, but authors no messages, and each group
// member is an author so is in peers, but has no chat.
// Splitting peers makes the relation much clearer and the tables have a single meaning.
Expand Down
2 changes: 1 addition & 1 deletion src/video/cameradevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ bool CameraDevice::isScreen(const QString& devName)

/**
* @brief Get list of resolutions and position of screens
* @return Vector of avaliable screen modes with offset
* @return Vector of available screen modes with offset
*/
QVector<VideoMode> CameraDevice::getScreenModes()
{
Expand Down
2 changes: 1 addition & 1 deletion src/widget/categorywidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ void CategoryWidget::setExpanded(bool isExpanded, bool save)
expanded = isExpanded;
setMouseTracking(true);

// The listWidget will recieve a enterEvent for some reason if now visible.
// The listWidget will receive a enterEvent for some reason if now visible.
// Using the following, we prevent that.
listWidget->setAttribute(Qt::WA_TransparentForMouseEvents, true);
listWidget->setVisible(isExpanded);
Expand Down
12 changes: 6 additions & 6 deletions src/widget/chatformheader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -220,26 +220,26 @@ void ChatFormHeader::removeCallConfirm()

void ChatFormHeader::updateCallButtons(bool online, bool audio, bool video)
{
const bool audioAvaliable = online && (mode & Mode::Audio);
const bool videoAvaliable = online && (mode & Mode::Video);
if (!audioAvaliable) {
const bool audioAvailable = online && (mode & Mode::Audio);
const bool videoAvailable = online && (mode & Mode::Video);
if (!audioAvailable) {
callState = CallButtonState::Disabled;
} else if (video) {
callState = CallButtonState::Disabled;
} else if (audio) {
callState = CallButtonState::InCall;
} else {
callState = CallButtonState::Avaliable;
callState = CallButtonState::Available;
}

if (!videoAvaliable) {
if (!videoAvailable) {
videoState = CallButtonState::Disabled;
} else if (video) {
videoState = CallButtonState::InCall;
} else if (audio) {
videoState = CallButtonState::Disabled;
} else {
videoState = CallButtonState::Avaliable;
videoState = CallButtonState::Available;
}

updateButtonsView();
Expand Down
2 changes: 1 addition & 1 deletion src/widget/chatformheader.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ChatFormHeader : public QWidget
enum class CallButtonState
{
Disabled = 0, // Grey
Avaliable = 1, // Green
Available = 1, // Green
InCall = 2, // Red
Outgoing = 3, // Yellow
Incoming = 4, // Yellow
Expand Down
2 changes: 1 addition & 1 deletion src/widget/form/chatform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ ChatForm::~ChatForm()
void ChatForm::setStatusMessage(const QString& newMessage)
{
statusMessageLabel->setText(newMessage);
// for long messsages
// for long messages
statusMessageLabel->setToolTip(Qt::convertFromPlainText(newMessage, Qt::WhiteSpaceNormal));
}

Expand Down
2 changes: 1 addition & 1 deletion src/widget/widget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ void Widget::onCoreChanged(Core& core_)
connect(core, &Core::friendStatusMessageChanged, this, &Widget::onFriendStatusMessageChanged);
connect(core, &Core::friendRequestReceived, this, &Widget::onFriendRequestReceived);
connect(core, &Core::friendMessageReceived, this, &Widget::onFriendMessageReceived);
connect(core, &Core::receiptRecieved, this, &Widget::onReceiptReceived);
connect(core, &Core::receiptReceived, this, &Widget::onReceiptReceived);
connect(core, &Core::conferenceInviteReceived, this, &Widget::onConferenceInviteReceived);
connect(core, &Core::conferenceMessageReceived, this, &Widget::onConferenceMessageReceived);
connect(core, &Core::conferencePeerlistChanged, this, &Widget::onConferencePeerlistChanged);
Expand Down
Loading