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

Jump to bottom

[qt] Rename Component::requires to avoid clash with C++20 #414

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −1
Open

[qt] Rename Component::requires to avoid clash with C++20 #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 qt/component.cpp
View file
Open in desktop
@@ -361,7 +361,14 @@ void Component::addReplaces(const QString &cid)
as_component_add_replaces(m_cpt, qPrintable(cid));
}

#if __cplusplus < 202002L
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add a #warning in an #endif so that if AppStreamQt is built with C++20, it will be ABI incompatible?

QList<Relation> Component::requires() const
{
return requirements();
}
#endif

QList<Relation> Component::requirements() const
{
QList<AppStream::Relation> res;

5 qt/component.h
View file
Open in desktop
@@ -199,7 +199,10 @@ class APPSTREAMQT_EXPORT Component {
QStringList replaces() const;
void addReplaces(const QString& cid);

QList<AppStream::Relation> requires() const;
#if __cplusplus < 202002L
Q_DECL_DEPRECATED QList<AppStream::Relation> requires() const;
#endif
QList<AppStream::Relation> requirements() const;
QList<AppStream::Relation> recommends() const;
QList<AppStream::Relation> supports() const;
void addRelation(const AppStream::Relation &relation);