Drop TQT_BASE_OBJECT* defines #9

Merged
MicheleC merged 1 commits from drop/tqt-base-object-defines into master 9 months ago
Owner

TQT_BASE_OBJECT* defines will later be removed from tqtinterface.

TQT_BASE_OBJECT* defines will later be removed from tqtinterface.
MicheleC added this to the R14.1.1 release milestone 9 months ago
MicheleC added 1 commit 9 months ago
a52650daba
Drop TQT_BASE_OBJECT* defines
MicheleC requested review from Core 9 months ago
MicheleC requested review from Owners 9 months ago
MicheleC force-pushed drop/tqt-base-object-defines from a52650daba to e524a45ee7 9 months ago
SlavekB reviewed 9 months ago
SlavekB left a comment
Owner

I did not investigate it in more detail, but there is a difference from what the code looked like originally.

I did not investigate it in more detail, but there is a difference from what the code looked like originally.
KDE_NO_EXPORT void KMPlayerApp::fullScreen () {
// if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender ()))->metaObject ()->inherits ("TDEAction"))
if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender ()))->inherits ("TDEAction"))
if (sender()->inherits("TDEAction"))
Owner

The original code also contained metaObject(). Is that essential?

  if (sender()->metaObject()->inherits("TDEAction"))
The original code also contained `metaObject()`. Is that essential? ``` if (sender()->metaObject()->inherits("TDEAction")) ```
Poster
Owner

That line was commented out long ago. TQObject contains the required inherits, so it should not be an issue. I did a build test and did not see any FTBFS in trixie.

That line was commented out long ago. TQObject contains the required `inherits`, so it should not be an issue. I did a build test and did not see any FTBFS in trixie.
Owner

The line in the comment was precisely when the QObject => TQT_BASE_OBJECT_NAME was changed – that's why I have this question. See commit 769e63d24a.

The line in the comment was precisely when the `QObject` => `TQT_BASE_OBJECT_NAME` was changed – that's why I have this question. See commit 769e63d24adf5c844137484f06a972fcce732d6a.
Poster
Owner

https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/src/branch/master/src/kernel/qobject.cpp#L865

TQObject::inherits() uses metaobject() internally already, so I don't see a problem with the current version of code.

https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/src/branch/master/src/kernel/qobject.cpp#L865 `TQObject::inherits()` uses metaobject() internally already, so I don't see a problem with the current version of code.
Owner

Yes, great, that's a clear explanation of why it's okay.

Yes, great, that's a clear explanation of why it's okay.
SlavekB marked this conversation as resolved
SlavekB approved these changes 9 months ago
SlavekB left a comment
Owner

It looks good.

It looks good.
MicheleC merged commit e524a45ee7 into master 9 months ago
MicheleC deleted branch drop/tqt-base-object-defines 9 months ago

Reviewers

SlavekB approved these changes 9 months ago
TDE/Core was requested for review 9 months ago
The pull request has been merged as e524a45ee7.
Sign in to join this conversation.
No reviewers
TDE/Core
No Milestone
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/kmplayer#9
Loading…
There is no content yet.