Skip to content

Commit 2571cd0

Browse files
committed
feat: replace Qt keywords with macros (QT_NO_KEYWORDS)
Replace emit/signals:/slots: with Q_EMIT/Q_SIGNALS:/Q_SLOTS: and add QT_NO_KEYWORDS compile definition in CMake to prevent Qt keyword conflicts with third-party libraries. Issue: https://agent-dev.uniontech.com/dde/issues/01a180ec-cd76-7e48-b5ed-e85f3fbe1740
1 parent e82521d commit 2571cd0

9 files changed

Lines changed: 25 additions & 23 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,6 @@ set(DTK_VERSION_PATCH ${PROJECT_VERSION_PATCH})
3232
set(DTK_VERSION "${DTK_VERSION_MAJOR}.${DTK_VERSION_MINOR}.${DTK_VERSION_PATCH}")
3333
set(QT_VERSION_MAJOR ${DTK_VERSION_MAJOR})
3434

35+
add_compile_definitions(QT_NO_KEYWORDS)
36+
3537
include(dtkwidget.cmake)

‎src/widgets/dcircleprogress.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void DCircleProgress::setValue(int value)
107107
return;
108108
}
109109
d->m_currentValue = value;
110-
emit valueChanged(value);
110+
Q_EMIT valueChanged(value);
111111
update();
112112
}
113113

‎tests/src/widgets/ut_dalertcontrol.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ TEST_F(ut_DAlertcontrol, showALertMessage)
7474
ASSERT_EQ(text, testStr);
7575
});
7676

77-
emit lineEdit->textChanged(testStr);
77+
Q_EMIT lineEdit->textChanged(testStr);
7878
}

‎tests/src/widgets/ut_danchor.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ TEST_F(ut_DAnchors, testDAnchors)
7575
result = anchor2.setAnchor(Qt::AnchorBottom, widget, Qt::AnchorBottom);
7676
ASSERT_TRUE(result);
7777

78-
emit anchorBase->horizontalCenterOffsetChanged(offset);
79-
emit anchorBase->verticalCenterOffsetChanged(offset);
78+
Q_EMIT anchorBase->horizontalCenterOffsetChanged(offset);
79+
Q_EMIT anchorBase->verticalCenterOffsetChanged(offset);
8080
ASSERT_TRUE(signalTest == 2);
8181

8282
anchor2.setHorizontalCenterOffset(offset);

‎tests/src/widgets/ut_dswitchbutton.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ TEST_F(ut_DSwitchButton, testDSwitchButtonClicked)
4646
ASSERT_TRUE(isClicked == true);
4747
++count;
4848
});
49-
emit button->clicked(true);
50-
emit button->clicked(false);
49+
Q_EMIT button->clicked(true);
50+
Q_EMIT button->clicked(false);
5151

5252
QObject::disconnect(button, &DSwitchButton::clicked, button, nullptr);
5353

@@ -66,8 +66,8 @@ TEST_F(ut_DSwitchButton, testDSwitchButtonToggled)
6666
++count;
6767
});
6868

69-
emit button->toggled(true);
70-
emit button->toggled(false);
69+
Q_EMIT button->toggled(true);
70+
Q_EMIT button->toggled(false);
7171

7272
QObject::disconnect(button, &DSwitchButton::toggled, button, nullptr);
7373

@@ -86,8 +86,8 @@ TEST_F(ut_DSwitchButton, testDSwitchButtonCheckedChanged)
8686
++count;
8787
});
8888

89-
emit button->setChecked(true);
90-
emit button->setChecked(false);
89+
Q_EMIT button->setChecked(true);
90+
Q_EMIT button->setChecked(false);
9191

9292
QObject::disconnect(button, &DSwitchButton::toggled, button, nullptr);
9393

‎tests/testcases/widgets/ut_dalertcontrol.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ TEST_F(ut_DAlertcontrol, showALertMessage)
7474
ASSERT_EQ(text, testStr);
7575
});
7676

77-
emit lineEdit->textChanged(testStr);
77+
Q_EMIT lineEdit->textChanged(testStr);
7878
}

‎tests/testcases/widgets/ut_danchor.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ TEST_F(ut_DAnchors, testDAnchors)
7575
result = anchor2.setAnchor(Qt::AnchorBottom, widget, Qt::AnchorBottom);
7676
ASSERT_TRUE(result);
7777

78-
emit anchorBase->horizontalCenterOffsetChanged(offset);
79-
emit anchorBase->verticalCenterOffsetChanged(offset);
78+
Q_EMIT anchorBase->horizontalCenterOffsetChanged(offset);
79+
Q_EMIT anchorBase->verticalCenterOffsetChanged(offset);
8080
ASSERT_TRUE(signalTest == 2);
8181

8282
anchor2.setHorizontalCenterOffset(offset);

‎tests/testcases/widgets/ut_dpushbutton.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ TEST_F(ut_DPushButton, testDPushButtonClicked)
4343
ASSERT_EQ(clickState, isClicked);
4444
});
4545
clickState = true;
46-
emit button->clicked(clickState);
46+
Q_EMIT button->clicked(clickState);
4747
clickState = false;
48-
emit button->clicked(clickState);
48+
Q_EMIT button->clicked(clickState);
4949

5050
QObject::disconnect(button, &DPushButton::clicked, button, nullptr);
5151
}
@@ -59,9 +59,9 @@ TEST_F(ut_DPushButton, testDPushButtonToggled)
5959
});
6060

6161
toggleState = true;
62-
emit button->toggled(toggleState);
62+
Q_EMIT button->toggled(toggleState);
6363
toggleState = false;
64-
emit button->toggled(toggleState);
64+
Q_EMIT button->toggled(toggleState);
6565

6666
QObject::disconnect(button, &DPushButton::toggled, button, nullptr);
6767
}

‎tests/testcases/widgets/ut_dswitchbutton.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ TEST_F(ut_DSwitchButton, testDSwitchButtonClicked)
4646
ASSERT_TRUE(isClicked == true);
4747
++count;
4848
});
49-
emit button->clicked(true);
50-
emit button->clicked(false);
49+
Q_EMIT button->clicked(true);
50+
Q_EMIT button->clicked(false);
5151

5252
QObject::disconnect(button, &DSwitchButton::clicked, button, nullptr);
5353

@@ -66,8 +66,8 @@ TEST_F(ut_DSwitchButton, testDSwitchButtonToggled)
6666
++count;
6767
});
6868

69-
emit button->toggled(true);
70-
emit button->toggled(false);
69+
Q_EMIT button->toggled(true);
70+
Q_EMIT button->toggled(false);
7171

7272
QObject::disconnect(button, &DSwitchButton::toggled, button, nullptr);
7373

@@ -86,8 +86,8 @@ TEST_F(ut_DSwitchButton, testDSwitchButtonCheckedChanged)
8686
++count;
8787
});
8888

89-
emit button->setChecked(true);
90-
emit button->setChecked(false);
89+
Q_EMIT button->setChecked(true);
90+
Q_EMIT button->setChecked(false);
9191

9292
QObject::disconnect(button, &DSwitchButton::toggled, button, nullptr);
9393

0 commit comments

Comments
 (0)