Merge branch 'master' of github.com:Sankore/Sankore-3.1

Conflicts:
	src/pdf/XPDFRenderer.cpp

resources/sankore.qrc

@@ -153,6 +153,7 @@
         <file>images/toolPalette/podcast.svg</file>
         <file>images/toolPalette/podcastOn.svg</file>
         <file>images/toolPalette/rulerTool.png</file>
+        <file>images/toolPalette/triangleTool.png</file>
         <file>images/toolPalette/protractorTool.png</file>
         <file>images/toolPalette/compassTool.png</file>
         <file>images/toolPalette/maskTool.png</file>

src/adaptors/UBExportAdaptor.cpp

@@ -18,6 +18,8 @@
 
 #include "gui/UBMainWindow.h"
 
+#include "core/memcheck.h"
+
 UBExportAdaptor::UBExportAdaptor(QObject *parent)
     : QObject(parent)
     , mIsVerbose(true)

src/adaptors/UBExportDocument.cpp

@@ -17,6 +17,8 @@
 #include "quazip.h"
 #include "quazipfile.h"
 
+#include "core/memcheck.h"
+
 UBExportDocument::UBExportDocument(QObject *parent)
     : UBExportAdaptor(parent)
 {

src/adaptors/UBExportFullPDF.cpp

@@ -29,6 +29,9 @@
 #include <Exception.h>
 #include <Transformation.h>
 
+#include "core/memcheck.h"
+
+
 using namespace merge_lib;
 
 

src/adaptors/UBExportPDF.cpp

@@ -22,6 +22,7 @@
 
 #include "pdf/GraphicsPDFItem.h"
 
+#include "core/memcheck.h"
 
 UBExportPDF::UBExportPDF(QObject *parent)
     : UBExportAdaptor(parent)

src/adaptors/UBExportWeb.cpp

@@ -18,6 +18,8 @@
 #include "quazip.h"
 #include "quazipfile.h"
 
+#include "core/memcheck.h"
+
 UBExportWeb::UBExportWeb(QObject *parent)
     : UBExportAdaptor(parent)
 {

src/adaptors/UBImportAdaptor.cpp

@@ -12,6 +12,7 @@
 
 #include "document/UBDocumentProxy.h"
 
+#include "core/memcheck.h"
 
 UBImportAdaptor::UBImportAdaptor(QObject *parent)
     :QObject(parent)

src/adaptors/UBImportDocument.cpp

@@ -19,6 +19,8 @@
 #include "quazipfile.h"
 #include "quazipfileinfo.h"
 
+#include "core/memcheck.h"
+
 UBImportDocument::UBImportDocument(QObject *parent)
     :UBImportAdaptor(parent)
 {

src/adaptors/UBImportDocument.h

@@ -10,6 +10,7 @@
 
 #include <QtGui>
 #include "UBImportAdaptor.h"
+
 class UBDocumentProxy;
 
 class UBImportDocument : public UBImportAdaptor

src/adaptors/UBImportImage.cpp

@@ -13,6 +13,8 @@
 
 #include "pdf/PDFRenderer.h"
 
+#include "core/memcheck.h"
+
 UBImportImage::UBImportImage(QObject *parent)
     : UBImportAdaptor(parent)
 {

src/adaptors/UBImportImage.h

@@ -4,6 +4,7 @@
 
 #include <QtGui>
 #include "UBImportAdaptor.h"
+
 class UBDocumentProxy;
 
 class UBImportImage : public UBImportAdaptor

src/adaptors/UBImportPDF.cpp

@@ -12,6 +12,8 @@
 
 #include "pdf/PDFRenderer.h"
 
+#include "core/memcheck.h"
+
 UBImportPDF::UBImportPDF(QObject *parent)
     : UBImportAdaptor(parent)
 {

src/adaptors/UBImportPDF.h

@@ -4,6 +4,7 @@
 
 #include <QtGui>
 #include "UBImportAdaptor.h"
+
 class UBDocumentProxy;
 
 class UBImportPDF : public UBImportAdaptor

src/adaptors/UBImportVirtualPrinter.cpp

@@ -17,6 +17,7 @@
 
 #include <windows.h>
 
+#include "core/memcheck.h"
 
 QString UBImportVirtualPrinter::sOriginalDefaultPrintername = "";
 

src/adaptors/UBIniFileParser.cpp

@@ -7,6 +7,8 @@
 
 #include "UBIniFileParser.h"
 
+#include "core/memcheck.h"
+
 UBIniFileParser::UBIniFileParser(const QString& pFileName)
 {
     QFile file(pFileName);

src/adaptors/UBMetadataDcSubsetAdaptor.cpp

@@ -16,6 +16,8 @@
 
 #include "document/UBDocumentProxy.h"
 
+#include "core/memcheck.h"
+
 const QString UBMetadataDcSubsetAdaptor::nsRdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
 const QString UBMetadataDcSubsetAdaptor::nsDc = "http://purl.org/dc/elements/1.1/";
 const QString UBMetadataDcSubsetAdaptor::metadataFilename = "metadata.rdf";

src/adaptors/UBSvgSubsetAdaptor.cpp

@@ -41,6 +41,8 @@
 
 #include "pdf/PDFRenderer.h"
 
+#include "core/memcheck.h"
+
 const QString UBSvgSubsetAdaptor::nsSvg = "http://www.w3.org/2000/svg";
 const QString UBSvgSubsetAdaptor::nsXHtml = "http://www.w3.org/1999/xhtml";
 const QString UBSvgSubsetAdaptor::nsXLink = "http://www.w3.org/1999/xlink";
@@ -410,7 +412,14 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
             }
             else if (mXmlReader.name() == "g")
             {
-                annotationGroup = new UBGraphicsStroke();
+				// Create new stroke, if its NULL or already has poligons
+				if (annotationGroup)
+				{
+					if (!annotationGroup->polygons().empty())
+						annotationGroup = new UBGraphicsStroke();
+				}
+				else
+					annotationGroup = new UBGraphicsStroke();
 
                 QStringRef ubZValue = mXmlReader.attributes().value(mNamespaceUri, "z-value");
 
@@ -747,7 +756,11 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
         {
             if (mXmlReader.name() == "g")
             {
-                annotationGroup = 0;
+				if (annotationGroup)
+				{
+					if (!annotationGroup->polygons().empty())
+						annotationGroup = 0;
+				}
                 mGroupHasInfo = false;
                 mGroupDarkBackgroundColor = QColor();
                 mGroupLightBackgroundColor = QColor();
@@ -767,6 +780,12 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
         scene->setModified(false);
     }
 
+	if (annotationGroup)
+	{
+		if (annotationGroup->polygons().empty())
+			delete annotationGroup;
+	}
+
     return scene;
 }
 

src/adaptors/UBThumbnailAdaptor.cpp

@@ -15,6 +15,8 @@
 
 #include "UBSvgSubsetAdaptor.h"
 
+#include "core/memcheck.h"
+
 UBThumbnailAdaptor::UBThumbnailAdaptor(QObject *parent)
     : QObject(parent)
 {

src/adaptors/UBWebPublisher.cpp

@@ -11,7 +11,7 @@
 
 #include "adaptors/publishing/UBDocumentPublisher.h"
 
-
+#include "core/memcheck.h"
 
 UBWebPublisher::UBWebPublisher(QObject *parent)
     : UBExportAdaptor(parent)

src/adaptors/publishing/UBAbstractPublisher.cpp

@@ -11,6 +11,8 @@
 #include "network/UBNetworkAccessManager.h"
 #include "network/UBServerXMLHttpRequest.h"
 
+#include "core/memcheck.h"
+
 UBAbstractPublisher::UBAbstractPublisher(QObject *parent)
     : QObject(parent)
     , mTokenRequest(0)

src/adaptors/publishing/UBCapturePublisher.cpp

@@ -14,6 +14,7 @@
 
 #include "domain/UBGraphicsScene.h"
 
+#include "core/memcheck.h"
 
 UBCapturePublisher::UBCapturePublisher(const QPixmap& pixmap, QObject *parent)
     : UBAbstractPublisher(parent)

src/adaptors/publishing/UBCapturePublisher.h

@@ -7,7 +7,6 @@
 
 #include "UBAbstractPublisher.h"
 
-
 class UBServerXMLHttpRequest;
 
 class UBCapturePublisher : public UBAbstractPublisher

src/adaptors/publishing/UBDocumentPublisher.cpp

@@ -26,6 +26,7 @@
 
 #include "UBSvgSubsetRasterizer.h"
 
+#include "core/memcheck.h"
 
 UBDocumentPublisher::UBDocumentPublisher(UBDocumentProxy* pDocument, QObject *parent)
     : UBAbstractPublisher(parent)

src/adaptors/publishing/UBSvgSubsetRasterizer.cpp

@@ -10,6 +10,8 @@
 #include "domain/UBGraphicsScene.h"
 #include "adaptors/UBSvgSubsetAdaptor.h"
 
+#include "core/memcheck.h"
+
 UBSvgSubsetRasterizer::UBSvgSubsetRasterizer(UBDocumentProxy* document, int pageIndex, QObject* parent)
     : QObject(parent)
     , mDocument(document)

src/adaptors/voting/UBAbstractVotingSystem.cpp

@@ -16,6 +16,8 @@
 
 #include "gui/UBMainWindow.h"
 
+#include "core/memcheck.h"
+
 UBAbstractVotingSystem::UBAbstractVotingSystem(QObject *parent)
     : QObject(parent)
 {

src/adaptors/voting/UBReply2005VotingSystem.cpp

@@ -9,6 +9,8 @@
 
 #include "core/UBSettings.h"
 
+#include "core/memcheck.h"
+
 UBReply2005VotingSystem::UBReply2005VotingSystem(QWidget *parent)
     : UBAbstractVotingSystem(parent)
     , mParent(parent)

src/adaptors/voting/UBReplyWRS970VotingSystem.cpp

@@ -10,6 +10,8 @@
 #include "core/UBSettings.h"
 #include "core/UBApplication.h"
 
+#include "core/memcheck.h"
+
 UBReplyWRS970VotingSystem::UBReplyWRS970VotingSystem(QWidget *parent)
     : UBAbstractVotingSystem(parent)
     , mParent(parent)

src/api/UBLibraryAPI.cpp

@@ -10,6 +10,8 @@
 #include "core/UBApplication.h"
 #include "board/UBBoardController.h"
 
+#include "core/memcheck.h"
+
 UBLibraryAPI::UBLibraryAPI(QWebView *pWebView)
     : QObject(pWebView)
     , mWebView(pWebView)

src/api/UBW3CWidgetAPI.cpp

@@ -20,6 +20,7 @@
 
 #include "UBWidgetMessageAPI.h"
 
+#include "core/memcheck.h"
 
 UBW3CWidgetAPI::UBW3CWidgetAPI(UBGraphicsW3CWidgetItem *graphicsWidget)
     : QObject(graphicsWidget)

src/api/UBWidgetMessageAPI.cpp

@@ -11,6 +11,8 @@
 
 #include "domain/UBAbstractWidget.h"
 
+#include "core/memcheck.h"
+
 UBWidgetMessageAPI::UBWidgetMessageAPI(UBW3CWidget *widget)
     : QObject(widget)
     , mWebWidget(widget)

src/api/UBWidgetMessageAPI.h

@@ -12,7 +12,6 @@
 
 #include "domain/UBGraphicsWidgetItem.h"
 
-
 class UBWidgetMessageAPI : public QObject
 {
     Q_OBJECT;

src/api/UBWidgetUniboardAPI.cpp

@@ -19,6 +19,7 @@
 
 #include "UBWidgetMessageAPI.h"
 
+#include "core/memcheck.h"
 
 UBWidgetUniboardAPI::UBWidgetUniboardAPI(UBGraphicsScene *pScene, UBGraphicsWidgetItem *widget)
     : QObject(pScene)

src/api/UBWidgetVotingSystemAPI.cpp

@@ -9,6 +9,7 @@
 
 #include "adaptors/voting/UBAbstractVotingSystem.h"
 
+#include "core/memcheck.h"
 
 UBWidgetVotingSystemAPI::UBWidgetVotingSystemAPI(QObject* parent)
     : QObject(parent)

src/board/UBBoardController.cpp

@@ -49,6 +49,8 @@
 
 #include "UBBoardPaletteManager.h"
 
+#include "core/memcheck.h"
+
 UBBoardController::UBBoardController(UBMainWindow* mainWindow)
     : QObject(mainWindow->centralWidget())
     , mMainWindow(mainWindow)
@@ -999,6 +1001,11 @@ void UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QString
         {
             mActiveScene->addProtractor(pPos);
             UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector);
+        }
+		else if (sourceUrl.toString() == UBToolsManager::manager()->triangle.id)
+        {
+            mActiveScene->addTriangle(pPos);
+            UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector);
         }
         else if (sourceUrl.toString() == UBToolsManager::manager()->mask.id)
         {

src/board/UBBoardPaletteManager.cpp

@@ -50,6 +50,7 @@
 
 #include "UBBoardController.h"
 
+#include "core/memcheck.h"
 
 UBBoardPaletteManager::UBBoardPaletteManager(QWidget* container, UBBoardController* pBoardController)
     : QObject(container)

src/board/UBBoardView.cpp

@@ -39,6 +39,8 @@
 
 #include "frameworks/UBPlatformUtils.h"
 
+#include "core/memcheck.h"
+
 UBBoardView::UBBoardView (UBBoardController* pController, QWidget* pParent)
 : QGraphicsView (pParent)
 , mController (pController)

src/board/UBDrawingController.cpp

@@ -12,6 +12,8 @@
 
 #include "gui/UBMainWindow.h"
 
+#include "core/memcheck.h"
+
 UBDrawingController* UBDrawingController::sDrawingController = 0;
 
 

src/board/UBLibraryController.cpp

@@ -26,6 +26,8 @@
 #include "gui/UBThumbnailWidget.h"
 #include "../core/UBSettings.h"
 
+#include "core/memcheck.h"
+
 static quint32 magicNumber = 0xACDCAFE0;
 static QString favoriteVirtualPath = "$favorite$";
 

src/core/UB.h

@@ -58,9 +58,21 @@ struct UBGraphicsItemType
 {
     enum Enum
     {
-        PolygonItemType = QGraphicsItem::UserType + 1, PixmapItemType,
+        PolygonItemType = QGraphicsItem::UserType + 1, 
-            SvgItemType, VideoItemType, AudioItemType, AppleWidgetItemType, PDFItemType, TextItemType, W3CWidgetItemType, CurtainItemType,
+		PixmapItemType,
-            RulerItemType, CompassItemType, ProtractorItemType, StrokeItemType
+        SvgItemType, 
+		VideoItemType, 
+		AudioItemType, 
+		AppleWidgetItemType, 
+		PDFItemType, 
+		TextItemType, 
+		W3CWidgetItemType, 
+		CurtainItemType,
+        RulerItemType, 
+		CompassItemType, 
+		ProtractorItemType, 
+		StrokeItemType,
+		TriangleItemType
     };
 };
 

src/core/UBApplication.cpp

@@ -45,6 +45,7 @@
 
 #include "ui_mainWindow.h"
 
+#include "core/memcheck.h"
 
 QPointer<QUndoStack> UBApplication::undoStack;
 
@@ -91,7 +92,8 @@ static OSStatus ub_appleEventProcessor(const AppleEvent *ae, AppleEvent *event,
 
 
 UBApplication::UBApplication(const QString &id, int &argc, char **argv)
-    : QtSingleApplication(id, argc, argv)
+    : QtSingleApplication(id, argc, argv),
+	mPreferencesController(NULL)
 {
 
     staticMemoryCleaner = new QObject(0); // deleted in UBApplication destructor
@@ -183,6 +185,12 @@ UBApplication::~UBApplication()
 
     delete mUniboardSankoreTransition;
     mUniboardSankoreTransition = 0;
+
+	if (mPreferencesController)
+	{
+		delete mPreferencesController;
+		mPreferencesController = 0;
+	}
 }
 
 int UBApplication::exec(const QString& pFileToImport)
@@ -537,6 +545,22 @@ bool UBApplication::handleOpenMessage(const QString& pMessage)
     return true;
 }
 
+void UBApplication::cleanup()
+{
+	if (applicationController) delete applicationController;
+	if (boardController) delete boardController;
+	if (webController) delete webController;
+	if (documentController) delete documentController;
+	if (mUniboardSankoreTransition) delete mUniboardSankoreTransition;
+
+
+	applicationController = NULL;
+	boardController = NULL;
+	webController = NULL;
+	documentController = NULL;
+	mUniboardSankoreTransition = NULL;
+}
+
 void UBStyle::drawItemText(QPainter *painter, const QRect &rect, int alignment, const QPalette &pal,
                           bool enabled, const QString& text, QPalette::ColorRole textRole) const
 {

src/core/UBApplication.h

@@ -44,6 +44,8 @@ class UBApplication : public QtSingleApplication
 
         int exec(const QString& pFileToImport);
 
+		void cleanup();
+
         static QPointer<QUndoStack> undoStack;
 
         static UBApplicationController *applicationController;

src/core/UBApplicationController.cpp

@@ -41,6 +41,8 @@
 #include <Carbon/Carbon.h>
 #endif
 
+#include "core/memcheck.h"
+
 UBApplicationController::UBApplicationController(UBBoardView *pControlView, UBBoardView *pDisplayView,
         UBMainWindow* pMainWindow, QObject* parent)
     : QObject(parent)
@@ -53,6 +55,7 @@ UBApplicationController::UBApplicationController(UBBoardView *pControlView, UBBo
     , mAutomaticCheckForUpdates(false)
     , mCheckingForUpdates(false)
     , mIsShowingDesktop(false)
+	, mFtp(0)
 {
     mDisplayManager = new UBDisplayManager(this);
 
@@ -103,6 +106,7 @@ UBApplicationController::~UBApplicationController()
 
     delete mBlackScene;
     delete mMirror;
+	if (mFtp) delete mFtp;
 }
 
 
@@ -479,6 +483,8 @@ void UBApplicationController::showSankoreEditor()
 
 void UBApplicationController::checkUpdate()
 {
+	if (mFtp!=NULL)
+		delete mFtp;
     mFtp = new QFtp(this);
     connect(mFtp, SIGNAL(commandFinished(int,bool)), this, SLOT(ftpCommandFinished(int,bool)));
 

src/core/UBDisplayManager.cpp

@@ -18,6 +18,7 @@
 
 #include "ui_blackoutWidget.h"
 
+#include "core/memcheck.h"
 
 UBDisplayManager::UBDisplayManager(QObject *parent)
     : QObject(parent)

src/core/UBDocumentManager.cpp

@@ -28,6 +28,8 @@
 #include "UBSettings.h"
 #include "UBPersistenceManager.h"
 
+#include "core/memcheck.h"
+
 UBDocumentManager* UBDocumentManager::sDocumentManager = 0;
 
 UBDocumentManager* UBDocumentManager::documentManager()

src/core/UBIdleTimer.cpp

@@ -11,6 +11,8 @@
 #include "board/UBBoardController.h"
 #include "board/UBBoardView.h"
 
+#include "core/memcheck.h"
+
 UBIdleTimer::UBIdleTimer(QObject *parent)
      : QObject(parent)
      , mCursorIsHidden(false)

src/core/UBMimeData.cpp

@@ -12,6 +12,8 @@
 #include "core/UBApplication.h"
 #include "domain/UBItem.h"
 
+#include "core/memcheck.h"
+
 UBMimeDataItem::UBMimeDataItem(UBDocumentProxy* proxy, int sceneIndex)
     : mProxy(proxy)
     , mSceneIndex(sceneIndex)

src/core/UBPersistenceManager.cpp

@@ -24,6 +24,7 @@
 #include "adaptors/UBThumbnailAdaptor.h"
 #include "adaptors/UBMetadataDcSubsetAdaptor.h"
 
+#include "core/memcheck.h"
 
 const QString UBPersistenceManager::imageDirectory = "images"; // added to UBPersistenceManager::mAllDirectories
 const QString UBPersistenceManager::objectDirectory = "objects"; // added to UBPersistenceManager::mAllDirectories

src/core/UBPreferencesController.cpp

@@ -22,6 +22,8 @@
 
 #include "ui_preferences.h"
 
+#include "core/memcheck.h"
+
 qreal UBPreferencesController::sSliderRatio = 10.0;
 qreal UBPreferencesController::sMinPenWidth = 0.5;
 qreal UBPreferencesController::sMaxPenWidth = 50.0;
@@ -43,6 +45,8 @@ UBPreferencesController::UBPreferencesController(QWidget *parent)
 
 UBPreferencesController::~UBPreferencesController()
 {
+	delete mPreferencesWindow;
+
     delete mPreferencesUI;
 
     delete mPenProperties;

src/core/UBSceneCache.cpp

@@ -9,6 +9,7 @@
 
 #include "document/UBDocumentProxy.h"
 
+#include "core/memcheck.h"
 
 UBSceneCache::UBSceneCache()
     : mCachedSceneCount(0)

src/core/UBSetting.cpp

@@ -11,6 +11,7 @@
 
 #include "UBSettings.h"
 
+#include "core/memcheck.h"
 
 UBSetting::UBSetting(UBSettings* parent) :
     QObject(parent)

src/core/UBSettings.cpp

@@ -21,6 +21,8 @@
 
 #include "tools/UBToolsManager.h"
 
+#include "core/memcheck.h"
+
 QPointer<UBSettings> UBSettings::sSingleton = 0;
 
 int UBSettings::pointerDiameter = 40;

src/core/main.cpp

@@ -1,16 +1,21 @@
 #include <QtGui>
 #include <QTextCodec>
 
-#if (defined(Q_WS_WIN) && defined(_DEBUG))
-//#include <vld.h>
-#endif
-
 #include "frameworks/UBPlatformUtils.h"
 #include "frameworks/UBFileSystemUtils.h"
 
 #include "UBApplication.h"
 #include "UBSettings.h"
 
+#if defined(WIN32) && defined(_DEBUG)
+     #define _CRTDBG_MAP_ALLOC
+     #include <stdlib.h>
+     #include <crtdbg.h>
+     #define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ )
+     #define new DEBUG_NEW
+#endif
+
+
 void ub_message_output(QtMsgType type, const char *msg) {
 	// We must temporarily remove the handler to avoid the infinite recursion of
 	// ub_message_output -> qt_message_output -> ub_message_output -> qt_message_output ...
@@ -47,7 +52,12 @@ void ub_message_output(QtMsgType type, const char *msg) {
 	qInstallMsgHandler(previousHandler);
 }
 
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[]) 
+{
+#if defined(_MSC_VER) && defined(_DEBUG)
+    _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
+#endif
+
 	Q_INIT_RESOURCE(sankore);
 
 	qInstallMsgHandler(ub_message_output);
@@ -96,8 +106,12 @@ int main(int argc, char *argv[]) {
 
 	int result = app.exec(fileToOpen);
 
+	app.cleanup();
+
 	qDebug() << "application is quitting";
 
+	
+
 	return result;
 
 }

src/desktop/UBCustomCaptureWindow.cpp

@@ -9,6 +9,8 @@
 
 #include "gui/UBRubberBand.h"
 
+#include "core/memcheck.h"
+
 UBCustomCaptureWindow::UBCustomCaptureWindow(QWidget *parent)
     : QDialog(parent, Qt::FramelessWindowHint  | Qt::Window)
     , mSelectionBand(0)

src/desktop/UBDesktopAnnotationController.cpp

@@ -36,6 +36,8 @@
 
 #include "gui/UBKeyboardPalette.h"
 
+#include "core/memcheck.h"
+
 UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
         : QObject(parent)
         , mTransparentDrawingView(0)
@@ -138,6 +140,7 @@ UBDesktopAnnotationController::~UBDesktopAnnotationController()
     delete mTransparentDrawingScene;
     delete mTransparentDrawingView;
 
+	/*
     if(NULL != mDesktopPenPalette)
     {
         delete mDesktopPalette;
@@ -158,6 +161,7 @@ UBDesktopAnnotationController::~UBDesktopAnnotationController()
         delete mLibPalette;
         mLibPalette = NULL;
     }
+	*/
 }
 
 

src/desktop/UBDesktopEraserPalette.cpp

@@ -7,6 +7,9 @@
 #include "gui/UBMainWindow.h"
 #include "gui/UBToolbarButtonGroup.h"
 
+
+#include "core/memcheck.h"
+
 UBDesktopEraserPalette::UBDesktopEraserPalette(QWidget *parent)
     : UBPropertyPalette(Qt::Horizontal, parent)
 {

src/desktop/UBDesktopMarkerPalette.cpp

@@ -6,6 +6,8 @@
 #include "gui/UBMainWindow.h"
 #include "gui/UBToolbarButtonGroup.h"
 
+#include "core/memcheck.h"
+
 UBDesktopMarkerPalette::UBDesktopMarkerPalette(QWidget *parent)
     : UBPropertyPalette(Qt::Horizontal, parent)
 {

src/desktop/UBDesktopPalette.cpp

@@ -19,6 +19,7 @@
 
 #include "gui/UBMainWindow.h"
 
+#include "core/memcheck.h"
 
 UBDesktopPalette::UBDesktopPalette(QWidget *parent)
     : UBActionPalette(Qt::TopLeftCorner, parent)

src/desktop/UBDesktopPenPalette.cpp

@@ -6,6 +6,8 @@
 #include "gui/UBMainWindow.h"
 #include "gui/UBToolbarButtonGroup.h"
 
+#include "core/memcheck.h"
+
 UBDesktopPenPalette::UBDesktopPenPalette(QWidget *parent)
     : UBPropertyPalette(Qt::Horizontal, parent)
 {

src/desktop/UBDesktopToolsPalette.cpp

@@ -9,6 +9,7 @@
 #include "gui/UBMainWindow.h"
 #include "gui/UBToolbarButtonGroup.h"
 
+#include "core/memcheck.h"
 
 UBDesktopToolsPalette::UBDesktopToolsPalette(QWidget *parent)
     : UBActionPalette(Qt::Horizontal, parent)

src/desktop/UBWindowCaptureDelegate_win.cpp

@@ -1,6 +1,7 @@
 #include "UBWindowCaptureDelegate_win.h"
 #include <windows.h>
 
+#include "core/memcheck.h"
 
 UBWindowCaptureDelegate::UBWindowCaptureDelegate(QObject *parent)
     :QObject(parent)

src/desktop/UBWindowCapture_win.cpp

@@ -13,6 +13,8 @@
 
 #include "board/UBBoardView.h"
 
+#include "core/memcheck.h"
+
 UBWindowCapture::UBWindowCapture(UBDesktopAnnotationController *parent)
         : QObject(parent)
         , mParent(parent)

src/document/UBDocumentController.cpp

@@ -39,6 +39,7 @@
 #include "ui_documents.h"
 #include "ui_mainWindow.h"
 
+#include "core/memcheck.h"
 
 UBDocumentController::UBDocumentController(UBMainWindow* mainWindow)
    : QObject(mainWindow->centralWidget())

src/document/UBDocumentProxy.cpp

@@ -14,6 +14,7 @@
 #include "core/UBSettings.h"
 #include "core/UBDocumentManager.h"
 
+#include "core/memcheck.h"
 
 UBDocumentProxy::UBDocumentProxy()
     : mPageCount(0)

src/domain/UBAbstractWidget.cpp

@@ -24,6 +24,7 @@
 #include "web/UBWebKitUtils.h"
 #include "web/UBWebController.h"
 
+#include "core/memcheck.h"
 
 QStringList UBAbstractWidget::sInlineJavaScripts;
 bool UBAbstractWidget::sInlineJavaScriptLoaded = false;

src/domain/UBAppleWidget.cpp

@@ -16,6 +16,7 @@
 
 #include "network/UBNetworkAccessManager.h"
 
+#include "core/memcheck.h"
 
 UBAppleWidget::UBAppleWidget(const QUrl& pWidgetUrl, QWidget *parent)
     : UBAbstractWidget(pWidgetUrl, parent)

src/domain/UBDocumentUndoCommand.cpp

@@ -10,6 +10,7 @@
 #include "document/UBDocumentProxy.h"
 #include "UBGraphicsScene.h"
 
+#include "core/memcheck.h"
 
 UBDocumentUndoCommand::UBDocumentUndoCommand(UBDocumentProxy* pDocument, const QList<UBGraphicsScene*>& pOldScenes,
         const QList<UBGraphicsScene*>& pNewScenes, const int& pActiveSceneIndex)

src/domain/UBGraphicsAudioItem.cpp

@@ -2,6 +2,7 @@
 #include "UBGraphicsAudioItemDelegate.h"
 #include "UBGraphicsDelegateFrame.h"
 
+#include "core/memcheck.h"
 
 UBGraphicsAudioItem::UBGraphicsAudioItem(const QUrl& pAudioFileUrl, QGraphicsItem *parent):
         UBGraphicsMediaItem(pAudioFileUrl,parent)

src/domain/UBGraphicsAudioItemDelegate.cpp

@@ -3,6 +3,8 @@
 #include "domain/UBGraphicsDelegateFrame.h"
 #include "UBGraphicsScene.h"
 
+#include "core/memcheck.h"
+
 UBGraphicsAudioItemDelegate::UBGraphicsAudioItemDelegate ( UBGraphicsAudioItem* pDelegated, QObject *parent )
         : UBGraphicsItemDelegate ( pDelegated, parent )
         , mDelegated ( pDelegated )

src/domain/UBGraphicsDelegateFrame.cpp

@@ -19,6 +19,8 @@
 
 #include "gui/UBResources.h"
 
+#include "core/memcheck.h"
+
 qreal const UBGraphicsDelegateFrame::mAngleTolerance = 6;
 
 UBGraphicsDelegateFrame::UBGraphicsDelegateFrame(UBGraphicsItemDelegate* pDelegate, QRectF pRect, qreal pFrameWidth, bool respectRatio)

src/domain/UBGraphicsItemDelegate.cpp

@@ -35,6 +35,8 @@
 #include "frameworks/UBFileSystemUtils.h"
 #include "board/UBDrawingController.h"
 
+#include "core/memcheck.h"
+
 class UBGraphicsParaschoolEditorWidgetItem;
 
 UBGraphicsItemDelegate::UBGraphicsItemDelegate(QGraphicsItem* pDelegated, QObject * parent, bool respectRatio, bool canRotate)

src/domain/UBGraphicsItemTransformUndoCommand.cpp

@@ -8,6 +8,7 @@
 #include "UBGraphicsItemTransformUndoCommand.h"
 #include "UBResizableGraphicsItem.h"
 
+#include "core/memcheck.h"
 
 UBGraphicsItemTransformUndoCommand::UBGraphicsItemTransformUndoCommand(QGraphicsItem* pItem,
      const QPointF& prevPos, const QTransform& prevTransform, const qreal& prevZValue,

src/domain/UBGraphicsItemUndoCommand.cpp

@@ -11,6 +11,8 @@
 
 #include "UBGraphicsScene.h"
 
+#include "core/memcheck.h"
+
 
 UBGraphicsItemUndoCommand::UBGraphicsItemUndoCommand(UBGraphicsScene* pScene, const QSet<QGraphicsItem*>& pRemovedItems,
         const QSet<QGraphicsItem*>& pAddedItems)

src/domain/UBGraphicsMediaItem.cpp

@@ -8,6 +8,8 @@
 
 #include "board/UBBoardController.h"
 
+#include "core/memcheck.h"
+
 bool UBGraphicsMediaItem::sIsMutedByDefault = false;
 
 UBGraphicsMediaItem::UBGraphicsMediaItem(const QUrl& pMediaFileUrl, QGraphicsItem *parent)

src/domain/UBGraphicsPDFItem.cpp

@@ -7,6 +7,7 @@
 #include "UBGraphicsPixmapItem.h"
 #include "UBGraphicsItemDelegate.h"
 
+#include "core/memcheck.h"
 
 UBGraphicsPDFItem::UBGraphicsPDFItem(PDFRenderer *renderer, int pageNumber, QGraphicsItem* parent)
     : GraphicsPDFItem(renderer, pageNumber, parent)

src/domain/UBGraphicsPixmapItem.cpp

@@ -15,6 +15,8 @@
 
 #include "UBGraphicsItemDelegate.h"
 
+#include "core/memcheck.h"
+
 UBGraphicsPixmapItem::UBGraphicsPixmapItem(QGraphicsItem* parent/*, QString pSource*/)
     : QGraphicsPixmapItem(parent)
 {

src/domain/UBGraphicsPolygonItem.cpp

@@ -3,7 +3,10 @@
 
 #include "frameworks/UBGeometryUtils.h"
 #include "UBGraphicsScene.h"
+#include "domain/UBGraphicsPolygonItem.h"
+#include "domain/UBGraphicsStroke.h"
 
+#include "core/memcheck.h"
 
 UBGraphicsPolygonItem::UBGraphicsPolygonItem (QGraphicsItem * parent)
     : QGraphicsPolygonItem(parent)
@@ -39,7 +42,15 @@ UBGraphicsPolygonItem::UBGraphicsPolygonItem (const QLineF& pLine, qreal pWidth)
 
 UBGraphicsPolygonItem::~UBGraphicsPolygonItem()
 {
-    // NOOP
+	if (mStroke!=NULL)
+	{
+		QList<UBGraphicsPolygonItem*> pp = mStroke->polygons();
+		int n = pp.indexOf(this);
+		if (n>=0)
+			pp.removeAt(n);
+		if (pp.empty())
+			delete mStroke;
+	}
 }
 
 

src/domain/UBGraphicsProxyWidget.cpp

@@ -14,6 +14,7 @@
 
 #include "UBGraphicsDelegateFrame.h"
 
+#include "core/memcheck.h"
 
 UBGraphicsProxyWidget::UBGraphicsProxyWidget(QGraphicsItem* parent)
     : QGraphicsProxyWidget(parent, Qt::FramelessWindowHint)

src/domain/UBGraphicsScene.cpp

@@ -24,6 +24,7 @@
 #include "tools/UBGraphicsRuler.h"
 #include "tools/UBGraphicsProtractor.h"
 #include "tools/UBGraphicsCompass.h"
+#include "tools/UBGraphicsTriangle.h"
 #include "tools/UBGraphicsCurtainItem.h"
 
 #include "document/UBDocumentProxy.h"
@@ -47,6 +48,8 @@
 #include "UBW3CWidget.h"
 #include "UBGraphicsStroke.h"
 
+#include "core/memcheck.h"
+
 qreal UBGraphicsScene::backgroundLayerStart = -20000000.0;
 qreal UBGraphicsScene::objectLayerStart = -10000000.0;
 qreal UBGraphicsScene::drawingLayerStart = 0.0;
@@ -123,6 +126,7 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
 
 UBGraphicsScene::~UBGraphicsScene()
 {
+	int a = 13;
     // NOOP
 }
 
@@ -1406,6 +1410,25 @@ void UBGraphicsScene::addProtractor(QPointF center)
     setModified(true);
 }
 
+void UBGraphicsScene::addTriangle(QPointF center)
+{
+    // Protractor
+/*
+    UBGraphicsTriangle* protractor = new UBGraphicsTriangle(); // mem : owned and destroyed by the scene
+    mTools << triangle;
+
+    triangle->setZValue(toolLayerStart + toolOffsetProtractor);
+    triangle->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Tool));
+
+    addItem(triangle);
+
+    QPointF itemSceneCenter = triangle->sceneBoundingRect().center();
+    triangle->moveBy(center.x() - itemSceneCenter.x(), center.y() - itemSceneCenter.y());
+
+    triangle->setVisible(true);
+    setModified(true);*/
+}
+
 
 void UBGraphicsScene::addCompass(QPointF center)
 {

src/domain/UBGraphicsScene.h

@@ -156,8 +156,10 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem
         qreal getNextObjectZIndex();
 
         void addRuler(QPointF center);
+		void addTriangle(QPointF center);
         void addProtractor(QPointF center);
         void addCompass(QPointF center);
+
         void addMask();
 
         class SceneViewState

src/domain/UBGraphicsStroke.cpp

@@ -9,6 +9,7 @@
 
 #include "UBGraphicsPolygonItem.h"
 
+#include "core/memcheck.h"
 
 UBGraphicsStroke::UBGraphicsStroke()
 {

src/domain/UBGraphicsSvgItem.cpp

@@ -13,6 +13,7 @@
 #include "UBGraphicsItemDelegate.h"
 #include "UBGraphicsPixmapItem.h"
 
+#include "core/memcheck.h"
 
 UBGraphicsSvgItem::UBGraphicsSvgItem(const QString& pFilePath, QGraphicsItem* parent)
     : QGraphicsSvgItem(pFilePath, parent)

src/domain/UBGraphicsTextItem.cpp

@@ -16,6 +16,7 @@
 #include "board/UBBoardView.h"
 #include "core/UBSettings.h"
 
+#include "core/memcheck.h"
 
 QColor UBGraphicsTextItem::lastUsedTextColor;
 

src/domain/UBGraphicsTextItemDelegate.cpp

@@ -18,6 +18,7 @@
 #include "core/UBApplicationController.h" // TODO UB 4.x clean that dependency
 #include "core/UBDisplayManager.h" // TODO UB 4.x clean that dependency
 
+#include "core/memcheck.h"
 
 const int UBGraphicsTextItemDelegate::sMinPixelSize = 8;
 

src/domain/UBGraphicsTextItemUndoCommand.cpp

@@ -8,6 +8,7 @@
 #include "UBGraphicsTextItemUndoCommand.h"
 #include "UBGraphicsTextItem.h"
 
+#include "core/memcheck.h"
 
 UBGraphicsTextItemUndoCommand::UBGraphicsTextItemUndoCommand(UBGraphicsTextItem *textItem)
     : mTextItem(textItem)

src/domain/UBGraphicsVideoItem.cpp

@@ -2,6 +2,7 @@
 #include "UBGraphicsVideoItemDelegate.h"
 #include "UBGraphicsDelegateFrame.h"
 
+#include "core/memcheck.h"
 
 UBGraphicsVideoItem::UBGraphicsVideoItem(const QUrl& pVideoFileUrl, QGraphicsItem *parent):
         UBGraphicsMediaItem(pVideoFileUrl,parent)

src/domain/UBGraphicsVideoItemDelegate.cpp

@@ -21,7 +21,7 @@
 #include "domain/UBGraphicsVideoItem.h"
 #include "domain/UBGraphicsDelegateFrame.h"
 
-
+#include "core/memcheck.h"
 
 UBGraphicsVideoItemDelegate::UBGraphicsVideoItemDelegate(UBGraphicsVideoItem* pDelegated, Phonon::MediaObject* pMedia, QObject * parent)
     : UBGraphicsItemDelegate(pDelegated, parent, true, false)

src/domain/UBGraphicsWidgetItem.cpp

@@ -11,6 +11,8 @@
 #include "UBGraphicsScene.h"
 #include "UBAppleWidget.h"
 
+#include "core/memcheck.h"
+
 UBGraphicsWidgetItem::UBGraphicsWidgetItem(QGraphicsItem *parent, int widgetType)
     : UBGraphicsProxyWidget(parent)
     , mWebKitWidget(0)

src/domain/UBGraphicsWidgetItemDelegate.cpp

@@ -22,6 +22,7 @@
 #include "domain/UBGraphicsWidgetItem.h"
 #include "domain/UBGraphicsDelegateFrame.h"
 
+#include "core/memcheck.h"
 
 UBGraphicsWidgetItemDelegate::UBGraphicsWidgetItemDelegate(UBGraphicsWidgetItem* pDelegated, int widgetType)
     : UBGraphicsItemDelegate(pDelegated, 0, true, false)

src/domain/UBItem.cpp

@@ -1,5 +1,7 @@
 #include "UBItem.h"
 
+#include "core/memcheck.h"
+
 UBItem::UBItem()
     : mUuid(QUuid::createUuid())
     , mRenderingQuality(UBItem::RenderingQualityNormal)

src/domain/UBPageSizeUndoCommand.cpp

@@ -13,6 +13,7 @@
 #include "board/UBBoardController.h"
 #include "UBGraphicsScene.h"
 
+#include "core/memcheck.h"
 
 UBPageSizeUndoCommand::UBPageSizeUndoCommand(UBGraphicsScene* pScene, const QSize& previousSize, const QSize& newSize)
     : mScene(pScene)

src/domain/UBResizableGraphicsItem.cpp

@@ -7,6 +7,8 @@
 
 #include "UBResizableGraphicsItem.h"
 
+#include "core/memcheck.h"
+
 UBResizableGraphicsItem::UBResizableGraphicsItem()
 {
     // NOOP

src/domain/UBW3CWidget.cpp

@@ -21,6 +21,8 @@
 
 #include "board/UBBoardController.h"
 
+#include "core/memcheck.h"
+
 bool UBW3CWidget::sTemplateLoaded = false;
 QMap<QString, QString> UBW3CWidget::sNPAPIWrapperTemplates;
 QString UBW3CWidget::sNPAPIWrappperConfigTemplate;

src/frameworks/UBBase32.cpp

@@ -7,6 +7,8 @@
 
 #include "UBBase32.h"
 
+#include "core/memcheck.h"
+
 QString UBBase32::sBase32Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
 
 int UBBase32::sBase32Lookup[] =

src/frameworks/UBCoreGraphicsScene.cpp

@@ -7,9 +7,12 @@
 
 #include "UBCoreGraphicsScene.h"
 
+#include "core/memcheck.h"
+
 UBCoreGraphicsScene::UBCoreGraphicsScene(QObject * parent)
     : QGraphicsScene ( parent  )
 {
+	int a = 13;
     //NOOP
 }
 
@@ -18,7 +21,7 @@ UBCoreGraphicsScene::~UBCoreGraphicsScene()
     //we must delete removed items that are no more in any scene
     foreach (const QGraphicsItem* item, mItemsToDelete)
     {
-        if (!item->scene() && !(item->scene() == this))
+        if (item->scene()==NULL || item->scene() == this)
         {
             delete item;
         }

src/frameworks/UBCryptoUtils.cpp

@@ -9,6 +9,8 @@
 
 #include <openssl/aes.h>
 
+#include "core/memcheck.h"
+
 UBCryptoUtils* UBCryptoUtils::sInstance(0);
 QString UBCryptoUtils::sAESKey("9ecHaspud9uD9ste5erAchehefrup3echej-caje6&thestawacuk=h#F3jet3aF");
 QString UBCryptoUtils::sAESSalt("6f0083e0-a90c-11de-ac21-0002a5d5c51b");

src/frameworks/UBDesktopServices_win.cpp

@@ -1,5 +1,6 @@
 
 #include "UBDesktopServices.h"
+#include "core/memcheck.h"
 
 QString UBDesktopServices::storageLocation(StandardLocation type)
 {

src/frameworks/UBFileSystemUtils.cpp

@@ -14,6 +14,8 @@
 
 #include <openssl/md5.h>
 
+#include "core/memcheck.h"
+
 QStringList UBFileSystemUtils::sTempDirToCleanUp;
 
 

src/frameworks/UBGeometryUtils.cpp

@@ -7,6 +7,8 @@
 
 #include "UBGeometryUtils.h"
 
+#include "core/memcheck.h"
+
 const double PI = 4.0 * atan(1.0);
 
 UBGeometryUtils::UBGeometryUtils()

src/frameworks/UBPlatformUtils.cpp

@@ -1,10 +1,11 @@
 
 #include "UBPlatformUtils.h"
 
+#include "core/memcheck.h"
 
 void UBPlatformUtils::destroy()
 {
-	initializeKeyboardLayouts();
+	destroyKeyboardLayouts();
 }
 
 UBPlatformUtils::UBPlatformUtils()