diff --git a/src/Lib/Document/VivyDocument.cc b/src/Lib/Document/VivyDocument.cc index e525db396df854f4e0fbfe1eb4af21f8b38f8b5d..4c38fc0d899d91a051c94bf63ca4cae614951ac5 100644 --- a/src/Lib/Document/VivyDocument.cc +++ b/src/Lib/Document/VivyDocument.cc @@ -213,7 +213,7 @@ VivyDocument::loadSubDocument(const QString &subName, VivyDocument::Capabilities } bool -VivyDocument::detectDocumentType(const QFileInfo &file, Capabilities *ableType) noexcept +VivyDocument::detectDocumentType(const QFileInfo &file, Capabilities *const ableType) noexcept { Vivy::Utils::DocumentType docType; bool rc = Vivy::Utils::detectDocumentType(file, &docType); diff --git a/src/Lib/Document/VivyDocument.hh b/src/Lib/Document/VivyDocument.hh index 48086b842d62a7e7187e9a5a72d5c6b7bd2552bc..d59bde38ee37af6645e02e68dc9bb6ca37c60ae4 100644 --- a/src/Lib/Document/VivyDocument.hh +++ b/src/Lib/Document/VivyDocument.hh @@ -61,11 +61,11 @@ private: quint64 documentOptions{ 0 }; /* Links to other files, they're not embeded inside the vivy file */ - std::shared_ptr<AudioSubDocument> audioDocument{}; - std::shared_ptr<VideoSubDocument> videoDocument{}; - std::shared_ptr<AssSubDocument> assDocument{}; + std::shared_ptr<AudioSubDocument> audioDocument{ nullptr }; + std::shared_ptr<VideoSubDocument> videoDocument{ nullptr }; + std::shared_ptr<AssSubDocument> assDocument{ nullptr }; - static bool detectDocumentType(const QFileInfo &file, Capabilities *) noexcept; + static bool detectDocumentType(const QFileInfo &file, Capabilities *const) noexcept; void addDocumentType(Capabilities) noexcept; void saveMemoryFile(const QFileInfo &); diff --git a/src/UI/VivyDocumentView.cc b/src/UI/VivyDocumentView.cc index 3bbf3a9e4cdec8fb2afc6ed1647fe92a663ac08d..3693fec2770ec6d786789070ed158bb6cd17754a 100644 --- a/src/UI/VivyDocumentView.cc +++ b/src/UI/VivyDocumentView.cc @@ -21,19 +21,16 @@ VivyDocumentView::VivyDocumentView(std::shared_ptr<VivyDocument> doc, QWidget *p : AbstractDocumentView(AbstractDocumentView::Type::Vivy, parent) , document(doc) { - qDebug() << "Create view for document" << doc->getName() << "with capabilities" - << doc->getDocumentCapabilitiesString(); + setDockNestingEnabled(true); loadAudioView(); loadVideoView(); loadAssView(); - setDockNestingEnabled(true); - // Add some actions... QAction *openPropertiesAct = new QAction("Open properties", this); connect(openPropertiesAct, &QAction::triggered, this, &VivyDocumentView::openProperties); - connect(document.get(), &AbstractDocument::documentChanged, this, [=, this]() noexcept -> void { + connect(document.get(), &AbstractDocument::documentChanged, this, [=, this]() { if (property) openProperties(); emit documentPropertyChanged();