summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@nokia.com>2012-08-16 18:19:39 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-20 16:57:48 +0200
commit42d712b4ab7375a97e4095b2a6723305000e194c (patch)
treec1ff7942ba9f68fc0d6ad8b1741e9988d9b64eff /src/corelib
parente6de6c153eea5c95b9b676ba53c4470963e6f133 (diff)
Misc documentation fixes triggered by qdoc errors/warnings
Change-Id: I6ca3b138114fe957a09e8ec2f22273865635fc8b Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qurl.cpp9
-rw-r--r--src/corelib/kernel/qtranslator.cpp6
2 files changed, 7 insertions, 8 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 38a9f1e940..25006b14f7 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -1272,7 +1272,7 @@ static void removeDotsFromPath(QString *path)
in += 2;
break;
}
-
+
// otherwise, if the input buffer begins with a prefix
// of "/../" or "/..", where ".." is a complete path
// segment, then replace that prefix with "/" in the
@@ -1295,7 +1295,7 @@ static void removeDotsFromPath(QString *path)
in += 3;
break;
}
-
+
// otherwise move the first path segment in
// the input buffer to the end of the output
// buffer, including the initial "/" character
@@ -3439,12 +3439,11 @@ QString QUrl::errorString() const
*/
/*!
- \relates QHash
- \since 5.0
-
Returns the hash value for the \a url. If specified, \a seed is used to
initialize the hash.
+ \relates QHash
+ \since 5.0
*/
uint qHash(const QUrl &url, uint seed)
{
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 34bc601bfc..fa860f5300 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -431,7 +431,7 @@ QTranslator::~QTranslator()
If \a directory is not specified, the directory of the
application's executable is used (i.e., as
- \l{QCoreApplication::}{applicationDirPath()}).
+ \l{QCoreApplication::}{applicationDirPath()}).
The previous contents of this translator object are discarded.
@@ -472,8 +472,8 @@ bool QTranslator::load(const QString & filename, const QString & directory,
QString prefix;
if (QFileInfo(filename).isRelative()) {
prefix = directory;
- if (prefix.length() && !prefix.endsWith(QLatin1Char('/')))
- prefix += QLatin1Char('/');
+ if (prefix.length() && !prefix.endsWith(QLatin1Char('/')))
+ prefix += QLatin1Char('/');
}
QString fname = filename;