Fix qdoc warnings introduced by the archive handling changes

Change-Id: I47d24c72317bed594b22b234be75d0359f2e2b98
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>

5 files changed, 21 insertions, 22 deletions

diff --git a/doc/includes/IFWDoc b/doc/includes/IFWDoc
index d4b598a0a..75ed9fb40 100644
--- a/doc/includes/IFWDoc
+++ b/doc/includes/IFWDoc
@@ -46,6 +46,12 @@
 #include "lib7z_extract.h"
 #include "lib7z_list.h"
 #include "lib7z_facade.h"
+#include "lib7zarchive.h"
+#include "libarchivearchive.h"
+#include "libarchivewrapper.h"
+#include "abstractarchive.h"
+#include "archivefactory.h"
+#include "directoryguard.h"
 #include "link.h"
 #include "messageboxhandler.h"
 #include "metadatajob.h"
diff --git a/src/libs/installer/abstractarchive.cpp b/src/libs/installer/abstractarchive.cpp
index dd9b8e625..f2b4300c4 100644
--- a/src/libs/installer/abstractarchive.cpp
+++ b/src/libs/installer/abstractarchive.cpp
@@ -65,7 +65,7 @@ namespace QInstaller {
 */
 
 /*!
-    \fn QInstaller::AbstractArchive::completedChanged(quint64 completed, quint64 total)
+    \fn QInstaller::AbstractArchive::completedChanged(const quint64 completed, const quint64 total)
 
     The ratio of \a completed entries from \a total changed. Subclasses should emit
     this whenever the progress changes.
diff --git a/src/libs/installer/lib7z_facade.cpp b/src/libs/installer/lib7z_facade.cpp
index 17176d7b0..6d1b6a57d 100644
--- a/src/libs/installer/lib7z_facade.cpp
+++ b/src/libs/installer/lib7z_facade.cpp
@@ -188,12 +188,6 @@ namespace Lib7z {
     Prints string \a s.
 */
 
-/*!
-    \fn bool Lib7z::operator==(const File &lhs, const File &rhs);
-
-    Returns \c true if \a lhs and \a rhs are equal; otherwise returns \c false.
-*/
-
 // -- 7z init codecs, archives
 
 std::once_flag gOnceFlag;
@@ -770,6 +764,18 @@ STDMETHODIMP ExtractCallback::SetOperationResult(Int32 /*resultEOperationResult*
 */
 
 /*!
+    \typedef Lib7z::Compression
+
+    Synonym for QInstaller::CompressionLevel
+*/
+
+/*!
+    \typedef Lib7z::File
+
+    Synonym for QInstaller::ArchiveEntry
+*/
+
+/*!
     \namespace Lib7z
     \inmodule QtInstallerFramework
     \brief  The Lib7z namespace contains miscellaneous identifiers used throughout the Lib7z library.
diff --git a/src/libs/installer/libarchivewrapper.cpp b/src/libs/installer/libarchivewrapper.cpp
index c259678ca..9fbbeb889 100644
--- a/src/libs/installer/libarchivewrapper.cpp
+++ b/src/libs/installer/libarchivewrapper.cpp
@@ -45,19 +45,6 @@ namespace QInstaller {
 */
 
 /*!
-    \fn QInstaller::LibArchiveWrapper::currentEntryChanged(const QString &filename)
-
-    Current entry changed to \a filename. Emitted when the entry to process is changed.
-*/
-
-/*!
-    \fn QInstaller::LibArchiveWrapper::completedChanged(quint64 completed, quint64 total)
-
-    The ratio of \a completed entries from \a total changed.
-    Emitted when the progress changes.
-*/
-
-/*!
     Constructs an archive object representing an archive file
     specified by \a filename with \a parent as the parent object.
 */
diff --git a/src/libs/installer/libarchivewrapper_p.cpp b/src/libs/installer/libarchivewrapper_p.cpp
index 942e948e8..75bbddbe8 100644
--- a/src/libs/installer/libarchivewrapper_p.cpp
+++ b/src/libs/installer/libarchivewrapper_p.cpp
@@ -41,13 +41,13 @@ namespace QInstaller {
 */
 
 /*!
-    \fn QInstaller::ArchiveWrapper::dataBlockRequested()
+    \fn QInstaller::LibArchiveWrapperPrivate::dataBlockRequested()
 
     Emitted when the server process has requested another data block.
 */
 
 /*!
-    \fn QInstaller::ArchiveWrapper::remoteWorkerFinished()
+    \fn QInstaller::LibArchiveWrapperPrivate::remoteWorkerFinished()
 
     Emitted when the server process has finished extracting an archive.
 */