Merge pull request #909 from letsfindaway/refactor-fixme-clang

kaamui · web-flow · commit e9abc435ab13 · 2024-08-14T09:40:02.000+02:00
Refactor: avoid serious clang warnings
diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp
@@ -1235,7 +1235,10 @@ UBGraphicsGroupContainerItem *UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbGro
         if (pStrokesGroup->childItems().count())
             mCurrentScene->addItem(pStrokesGroup);
         else
+        {
             delete pStrokesGroup;
+            pStrokesGroup = nullptr;
+        }
 
         if (pStrokesGroup)
         {
diff --git a/src/api/UBWidgetUniboardAPI.cpp b/src/api/UBWidgetUniboardAPI.cpp
@@ -565,6 +565,7 @@ bool UBWidgetUniboardAPI::ProcessDropEvent(QGraphicsSceneDragDropEvent *event)
 
                 if (!UBFileSystemUtils::copyFile(fileName, destFileName)) {
                     qDebug() << "can't copy from" << fileName << "to" << destFileName;
+                    delete dropMimeData;
                     return false;
                 }
                 downloaded = true;
diff --git a/src/core/UBDocumentManager.cpp b/src/core/UBDocumentManager.cpp
@@ -151,7 +151,7 @@ QString UBDocumentManager::importFileFilter(bool notUbx)
 
 QFileInfoList UBDocumentManager::importUbx(const QString &Incomingfile, const QString &destination)
 {
-    UBImportDocumentSetAdaptor *docSetAdaptor;
+    UBImportDocumentSetAdaptor *docSetAdaptor = nullptr;
     foreach (UBImportAdaptor *curAdaptor, mImportAdaptors) {
         docSetAdaptor = qobject_cast<UBImportDocumentSetAdaptor*>(curAdaptor);
         if (docSetAdaptor) {
diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp
@@ -103,8 +103,6 @@ UBPersistenceManager::UBPersistenceManager(QObject *pParent)
     mDocumentTreeStructureModel = new UBDocumentTreeModel(this);
     createDocumentProxiesStructure();
 
-    emit proxyListChanged();
-
     mThread = new QThread;
     mWorker = new UBPersistenceWorker();
     mWorker->moveToThread(mThread);
@@ -632,9 +630,7 @@ std::shared_ptr<UBDocumentProxy> UBPersistenceManager::createDocument(const QStr
     } else if (processInteractiveReplacementDialog(doc) == QDialog::Accepted) {
         addDoc = true;
     }
-    if (addDoc) {
-        emit proxyListChanged();
-    } else {
+    if (!addDoc) {
         deleteDocument(doc);
         doc = 0;
     }
@@ -710,7 +706,6 @@ std::shared_ptr<UBDocumentProxy> UBPersistenceManager::createDocumentFromDir(con
     }
     if (addDoc) {
         UBMetadataDcSubsetAdaptor::persist(doc);
-        emit proxyListChanged();
         emit documentCreated(doc);
     } else {
         deleteDocument(doc);
@@ -762,8 +757,6 @@ std::shared_ptr<UBDocumentProxy> UBPersistenceManager::duplicateDocument(std::sh
 
     copy->setPageCount(sceneCount(copy));
 
-    emit proxyListChanged();
-
     emit documentCreated(copy);
 
     return copy;
diff --git a/src/core/UBPersistenceManager.h b/src/core/UBPersistenceManager.h
@@ -158,9 +158,6 @@ class UBPersistenceManager : public QObject
         bool isSceneInCached(std::shared_ptr<UBDocumentProxy>proxy, int index) const;
 
     signals:
-
-        void proxyListChanged();
-
         void documentCreated(std::shared_ptr<UBDocumentProxy> pDocumentProxy);
         void documentMetadataChanged(std::shared_ptr<UBDocumentProxy> pDocumentProxy);
 
diff --git a/src/desktop/UBCustomCaptureWindow.cpp b/src/desktop/UBCustomCaptureWindow.cpp
@@ -131,7 +131,7 @@ void UBCustomCaptureWindow::mouseReleaseEvent ( QMouseEvent * event )
     event->accept();
 
     // do not accept very small selection
-    if (!(mSelectionBand->geometry().width() < 6 && mSelectionBand->geometry().height() < 6))
+    if (mSelectionBand && !(mSelectionBand->geometry().width() < 6 && mSelectionBand->geometry().height() < 6))
     {
         accept();
     }
diff --git a/src/desktop/UBDesktopPalette.cpp b/src/desktop/UBDesktopPalette.cpp
@@ -137,8 +137,7 @@ void UBDesktopPalette::showHideClick(bool checked)
 
 void UBDesktopPalette::updateShowHideState(bool pShowEnabled)
 {
-    if (mShowHideAction)
-        mShowHideAction->setChecked(pShowEnabled);
+    mShowHideAction->setChecked(pShowEnabled);
 
     if (mShowHideAction->isChecked())
         mShowHideAction->setToolTip(tr("Show Board on Secondary Screen"));
diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp
@@ -1222,6 +1222,11 @@ QModelIndex UBDocumentTreeModel::goTo(const QString &dir)
         if (!searchingNode) {
             UBDocumentTreeNode *newChild = new UBDocumentTreeNode(UBDocumentTreeNode::Catalog, curLevelName);
             parentIndex = addNode(newChild, parentIndex);
+
+            if (!parentIndex.isValid())
+            {
+                delete newChild;
+            }
         }
     }
 
@@ -1266,7 +1271,10 @@ void UBDocumentTreeModel::addDocument(std::shared_ptr<UBDocumentProxy> pProxyDat
         lParent = goTo(docGroupName);
     }
 
-    addNode(freeNode, lParent);
+    if (!addNode(freeNode, lParent).isValid())
+    {
+        delete freeNode;
+    }
 }
 
 void UBDocumentTreeModel::addNewDocument(std::shared_ptr<UBDocumentProxy> pProxyData, const QModelIndex &pParent)
@@ -1281,7 +1289,14 @@ QModelIndex UBDocumentTreeModel::addCatalog(const QString &pName, const QModelIn
     }
 
     UBDocumentTreeNode *catalogNode = new UBDocumentTreeNode(UBDocumentTreeNode::Catalog, pName);
-    return addNode(catalogNode, pParent);
+    QModelIndex index = addNode(catalogNode, pParent);
+
+    if (!index.isValid())
+    {
+        delete catalogNode;
+    }
+
+    return index;
 }
 
 void UBDocumentTreeModel::setNewName(const QModelIndex &index, const QString &newName)
@@ -1569,7 +1584,12 @@ void UBDocumentTreeView::dragMoveEvent(QDragMoveEvent *event)
         if (!docModel || !docModel->isDocument(targetIndex) || docModel->inTrash(targetIndex)) {
             event->ignore();
             event->setDropAction(Qt::IgnoreAction);
-            docModel->setHighLighted(QModelIndex());
+
+            if (docModel)
+            {
+                docModel->setHighLighted(QModelIndex());
+            }
+
             acceptIt = false;
         } else {
             docModel->setHighLighted(targetIndex);
@@ -1605,8 +1625,8 @@ void UBDocumentTreeView::dropEvent(QDropEvent *event)
     bool isUBPage = event->mimeData()->hasFormat(UBApplication::mimeTypeUniboardPage);
 
     //issue 1629 - NNE - 20131212
-    bool targetIsInTrash = docModel->inTrash(targetIndex) || docModel->trashIndex() == targetIndex;
-    bool targetIsInMyDocuments = docModel->inMyDocuments(targetIndex) || docModel->myDocumentsIndex() == targetIndex;
+    bool targetIsInTrash = docModel && (docModel->inTrash(targetIndex) || docModel->trashIndex() == targetIndex);
+    bool targetIsInMyDocuments = docModel && (docModel->inMyDocuments(targetIndex) || docModel->myDocumentsIndex() == targetIndex);
 
     if (!targetIsInMyDocuments && !targetIsInTrash)
         return;
@@ -1829,15 +1849,15 @@ QWidget *UBDocumentTreeItemDelegate::createEditor(QWidget *parent, const QStyleO
         const UBDocumentTreeModel *docModel = 0;
 
         const UBSortFilterProxyModel *proxy = dynamic_cast<const UBSortFilterProxyModel*>(index.model());
+        QModelIndex sourceIndex;
 
         if(proxy){
             docModel = dynamic_cast<UBDocumentTreeModel*>(proxy->sourceModel());
+            sourceIndex = proxy->mapToSource(index);
         }else{
             docModel =  dynamic_cast<const UBDocumentTreeModel*>(index.model());
         }
 
-        QModelIndex sourceIndex = proxy->mapToSource(index);
-
         if (docModel)
         {
             mExistingFileNames = docModel->nodeNameList(sourceIndex.parent());
@@ -2225,6 +2245,8 @@ void UBDocumentController::setupViews()
             adaptor->setAssociatedAction(currentExportAction);
         }
 
+        bool exportMenuAttached = false;
+
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
         foreach (QObject* menuWidget,  mMainWindow->actionExport->associatedObjects())
 #else
@@ -2239,9 +2261,15 @@ void UBDocumentController::setupViews()
                 tb->setPopupMode(QToolButton::InstantPopup);
 
                 tb->setMenu(exportMenu);
+                exportMenuAttached = true;
             }
         }
 
+        if (!exportMenuAttached)
+        {
+            delete exportMenu;
+        }
+
 #ifdef Q_OS_OSX
         mMainWindow->actionDelete->setShortcut(QKeySequence(Qt::Key_Backspace));
 #else
diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp
@@ -853,11 +853,14 @@ void UBGraphicsItemDelegate::setLocked(bool pLocked)
 
 void UBGraphicsItemDelegate::updateFrame()
 {
-    if (mFrame && !mFrame->scene() && mDelegated->scene())
-        mDelegated->scene()->addItem(mFrame);
+    if (mFrame)
+    {
+        if (!mFrame->scene() && mDelegated->scene())
+            mDelegated->scene()->addItem(mFrame);
 
-    mFrame->setAntiScale(mAntiScaleRatio);
-    mFrame->positionHandles();
+        mFrame->setAntiScale(mAntiScaleRatio);
+        mFrame->positionHandles();
+    }
 }
 
 void UBGraphicsItemDelegate::updateButtons(bool showUpdated)
diff --git a/src/domain/UBGraphicsMediaItem.cpp b/src/domain/UBGraphicsMediaItem.cpp
@@ -49,7 +49,7 @@ bool UBGraphicsMediaItem::sIsMutedByDefault = false;
  */
 UBGraphicsMediaItem* UBGraphicsMediaItem::createMediaItem(const QUrl &pMediaFileUrl, QGraphicsItem* parent)
 {
-    UBGraphicsMediaItem * mediaItem;
+    UBGraphicsMediaItem * mediaItem = nullptr;
 
     QString mediaPath = pMediaFileUrl.toString();
     if ("" == mediaPath)
diff --git a/src/domain/UBGraphicsMediaItemDelegate.cpp b/src/domain/UBGraphicsMediaItemDelegate.cpp
@@ -185,22 +185,21 @@ void UBGraphicsMediaItemDelegate::positionHandles()
         mToolBarItem->show();
 
         mToolBarItem->setRect(toolBarRect);
-    }
 
-    int toolBarButtonsWidth = 0;
-    foreach (DelegateButton* button, mToolBarButtons)
-        toolBarButtonsWidth += button->boundingRect().width() + mToolBarItem->getElementsPadding();
+        int toolBarButtonsWidth = 0;
+        foreach (DelegateButton* button, mToolBarButtons)
+            toolBarButtonsWidth += button->boundingRect().width() + mToolBarItem->getElementsPadding();
 
-    QRectF mediaItemRect = mMediaControl->rect();
-    mediaItemRect.setWidth(mediaItem->boundingRect().width() - toolBarButtonsWidth);
-    mediaItemRect.setHeight(mToolBarItem->boundingRect().height());
-    mMediaControl->setRect(mediaItemRect);
+        QRectF mediaItemRect = mMediaControl->rect();
+        mediaItemRect.setWidth(mediaItem->boundingRect().width() - toolBarButtonsWidth);
+        mediaItemRect.setHeight(mToolBarItem->boundingRect().height());
+        mMediaControl->setRect(mediaItemRect);
 
-    mToolBarItem->positionHandles();
-    mMediaControl->positionHandles();
+        mToolBarItem->positionHandles();
+        mMediaControl->positionHandles();
 
-    if (mediaItem)
         mToolBarItem->show();
+    }
 }
 
 void UBGraphicsMediaItemDelegate::remove(bool canUndo)
diff --git a/src/gui/UBThumbnailWidget.cpp b/src/gui/UBThumbnailWidget.cpp
@@ -158,6 +158,9 @@ void UBThumbnailWidget::refreshScene()
     {
         QGraphicsItem* item = mGraphicItems.at(i);
 
+        if (!item)
+            continue;
+
         UBSceneThumbnailPixmap *thumbnail = dynamic_cast<UBSceneThumbnailPixmap*>(item);
         if (thumbnail)
             thumbnail->setSceneIndex(i);
diff --git a/src/gui/UBToolWidget.cpp b/src/gui/UBToolWidget.cpp
@@ -53,26 +53,6 @@ QPixmap* UBToolWidget::sClosePixmap = 0;
 QPixmap* UBToolWidget::sUnpinPixmap = 0;
 
 
-UBToolWidget::UBToolWidget(const QUrl& pUrl, QWidget *pParent)
-    : QWidget(pParent, Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint)
-    , mWebView(0)
-    , mToolWidget(0)
-    , mShouldMoveWidget(false)
-    , mContentMargin(0)
-    , mFrameWidth(0)
-
-{
-    int widgetType = UBGraphicsWidgetItem::widgetType(pUrl);
-    if (widgetType == UBWidgetType::Apple) // NOTE @letsfindaway obsolete
-        mToolWidget = new UBGraphicsAppleWidgetItem(pUrl);
-    else if (widgetType == UBWidgetType::W3C)
-        mToolWidget = new UBGraphicsW3CWidgetItem(pUrl);
-    else
-        qDebug() << "UBToolWidget::UBToolWidget: Unknown widget Type";
-
-    initialize();
-}
-
 UBToolWidget::UBToolWidget(UBGraphicsWidgetItem *pWidget, QWidget *pParent)
     : QWidget(pParent, Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint)
     , mWebView(0)
diff --git a/src/gui/UBToolWidget.h b/src/gui/UBToolWidget.h
@@ -47,7 +47,6 @@ class UBToolWidget : public QWidget
     Q_OBJECT;
 
     public:
-        UBToolWidget(const QUrl& pUrl, QWidget* pParent = 0);
         UBToolWidget(UBGraphicsWidgetItem* pWidget, QWidget* pParent = 0);
         virtual ~UBToolWidget();
 
diff --git a/src/web/UBEmbedController.cpp b/src/web/UBEmbedController.cpp
@@ -262,15 +262,17 @@ void UBEmbedController::importWidgetInLibrary(const QDir& pSourceDir) const
     }
 
 
-    if (UBApplication::boardController &&
-        UBApplication::boardController->activeScene())
+    if (UBApplication::boardController)
     {
-        UBApplication::boardController->addW3cWidget(QUrl::fromLocalFile(widgetLibraryPath), QPointF());
-        UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector);
-    }
+        if (UBApplication::boardController->activeScene())
+        {
+            UBApplication::boardController->addW3cWidget(QUrl::fromLocalFile(widgetLibraryPath), QPointF());
+            UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector);
+        }
 
-    UBFeaturesController* featuresController = UBApplication::boardController->paletteManager()->featuresWidget()->getFeaturesController();
-    featuresController->addUserWidgetToLibrary(widgetLibraryPath, mTrapFlashUi->widgetNameLineEdit->text());
+        UBFeaturesController* featuresController = UBApplication::boardController->paletteManager()->featuresWidget()->getFeaturesController();
+        featuresController->addUserWidgetToLibrary(widgetLibraryPath, mTrapFlashUi->widgetNameLineEdit->text());
+    }
 }
 
 
diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp
@@ -715,9 +715,12 @@ void UBWebController::loadUrl(const QUrl& url)
 WebView* UBWebController::createNewTab()
 {
     if (mCurrentWebBrowser)
+    {
         UBApplication::applicationController->showInternet();
+        return mCurrentWebBrowser->tabWidget()->createTab();
+    }
 
-    return mCurrentWebBrowser->tabWidget()->createTab();
+    return nullptr;
 }
 
 
diff --git a/src/web/simplebrowser/WBHistory.cpp b/src/web/simplebrowser/WBHistory.cpp
@@ -274,7 +274,7 @@ void WBHistoryManager::clear()
     m_fullSave = true;
     m_saveTimer->changeOccurred();
     m_saveTimer->saveIfNeccessary();
-    historyReset();
+    emit historyReset();
 }
 
 void WBHistoryManager::loadSettings()

Original file line number	Diff line number	Diff line change
`@@ -565,6 +565,7 @@ bool UBWidgetUniboardAPI::ProcessDropEvent(QGraphicsSceneDragDropEvent *event)`
`565`	`565`
`566`	`566`	`if (!UBFileSystemUtils::copyFile(fileName, destFileName)) {`
`567`	`567`	`qDebug() << "can't copy from" << fileName << "to" << destFileName;`
	`568`	`+ delete dropMimeData;`
