inline some methods

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/declarative/qml/parser/qdeclarativejslexer_p.h b/src/declarative/qml/parser/qdeclarativejslexer_p.h
index b165e41..0a5beb5 100644 (file)
--- 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 169bf82..5c3a19e 100644 (file)
--- 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 5cd135c..c59b9c7 100644 (file)
--- 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();