From 1a2d5d499ec40c451d71bd2d801ed18e9f0bef99 Mon Sep 17 00:00:00 2001
From: Claudio Valerio <claudio@sente.ch>
Date: Thu, 19 May 2011 16:50:12 +0200
Subject: [PATCH] Removed ThirdParty directory. Moved in a different repository

---
 Sankore_3.1.pro                     | 27 ++++++++++++++-------------
 release.vc9.bat                     |  5 ++---
 src/board/UBBoardPaletteManager.cpp |  3 +--
 src/gui/UBLibraryWidget.cpp         |  2 +-
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro
index 44e8b698..dbc670d3 100644
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@@ -1,6 +1,8 @@
 TARGET = "Sankore 3.1"
 TEMPLATE = app
 
+THIRD_PARTY_PATH=../Sankore-ThirdParty
+
 CONFIG += debug_and_release \
    no_include_pwd
 
@@ -30,7 +32,7 @@ QT += xmlpatterns
 
 INCLUDEPATH += src
 
-include(thirdparty/libs.pri)
+include($$THIRD_PARTY_PATH/libs.pri)
 include(src/adaptors/adaptors.pri)
 include(src/api/api.pri)
 include(src/board/board.pri)
@@ -52,12 +54,12 @@ include(src/transition/transition.pri)
 DEPENDPATH += src/pdf-merger
 INCLUDEPATH += src/pdf-merger
 include(src/pdf-merger/pdfMerger.pri)
-DEPENDPATH += thirdparty/quazip/
-INCLUDEPATH += thirdparty/quazip/
-include(thirdparty/quazip/quazip.pri)
-DEPENDPATH += thirdparty/trolltech/singleapplication
-INCLUDEPATH += thirdparty/trolltech/singleapplication
-include(thirdparty/trolltech/singleapplication/qtsingleapplication.pri)
+DEPENDPATH += $$THIRD_PARTY_PATH/quazip/
+INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
+include($$THIRD_PARTY_PATH/quazip/quazip.pri)
+DEPENDPATH += $$THIRD_PARTY_PATH/trolltech/singleapplication
+INCLUDEPATH += $$THIRD_PARTY_PATH/trolltech/singleapplication
+include($$THIRD_PARTY_PATH/trolltech/singleapplication/qtsingleapplication.pri)
 
 FORMS += resources/forms/mainWindow.ui \
    resources/forms/preferences.ui \
@@ -109,7 +111,6 @@ win32 {
    QMAKE_CXXFLAGS_RELEASE += /Od \
        /Zi
    QMAKE_LFLAGS_RELEASE += /DEBUG
-   INCLUDEPATH += thirdparty/microsoft
    UB_LIBRARY.path = $$DESTDIR
    UB_I18N.path = $$DESTDIR/i18n
    UB_ETC.path = $$DESTDIR
@@ -138,10 +139,10 @@ macx {
    VERSION_RC_PATH = "$$BUILD_DIR/version_rc"
 
    # Embed version into executable for breakpad
-#   QMAKE_LFLAGS += -sectcreate \
-#       __DATA \
-#       __version \
-#       $$VERSION_RC_PATH
+   QMAKE_LFLAGS += -sectcreate \
+       __DATA \
+       __version \
+       $$VERSION_RC_PATH
 
    QMAKE_CXXFLAGS_RELEASE += -gdwarf-2 \
        -mdynamic-no-pic
@@ -160,7 +161,7 @@ macx {
    UB_LIBRARY.path = "$$RESOURCES_DIR"
    UB_FONTS.files = "resources/fonts"
    UB_FONTS.path = "$$RESOURCES_DIR"
-   UB_THIRDPARTY_INTERACTIVE.files = $$files(thirdparty/interactive/*)
+   UB_THIRDPARTY_INTERACTIVE.files = $$files($$THIRD_PARTY_PATH/interactive/*)
    UB_THIRDPARTY_INTERACTIVE.path = "$$RESOURCES_DIR/library/interactive"
    UB_MACX_ICNS.files = $$files(resources/macx/*.icns)
    UB_MACX_ICNS.path = "$$RESOURCES_DIR"
diff --git a/release.vc9.bat b/release.vc9.bat
index 87dfeb7b..40079e45 100644
--- a/release.vc9.bat
+++ b/release.vc9.bat
@@ -5,10 +5,9 @@ set VS_BIN="C:\Program Files\Microsoft Visual Studio 9.0\VC\bin"
 set WIN_SDK_BIN="C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin"
 set INNO_EXE="C:\Program Files\Inno Setup 5\iscc.exe "
 set BUILD_DIR=build\win32\release
-set SVN_BIN="C:\Program Files\Subversion\bin"
 set UB_DATA_DIR="D:\"
 
-set PATH=%QT_BIN%;%PATH%;%WIN_SDK_BIN%;%SVN_BIN%
+set PATH=%QT_BIN%;%PATH%;%WIN_SDK_BIN%
 
 call %VS_BIN%\vcvars32.bat
 
@@ -31,7 +30,7 @@ erase tmp
 echo %VERSION%
 echo %LAST_TAG_VERSION%
 
-if not %VERSION%==%LAST_TAG_VERSION% GOTO EXIT_WITH_ERROR
+if not v%VERSION%==%LAST_TAG_VERSION% GOTO EXIT_WITH_ERROR
 
 
 nmake release-install
diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp
index 2c20151b..a0aad2ca 100644
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@@ -647,8 +647,7 @@ void UBBoardPaletteManager::changeStylusPaletteOrientation(QVariant var)
     bool bVertical = var.toBool();
     bool bVisible = mStylusPalette->isVisible();
 
-    UBStylusPalette* mOldPalette;
-    // Clean the old palette
+	// Clean the old palette
     if(NULL != mStylusPalette)
     {
         // TODO : check why this line creates a crash in the application.
diff --git a/src/gui/UBLibraryWidget.cpp b/src/gui/UBLibraryWidget.cpp
index fd5da1e2..ba60fc1a 100644
--- a/src/gui/UBLibraryWidget.cpp
+++ b/src/gui/UBLibraryWidget.cpp
@@ -285,7 +285,7 @@ void UBLibraryWidget::dragMoveEvent(QDragMoveEvent *event)
 
 void UBLibraryWidget::onDropMe(const QMimeData *_data)
 {
-
+	Q_UNUSED(_data);
 }
 
 /**