`568`	`569`	`return false;`
`569`	`570`	`}`
`570`	`571`	`downloaded = true;`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ QString UBDocumentManager::importFileFilter(bool notUbx)`
`151`	`151`
`152`	`152`	`QFileInfoList UBDocumentManager::importUbx(const QString &Incomingfile, const QString &destination)`
`153`	`153`	`{`
`154`		`- UBImportDocumentSetAdaptor *docSetAdaptor;`
	`154`	`+ UBImportDocumentSetAdaptor *docSetAdaptor = nullptr;`
`155`	`155`	`foreach (UBImportAdaptor *curAdaptor, mImportAdaptors) {`
`156`	`156`	`docSetAdaptor = qobject_cast<UBImportDocumentSetAdaptor*>(curAdaptor);`
`157`	`157`	`if (docSetAdaptor) {`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ void UBCustomCaptureWindow::mouseReleaseEvent ( QMouseEvent * event )`
`131`	`131`	`event->accept();`
`132`	`132`
`133`	`133`	`// do not accept very small selection`
`134`		`- if (!(mSelectionBand->geometry().width() < 6 && mSelectionBand->geometry().height() < 6))`
	`134`	`+ if (mSelectionBand && !(mSelectionBand->geometry().width() < 6 && mSelectionBand->geometry().height() < 6))`
`135`	`135`	`{`
`136`	`136`	`accept();`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,7 @@ void UBDesktopPalette::showHideClick(bool checked)`
`137`	`137`
`138`	`138`	`void UBDesktopPalette::updateShowHideState(bool pShowEnabled)`
`139`	`139`	`{`
`140`		`- if (mShowHideAction)`
`141`		`- mShowHideAction->setChecked(pShowEnabled);`
	`140`	`+ mShowHideAction->setChecked(pShowEnabled);`
`142`	`141`
`143`	`142`	`if (mShowHideAction->isChecked())`
`144`	`143`	`mShowHideAction->setToolTip(tr("Show Board on Secondary Screen"));`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ bool UBGraphicsMediaItem::sIsMutedByDefault = false;`
`49`	`49`	`*/`
`50`	`50`	`UBGraphicsMediaItem* UBGraphicsMediaItem::createMediaItem(const QUrl &pMediaFileUrl, QGraphicsItem* parent)`
`51`	`51`	`{`
`52`		`- UBGraphicsMediaItem * mediaItem;`
	`52`	`+ UBGraphicsMediaItem * mediaItem = nullptr;`
`53`	`53`
`54`	`54`	`QString mediaPath = pMediaFileUrl.toString();`
`55`	`55`	`if ("" == mediaPath)`