diff options
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qdatastream.cpp | 2 | ||||
-rw-r--r-- | src/corelib/io/qfilesystemwatcher_win.cpp | 2 | ||||
-rw-r--r-- | src/corelib/io/qiodevice.cpp | 2 | ||||
-rw-r--r-- | src/corelib/io/qresource_p.h | 2 | ||||
-rw-r--r-- | src/corelib/io/qsettings.cpp | 12 | ||||
-rw-r--r-- | src/corelib/io/qsettings_win.cpp | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index 8f788ac355..5f5e9a8b72 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -743,7 +743,7 @@ QDataStream &QDataStream::operator>>(bool &i) */ QDataStream &QDataStream::operator>>(float &f) -{ +{ if (version() >= QDataStream::Qt_4_6 && floatingPointPrecision() == QDataStream::DoublePrecision) { double d; diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp index fa0711461c..6ac6a3fbd9 100644 --- a/src/corelib/io/qfilesystemwatcher_win.cpp +++ b/src/corelib/io/qfilesystemwatcher_win.cpp @@ -207,7 +207,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths, this, SIGNAL(fileChanged(QString,bool))); connect(thread, SIGNAL(directoryChanged(QString,bool)), this, SIGNAL(directoryChanged(QString,bool))); - + thread->msg = '@'; thread->start(); threads.append(thread); diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index 4df9c6b911..c8a3f86137 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -1372,7 +1372,7 @@ qint64 QIODevice::write(const char *data, qint64 maxSize) \since 4.5 \overload - + Writes data from a zero-terminated string of 8-bit characters to the device. Returns the number of bytes that were actually written, or -1 if an error occurred. This is equivalent to diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h index 3fdaa41206..d632ac70be 100644 --- a/src/corelib/io/qresource_p.h +++ b/src/corelib/io/qresource_p.h @@ -109,7 +109,7 @@ public: virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames); virtual Iterator *endEntryList(); - + bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0); bool supportsExtension(Extension extension) const; }; diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index d7b100ba3c..a0904fea24 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -1074,7 +1074,7 @@ static void initDefaultPaths(QMutexLocker *locker) QString systemPath; locker->unlock(); - + /* QLibraryInfo::location() uses QSettings, so in order to avoid a dead-lock, we can't hold the global mutex while @@ -3198,7 +3198,7 @@ bool QSettings::isWritable() const } /*! - + Sets the value of setting \a key to \a value. If the \a key already exists, the previous value is overwritten. @@ -3465,7 +3465,7 @@ void QSettings::setPath(Format format, Scope scope, const QString &path) \typedef QSettings::SettingsMap Typedef for QMap<QString, QVariant>. - + \sa registerFormat() */ @@ -3477,8 +3477,8 @@ void QSettings::setPath(Format format, Scope scope, const QString &path) \snippet code/src_corelib_io_qsettings.cpp 27 \c ReadFunc is used in \c registerFormat() as a pointer to a function - that reads a set of key/value pairs. \c ReadFunc should read all the - options in one pass, and return all the settings in the \c SettingsMap + that reads a set of key/value pairs. \c ReadFunc should read all the + options in one pass, and return all the settings in the \c SettingsMap container, which is initially empty. \sa WriteFunc, registerFormat() @@ -3491,7 +3491,7 @@ void QSettings::setPath(Format format, Scope scope, const QString &path) \snippet code/src_corelib_io_qsettings.cpp 28 - \c WriteFunc is used in \c registerFormat() as a pointer to a function + \c WriteFunc is used in \c registerFormat() as a pointer to a function that writes a set of key/value pairs. \c WriteFunc is only called once, so you need to output the settings in one go. diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp index bd127e621e..9ce14f1851 100644 --- a/src/corelib/io/qsettings_win.cpp +++ b/src/corelib/io/qsettings_win.cpp @@ -569,7 +569,7 @@ QWinSettingsPrivate::~QWinSettingsPrivate() { if (deleteWriteHandleOnExit && writeHandle() != 0) { #if defined(Q_OS_WINCE) - remove(regList.at(0).key()); + remove(regList.at(0).key()); #else QString emptyKey; DWORD res = RegDeleteKey(writeHandle(), reinterpret_cast<const wchar_t *>(emptyKey.utf16())); |