Import release 2.0.6.1

src/utils/kmessshared.cpp

@@ -58,7 +58,7 @@
  * and thus natural sorting keeps them in the right temporal order.
  *
  * @param name1 First filename
- * @param name1 Second filename
+ * @param name2 Second filename
  * @return bool whether the first is lesser than the second
  */
 bool KMessShared::compareFileNames( const QString& name1, const QString& name2 )
@@ -142,7 +142,7 @@ QString KMessShared::createRequestFile( const QString &mailto, const QString &fo
   // this will have our (urlencoded) dodgy email address we used to satisfy URL COMPOSE
   // at the initial login. replace it where we actually want it to go.
   QString command( folder );
-  
+
   command = command.replace( "some.invalid%40kmess.email", mailto );
 
   // Use the method into passport to compute the token
@@ -739,7 +739,7 @@ bool KMessShared::selectNextFile( const QString &directory, const QString &baseN
  *
  * etc.
  *
- * @param baseDir The full path to the base directory.
+ * @param baseDirPath The full path to the base directory.
  * @param baseFileName The base file name, minus the extension or numbering.
  * @param extension The extension of the file.
  * @param lastFile [out] Set to the full path of the last existing file in the sequence, or an empty string if none exists.