Skip to content
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/common/iflytek_ai_assistant.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ IflytekAiAssistant::CallStatus IflytekAiAssistant::stopTtsDirectly() const
// BUG-301561 : disable stop tts when close tab or window
#ifdef ENABLE_STOP_TTS
qDebug() << "ENABLE_STOP_TTS is defined!";
return stopTtsDirectlyInternal()
return stopTtsDirectlyInternal();
#else
qDebug() << "ENABLE_STOP_TTS is not defined!, return Enable";
return Enable;
Expand Down
10 changes: 5 additions & 5 deletions src/editor/FlashTween.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2011-2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2011-2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -27,12 +27,12 @@

void startX(qreal t,qreal b,qreal c,qreal d, FunSlideInertial fSlideGesture);
void startY(qreal t,qreal b,qreal c,qreal d, FunSlideInertial fSlideGesture);
void stopX(){m_timerX->stop();}
void stopY(){m_timerY->stop();}
bool activeX(){return m_timerX->isActive();}
bool activeY(){return m_timerY->isActive();}
void stopX(){if (m_timerX != nullptr) m_timerX->stop();}
void stopY(){if (m_timerY != nullptr) m_timerY->stop();}
bool activeX(){return m_timerX != nullptr && m_timerX->isActive();}
bool activeY(){return m_timerY != nullptr && m_timerY->isActive();}

private slots:

Check warning on line 35 in src/editor/FlashTween.h

View workflow job for this annotation

GitHub Actions / cppcheck

There is an unknown macro here somewhere. Configuration is required. If slots is a macro then please configure it.
void __runY();
void __runX();

Expand Down
8 changes: 7 additions & 1 deletion src/editor/deletebackcommond.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 - 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2022-2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -29,6 +29,9 @@ void DeleteBackCommand::undo()
{
qDebug() << "DeleteBackCommand undo - inserting text at:" << m_insertPos
<< ", length:" << m_delText.length();
if (nullptr == m_edit) {
return;
}
m_cursor.setPosition(m_insertPos);
m_cursor.insertText(m_delText);

Expand All @@ -42,6 +45,9 @@ void DeleteBackCommand::redo()
{
qDebug() << "DeleteBackCommand redo - deleting text at:" << m_delPos
<< ", length:" << m_delText.length();
if (nullptr == m_edit) {
return;
}
m_cursor.setPosition(m_delPos);
m_cursor.setPosition(m_delPos + m_delText.size(), QTextCursor::KeepAnchor);
m_cursor.deleteChar();
Expand Down
Loading