Fix memleak for detached SmartDock

Author: iakov

plugins/robots/common/twoDModel/include/twoDModel/engine/twoDModelEngineFacade.h

@@ -76,7 +76,7 @@ public slots:
 	QScopedPointer<model::Model> mModel;
 	QPointer<view::TwoDModelWidget> mView {};
 	QScopedPointer<TwoDModelEngineInterface> mApi;
-	utils::SmartDock *mDock;  // Transfers ownership to main window indirectly
+	utils::SmartDock *mDock {};  // Transfers ownership to main window indirectly
 
 	qReal::TabInfo::TabType mCurrentTabInfo { qReal::TabInfo::TabType::other }; // temp hack
 };

plugins/robots/common/twoDModel/src/engine/twoDModelEngineFacade.cpp

@@ -41,6 +41,9 @@ TwoDModelEngineFacade::TwoDModelEngineFacade(twoDModel::robotModel::TwoDRobotMod
 }
 
 TwoDModelEngineFacade::~TwoDModelEngineFacade(){
+	if (mDock && !mDock->parent()) {
+		delete mDock;
+	}
 	delete mView;
 }
 

plugins/tools/subprogramsImporterExporter/subprogramsCollectionDialog.cpp

@@ -85,8 +85,8 @@ void SubprogramsCollectionDialog::accept()
 void SubprogramsCollectionDialog::highlightItem(QListWidgetItem *item)
 {
 	if(item->checkState() == Qt::Checked) {
-		item->setBackgroundColor(QColor("#ADFF2F"));
+		item->setBackgroundColor(QColor(0xAD, 0xFF, 0x2F));
 	} else {
-		item->setBackgroundColor(QColor("#ffffff"));
+		item->setBackgroundColor(QColorConstants::White);
 	}
 }

plugins/tools/subprogramsImporterExporter/subprogramsImporterExporterPlugin.cpp

@@ -125,7 +125,6 @@ void SubprogramsImporterExporterPlugin::exportToFile() const
 	}
 
 	nameToId.remove("");
-	QSet<qReal::Id> set(subprograms.toSet());
 	QHash<QString, qReal::IdList> toSave;
 	toSave.insert(fileName, nameToId.values());
 
@@ -274,7 +273,7 @@ void SubprogramsImporterExporterPlugin::importFromCollectionTriggered() const
 		for (const auto &metaKey : oldMeta.keys()) {
 			mLogicalModel->mutableLogicalRepoApi().setMetaInformation(metaKey, oldMeta[metaKey]);
 		}
-		mProjectManager->afterOpen(mRepo->workingFile());
+		Q_EMIT mProjectManager->afterOpen(mRepo->workingFile());
 		mProjectManager->setUnsavedIndicator(true);
 
 		checkSubprogramsForUniqueNames();

plugins/tools/updatesChecker/updatesCheckerPlugin.cpp

@@ -33,7 +33,7 @@ UpdatesCheckerPlugin::UpdatesCheckerPlugin()
 	, mCheckForUpdatesAction(new QAction(tr("Check for updates"), this))
 {
 	mSeparator->setSeparator(true);
-	connect(mCheckForUpdatesAction, &QAction::triggered, [this](){ checkForUpdates(); });
+	connect(mCheckForUpdatesAction, &QAction::triggered, this, &UpdatesCheckerPlugin::checkForUpdates);
 }
 
 QList<qReal::ActionInfo> UpdatesCheckerPlugin::actions()

qrgui/brandManager/brandManager.cpp

@@ -22,12 +22,6 @@ BrandManager::BrandManager()
 {
 }
 
-BrandManager::~BrandManager()
-{
-	delete mFonts;
-	delete mStyles;
-}
-
 BrandManager &BrandManager::instance()
 {
 	static BrandManager instance;
@@ -41,12 +35,12 @@ void BrandManager::configure(const ToolPluginManager *toolPluginManager)
 
 const Fonts *BrandManager::fonts()
 {
-	return instance().mFonts;
+	return &*instance().mFonts;
 }
 
 const Styles *BrandManager::styles()
 {
-	return instance().mStyles;
+	return &*instance().mStyles;
 }
 
 QString BrandManager::applicationName()

qrgui/brandManager/brandManager.h

@@ -19,6 +19,7 @@
 #include "qrgui/brandManager/brandManagerDeclSpec.h"
 #include "qrgui/brandManager/fonts.h"
 #include "qrgui/brandManager/styles.h"
+#include <QtCore/QScopedPointer>
 
 namespace qReal {
 
@@ -50,11 +51,10 @@ class QRGUI_BRAND_MANAGER_EXPORT BrandManager
 
 private:
 	BrandManager();
-	~BrandManager();
 
 	const Customizer *mCustomizer {};  // Doesn`t take ownership
-	const Fonts *mFonts;  // Takes ownership
-	const Styles *mStyles;  // Takes ownership
+	QScopedPointer<Fonts> mFonts;
+	QScopedPointer<Styles> mStyles;
 };
 
 }

qrgui/mainWindow/projectManager/projectManagerWrapper.cpp

@@ -108,7 +108,7 @@ bool ProjectManagerWrapper::open(const QString &fileName)
 		mMainWindow->closeStartTab();
 		mTextManager->showInTextEditor(fileInfo, text::Languages::pickByExtension(fileInfo.suffix()));
 		if (localActiveDiagram.isNull() && !mMainWindow->activeDiagram().isNull()) {
-			emit afterOpen(fileName);
+			Q_EMIT afterOpen(fileName);
 		}
 	}
 

qrgui/systemFacade/components/projectManager.cpp

@@ -161,7 +161,7 @@ bool ProjectManager::openProject(const QString &fileName)
 	QLOG_INFO() << "Opened project" << fileName;
 	QLOG_DEBUG() << "Sending after open signal...";
 
-	emit afterOpen(fileName);
+	Q_EMIT afterOpen(fileName);
 
 	return true;
 }

qrkernel/timeMeasurer.h

@@ -24,6 +24,7 @@ namespace qReal {
 /// Measures time interval between its creation and deletion, writes results to qDebug. Used for profiling.
 class QRKERNEL_EXPORT TimeMeasurer
 {
+	Q_DISABLE_COPY_MOVE(TimeMeasurer)
 public:
 	/// Constructor.
 	/// @param methodName A name of a method or part of program to be measured.