1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtCore: fix private header compilation under QT_NO_KEYWORDS

Browse Source 
This is in preparation of applying headercheck to private headers,
too.

Task-number: QTBUG-126219
Change-Id: Iff5fd8e848d67b7edd9541b0e78740bc4b4ff7c4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 55b5e78ac31171be61ceeb932d494d5060d1fa02)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-09-12 16:00:52 +02:00 committed by Qt Cherry-pick Bot
parent 7953546072
commit 9ce6596394
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qfilesystemwatcher_fsevents_p.h
View File

@ -47,7 +47,7 @@ Q_SIGNALS:
void emitDirectoryChanged(const QString &path, bool removed); void emitDirectoryChanged(const QString &path, bool removed);
void scheduleStreamRestart(); void scheduleStreamRestart();
private slots: private Q_SLOTS:
void doEmitFileChanged(const QString &path, bool removed); void doEmitFileChanged(const QString &path, bool removed);
void doEmitDirectoryChanged(const QString &path, bool removed); void doEmitDirectoryChanged(const QString &path, bool removed);
bool restartStream(); bool restartStream();

2
src/corelib/io/qfilesystemwatcher_win_p.h
View File

@ -83,7 +83,7 @@ public:
} }
}; };
signals: Q_SIGNALS:
void driveLockForRemoval(const QString &); void driveLockForRemoval(const QString &);
void driveLockForRemovalFailed(const QString &); void driveLockForRemovalFailed(const QString &);
void driveRemoved(const QString &); void driveRemoved(const QString &);

2
src/corelib/itemmodels/qitemselectionmodel_p.h
View File

@ -71,7 +71,7 @@ public:
void setModel(QAbstractItemModel *mod) { q_func()->setModel(mod); } void setModel(QAbstractItemModel *mod) { q_func()->setModel(mod); }
void disconnectModel(); void disconnectModel();
void modelChanged(QAbstractItemModel *mod) { emit q_func()->modelChanged(mod); } void modelChanged(QAbstractItemModel *mod) { Q_EMIT q_func()->modelChanged(mod); }
Q_OBJECT_COMPAT_PROPERTY_WITH_ARGS(QItemSelectionModelPrivate, QAbstractItemModel *, model, Q_OBJECT_COMPAT_PROPERTY_WITH_ARGS(QItemSelectionModelPrivate, QAbstractItemModel *, model,
&QItemSelectionModelPrivate::setModel, &QItemSelectionModelPrivate::setModel,
&QItemSelectionModelPrivate::modelChanged, nullptr) &QItemSelectionModelPrivate::modelChanged, nullptr)

2
src/corelib/serialization/qxmlstream.g
View File

@ -241,7 +241,7 @@ bool QXmlStreamReaderPrivate::parse()
act = state_stack[tos]; act = state_stack[tos];
forever { while (true) {
if (token == -1 && - TERMINAL_COUNT != action_index[act]) { if (token == -1 && - TERMINAL_COUNT != action_index[act]) {
uint cu = getChar(); uint cu = getChar();
token = NOTOKEN; token = NOTOKEN;

2
src/corelib/serialization/qxmlstreamparser_p.h
View File

@ -130,7 +130,7 @@ bool QXmlStreamReaderPrivate::parse()
act = state_stack[tos]; act = state_stack[tos];
forever { while (true) {
if (token == -1 && - TERMINAL_COUNT != action_index[act]) { if (token == -1 && - TERMINAL_COUNT != action_index[act]) {
uint cu = getChar(); uint cu = getChar();
token = NOTOKEN; token = NOTOKEN;

2
src/corelib/text/qstringalgorithms_p.h
View File

@ -95,7 +95,7 @@ template <typename StringType> struct QStringAlgorithms
Char *dst = const_cast<Char *>(result.cbegin()); Char *dst = const_cast<Char *>(result.cbegin());
Char *ptr = dst; Char *ptr = dst;
bool unmodified = true; bool unmodified = true;
forever { while (true) {
while (src != end && isSpace(*src)) while (src != end && isSpace(*src))
++src; ++src;
while (src != end && !isSpace(*src)) while (src != end && !isSpace(*src))