summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qdatetime.h4
-rw-r--r--src/corelib/tools/qsharedpointer_impl.h12
-rw-r--r--src/gui/kernel/qevent.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h
index c44f7f8fee..389fc927c3 100644
--- a/src/corelib/tools/qdatetime.h
+++ b/src/corelib/tools/qdatetime.h
@@ -115,8 +115,8 @@ QT_DEPRECATED inline bool setYMD(int y, int m, int d)
static bool isValid(int y, int m, int d);
static bool isLeapYear(int year);
- static Q_DECL_CONSTEXPR inline QDate fromJulianDay(qint64 jd)
- { return jd >= minJd() && jd <= maxJd() ? QDate(jd) : QDate() ; }
+ static Q_DECL_CONSTEXPR inline QDate fromJulianDay(qint64 jd_)
+ { return jd_ >= minJd() && jd_ <= maxJd() ? QDate(jd_) : QDate() ; }
Q_DECL_CONSTEXPR inline qint64 toJulianDay() const { return jd; }
private:
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index 70b100d018..c408f54b04 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -486,14 +486,14 @@ private:
void deref() Q_DECL_NOTHROW
{ deref(d); }
- static void deref(Data *d) Q_DECL_NOTHROW
+ static void deref(Data *dd) Q_DECL_NOTHROW
{
- if (!d) return;
- if (!d->strongref.deref()) {
- d->destroy();
+ if (!dd) return;
+ if (!dd->strongref.deref()) {
+ dd->destroy();
}
- if (!d->weakref.deref())
- delete d;
+ if (!dd->weakref.deref())
+ delete dd;
}
template <class X>
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index b407663338..b5d2c4d159 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -524,7 +524,7 @@ public:
};
class Attribute {
public:
- Attribute(AttributeType t, int s, int l, QVariant val) : type(t), start(s), length(l), value(qMove(val)) {}
+ Attribute(AttributeType typ, int s, int l, QVariant val) : type(typ), start(s), length(l), value(qMove(val)) {}
AttributeType type;
int start;