diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-04-02 22:17:36 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-10 22:47:37 +0200 |
commit | 880cbf602701b0116ca1143d6d07ee8e7eb3f03f (patch) | |
tree | de9eb090b3568443e95f7f3c26a9c35ec2a16bef /src/corelib | |
parent | 766498083a4d3f1db28604ea5d5f0da613f3839b (diff) |
Bump some Qt 5 to-do's to Qt 6.
Source-incompatible changes are no longer desirable for Qt 5, so these
items must wait until at least Qt 6.
Task-number: QTBUG-23524
Change-Id: I0b9ae5f6f3a792e0169a4b0d3aefbdcb744acd2f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/global/qlibraryinfo.h | 2 | ||||
-rw-r--r-- | src/corelib/global/qnamespace.h | 2 | ||||
-rw-r--r-- | src/corelib/io/qfileinfo.cpp | 2 | ||||
-rw-r--r-- | src/corelib/io/qiodevice.h | 2 | ||||
-rw-r--r-- | src/corelib/io/qsettings.h | 4 | ||||
-rw-r--r-- | src/corelib/tools/qbytearray.h | 2 | ||||
-rw-r--r-- | src/corelib/tools/qline.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index d180e63198..5666afbad8 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -88,7 +88,7 @@ public: #endif SettingsPath = 100 }; - static QString location(LibraryLocation); // ### Qt 5: consider renaming it to path() + static QString location(LibraryLocation); // ### Qt 6: consider renaming it to path() #ifdef QT_BUILD_QMAKE static QString rawLocation(LibraryLocation); #endif diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 4ea62c77a6..fa13bedab6 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -153,7 +153,7 @@ public: NoButton = 0x00000000, LeftButton = 0x00000001, RightButton = 0x00000002, - MidButton = 0x00000004, // ### Qt 5: remove me + MidButton = 0x00000004, // ### Qt 6: remove me MiddleButton = MidButton, XButton1 = 0x00000008, BackButton = XButton1, diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index 044c71d00a..1805e759ab 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -830,7 +830,7 @@ QString QFileInfo::suffix() const QDir QFileInfo::dir() const { Q_D(const QFileInfo); - // ### Qt5: Maybe rename this to parentDirectory(), considering what it actually do? + // ### Qt 6: Maybe rename this to parentDirectory(), considering what it actually does? return QDir(d->fileEntry.path()); } diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h index eba408b285..8e39f9ccd7 100644 --- a/src/corelib/io/qiodevice.h +++ b/src/corelib/io/qiodevice.h @@ -102,7 +102,7 @@ public: virtual bool open(OpenMode mode); virtual void close(); - // ### Qt 5: pos() and seek() should not be virtual, and + // ### Qt 6: pos() and seek() should not be virtual, and // ### seek() should call a virtual seekData() function. virtual qint64 pos() const; virtual qint64 size() const; diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index a4bb8349a8..ca3fe245ea 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -173,8 +173,8 @@ public: static void setDefaultFormat(Format format); static Format defaultFormat(); - static void setSystemIniPath(const QString &dir); // ### remove in 5.0 (use setPath() instead) - static void setUserIniPath(const QString &dir); // ### remove in 5.0 (use setPath() instead) + static void setSystemIniPath(const QString &dir); // ### Qt 6: remove (use setPath() instead) + static void setUserIniPath(const QString &dir); // ### Qt 6: remove (use setPath() instead) static void setPath(Format format, Scope scope, const QString &path); typedef QMap<QString, QVariant> SettingsMap; diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 7711d7349e..dd35fcd9bc 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -339,7 +339,7 @@ public: QByteArray &setNum(qulonglong, int base = 10); QByteArray &setNum(float, char f = 'g', int prec = 6); QByteArray &setNum(double, char f = 'g', int prec = 6); - QByteArray &setRawData(const char *a, uint n); // ### Qt 5: use an int + QByteArray &setRawData(const char *a, uint n); // ### Qt 6: use an int static QByteArray number(int, int base = 10); static QByteArray number(uint, int base = 10); diff --git a/src/corelib/tools/qline.h b/src/corelib/tools/qline.h index 92ea4ea426..f2e0d4380a 100644 --- a/src/corelib/tools/qline.h +++ b/src/corelib/tools/qline.h @@ -245,7 +245,7 @@ public: QLineF unitVector() const; Q_DECL_CONSTEXPR inline QLineF normalVector() const; - // ### Qt 5: rename intersects() or intersection() and rename IntersectType IntersectionType + // ### Qt 6: rename intersects() or intersection() and rename IntersectType IntersectionType IntersectType intersect(const QLineF &l, QPointF *intersectionPoint) const; qreal angle(const QLineF &l) const; |