From 9172b19ad3cff009f6f65fcbfdca647dd077a8d7 Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Thu, 1 Jan 2015 22:12:11 +0100
Subject: [PATCH] Removed static plugin initialization code, because MUtilities
 library does that now + updated Changelog file.

---
 LameXP_VS2013.vcxproj |  4 ++--
 doc/Changelog.html    |  1 +
 doc/Manual.html       |  2 +-
 etc/NSIS/setup.nsi    |  1 -
 src/Config.h          |  4 ++--
 src/Global_Zero.cpp   | 11 -----------
 6 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/LameXP_VS2013.vcxproj b/LameXP_VS2013.vcxproj
index 7e5fdd1e..ab9adc11 100644
--- a/LameXP_VS2013.vcxproj
+++ b/LameXP_VS2013.vcxproj
@@ -170,7 +170,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\VisualLeakDetector\bin\Win32\*.manifest
       </MapFileName>
       <CreateHotPatchableImage>
       </CreateHotPatchableImage>
-      <AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins\imageformats;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32;$(SolutionDir)\etc\Prerequisites\keccak\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins\imageformats;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
       <GenerateDebugInformation>false</GenerateDebugInformation>
     </Link>
@@ -230,7 +230,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\VisualLeakDetector\bin\Win32\*.manifest
       <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>QtCore.lib;QtGui.lib;QtSvg.lib;qtmain.lib;qsvg.lib;qico.lib;qtga.lib;Winmm.lib;imm32.lib;ws2_32.lib;Shlwapi.lib;Sensapi.lib;PowrProf.lib;psapi.lib;EncodePointer.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>LinkVerboseLib</ShowProgress>
-      <AdditionalLibraryDirectories>$(SolutionDir)\etc\Prerequisites\qt4_static\lib;$(SolutionDir)\etc\Prerequisites\qt4_static\plugins\imageformats;$(SolutionDir)\etc\Prerequisites\EncodePointer\lib;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\lib\Win32;$(SolutionDir)\etc\Prerequisites\keccak\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)\..\Prerequisites\Qt4\MSVC-2013\Static\lib;$(SolutionDir)\..\Prerequisites\Qt4\MSVC-2013\Static\plugins\imageformats;$(SolutionDir)\..\Prerequisites\EncodePointer\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <AssemblyDebug>
diff --git a/doc/Changelog.html b/doc/Changelog.html
index ecb6828e..01be12ba 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -19,6 +19,7 @@ a:visited { color: #0000EE; }
 
 <a name="4.11"></a>Changes between v4.10 and v4.11 [<font color="darkred">unreleased</font>]:<br><ul>
 <li>Upgraded build environment to Microsoft Visual Studio 2013 with Update-4
+<li>Starting with this version, LameXP is based on the <a href="http://sourceforge.net/p/mutilities/code/" target="_blank">MUtilities</a> library <b>+</b> massive code clean-up
 <li>Updated MediaInfo to v0.7.71 (2014-11-09), compiled with ICL 15.0 and MSVC 12.0
 <li>Updated SoX to v14.4.2-Git (2012-10-06), compiled with ICL 15.0 and MSVC 12.0
 <li>Updated Opus libraries to v1.1.x and Opus-Tools v0.1.9 to latest Git Master (2014-10-04)
diff --git a/doc/Manual.html b/doc/Manual.html
index 470d07d7..2c5fd961 100644
--- a/doc/Manual.html
+++ b/doc/Manual.html
@@ -167,7 +167,7 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'&lt;MuldeR2@GMX.de&gt;'+'<
 <h2 id="license-terms"><span class="header-section-number">2.2</span> License Terms</h2>
 <p>LameXP is <a href="http://en.wikipedia.org/wiki/Free_software_movement"><em>free software</em></a>, released under the terms of the <a href="http://www.gnu.org/licenses/gpl-2.0.html"><em>GNU General Public License</em> (GPL), version 2</a>. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. In contrast, the GPL is designed to guarantee your freedom to share and change all versions of the software. In other words, the GPL ensures that free software will remain free for all of its users. LameXP adds some additional terms in order to keep your computer safe from unwanted software. See the <em>GNU General Public License</em> for more details!</p>
 <pre><code>LameXP - Audio Encoder Front-End
-Copyright (C) 2004-2014 LoRd_MuldeR &lt;MuldeR2@GMX.de&gt;
+Copyright (C) 2004-2015 LoRd_MuldeR &lt;MuldeR2@GMX.de&gt;
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index 9c46ef2a..a5061359 100644
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@@ -507,7 +507,6 @@ Section "-Create Shortcuts"
 		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_LICENSE).lnk"   "$INSTDIR\License.txt"
 		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_CHANGELOG).lnk" "$INSTDIR\Changelog.html"
 		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_TRANSLATE).lnk" "$INSTDIR\Translate.html"
-		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_FAQ).lnk"       "$INSTDIR\FAQ.html"
 		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_MANUAL).lnk"    "$INSTDIR\Manual.html"
 		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_UNINSTALL).lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
 		
diff --git a/src/Config.h b/src/Config.h
index d1b5c402..c0eee018 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -34,8 +34,8 @@
 #define VER_LAMEXP_MINOR_HI					1
 #define VER_LAMEXP_MINOR_LO					1
 #define VER_LAMEXP_TYPE						Beta
-#define VER_LAMEXP_PATCH					12
-#define VER_LAMEXP_BUILD					1660
+#define VER_LAMEXP_PATCH					13
+#define VER_LAMEXP_BUILD					1664
 #define VER_LAMEXP_CONFG					1558
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Global_Zero.cpp b/src/Global_Zero.cpp
index 12e26041..44f2afcf 100644
--- a/src/Global_Zero.cpp
+++ b/src/Global_Zero.cpp
@@ -28,17 +28,6 @@
 //Qt
 #include <QtGlobal>
 
-//Initialize static Qt plugins
-#ifdef QT_NODLL
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-Q_IMPORT_PLUGIN(qico)
-Q_IMPORT_PLUGIN(qsvg)
-#else
-Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
-Q_IMPORT_PLUGIN(QICOPlugin)
-#endif
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 // GLOBAL FUNCTIONS
 ///////////////////////////////////////////////////////////////////////////////