From 86c7510e84f30ec96c7cdd9c5bc22892d5b5ef22 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 7 Feb 2016 15:43:21 +0200 Subject: [PATCH] inline some methods Signed-off-by: Ivailo Monev --- src/declarative/qml/parser/qdeclarativejslexer_p.h | 2 +- src/gui/dialogs/qfileinfogatherer_p.h | 6 ++++-- src/gui/inputmethod/qwsinputcontext_p.h | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/declarative/qml/parser/qdeclarativejslexer_p.h b/src/declarative/qml/parser/qdeclarativejslexer_p.h index b165e41ee..0a5beb55c 100644 --- a/src/declarative/qml/parser/qdeclarativejslexer_p.h +++ b/src/declarative/qml/parser/qdeclarativejslexer_p.h @@ -82,7 +82,7 @@ public: int startLineNo() const { return startlineno; } int startColumnNo() const { return startcolumn; } - int endLineNo() const { return currentLineNo(); } + inline int endLineNo() const { return currentLineNo(); } int endColumnNo() const { int col = currentColumnNo(); return (col > 0) ? col - 1 : col; } diff --git a/src/gui/dialogs/qfileinfogatherer_p.h b/src/gui/dialogs/qfileinfogatherer_p.h index 169bf826d..5c3a19e8f 100644 --- a/src/gui/dialogs/qfileinfogatherer_p.h +++ b/src/gui/dialogs/qfileinfogatherer_p.h @@ -110,11 +110,13 @@ public: bool isSymLink(bool ignoreNtfsSymLinks = false) const { - if (ignoreNtfsSymLinks) { #ifdef Q_WS_WIN + if (ignoreNtfsSymLinks) { return !mFileInfo.suffix().compare(QLatin1String("lnk"), Qt::CaseInsensitive); -#endif } +#else + Q_UNUSED(ignoreNtfsSymLinks); +#endif return mFileInfo.isSymLink(); } diff --git a/src/gui/inputmethod/qwsinputcontext_p.h b/src/gui/inputmethod/qwsinputcontext_p.h index 5cd135cd7..c59b9c772 100644 --- a/src/gui/inputmethod/qwsinputcontext_p.h +++ b/src/gui/inputmethod/qwsinputcontext_p.h @@ -71,8 +71,8 @@ public: ~QWSInputContext() {} - QString identifierName() { return QString(); } - QString language() { return QString(); } + inline QString identifierName() { return QString(); } + inline QString language() { return QString(); } void reset(); void update(); -- 2.11.0