Clean up #include directives: Don't include 'Windows.h' directly, as it's included from 'Global.h' header file.

src/Config.h

@@ -25,8 +25,8 @@
 #define VER_LAMEXP_MAJOR				4
 #define VER_LAMEXP_MINOR_HI				0
 #define VER_LAMEXP_MINOR_LO				2
-#define VER_LAMEXP_BUILD				432
-#define VER_LAMEXP_SUFFIX				Alpha-1
+#define VER_LAMEXP_BUILD				436
+#define VER_LAMEXP_SUFFIX				Alpha-2
 
 /*
  * Tools versions

src/Dialog_About.cpp

@@ -25,7 +25,6 @@
 #include "Resource.h"
 #include "Model_Settings.h"
 
-//Qt includes
 #include <QDate>
 #include <QApplication>
 #include <QIcon>
@@ -36,8 +35,7 @@
 #include <QFileInfo>
 #include <QDir>
 
-//Win32 includes
-#include <Windows.h>
+#include <MMSystem.h>
 
 //Helper macros
 #define LINK(URL) QString("<a href=\"%1\">%2</a>").arg(URL).arg(URL)
@@ -95,7 +93,12 @@ AboutDialog::AboutDialog(SettingsModel *settings, QWidget *parent, bool firstSta
 	aboutText += QString("<b>%1</b><br><br>").arg(versionStr);
 	aboutText += QString("<nobr>%1</nobr><br>").arg(tr("Please visit %1 for news and updates!").arg(LINK(lamexp_website_url())));
 	
-	if(lamexp_version_demo())
+	if(LAMEXP_DEBUG)
+	{
+		int daysLeft = max(QDate::currentDate().daysTo(lamexp_version_expires()), 0);
+		aboutText += QString("<hr><nobr><font color=\"crimson\">!!! %3 DEBUG BUILD %3 Expires at: %1 %3 Days left: %2 %3 DEBUG BUILD %3 !!!</font></nobr>").arg(lamexp_version_expires().toString(Qt::ISODate), QString::number(daysLeft), "&minus;&minus;&minus;");
+	}
+	else if(lamexp_version_demo())
 	{
 		int daysLeft = max(QDate::currentDate().daysTo(lamexp_version_expires()), 0);
 		aboutText += QString("<hr><nobr><font color=\"crimson\">%1</font></nobr>").arg(tr("Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left.").arg(lamexp_version_expires().toString(Qt::ISODate), QString::number(daysLeft)));

src/Dialog_DropBox.cpp

@@ -30,7 +30,6 @@
 #include <QDesktopWidget>
 #include <QToolTip>
 #include <QTimer>
-#include <Windows.h>
 
 #define EPS (1.0E-5)
 #define SET_FONT_BOLD(WIDGET,BOLD) { QFont _font = WIDGET.font(); _font.setBold(BOLD); WIDGET.setFont(_font); }

src/Dialog_LogView.cpp

@@ -21,9 +21,10 @@
 
 #include "Dialog_LogView.h"
 
+#include "Global.h"
+
 #include <QClipboard>
 #include <QFileDialog>
-#include <Windows.h>
 
 LogViewDialog::LogViewDialog(QWidget *parent)
 :

src/Dialog_Processing.cpp

@@ -56,7 +56,7 @@
 #include <QProcess>
 #include <QProgressDialog>
 
-#include <Windows.h>
+#include <MMSystem.h>
 
 ////////////////////////////////////////////////////////////
 

src/Dialog_SplashScreen.cpp

@@ -26,7 +26,6 @@
 #include <QThread>
 #include <QMovie>
 #include <QKeyEvent>
-#include <Windows.h>
 
 #define EPS (1.0E-5)
 

src/Dialog_Update.cpp

@@ -38,8 +38,8 @@
 #include <QCloseEvent>
 #include <QMovie>
 
-#include <Windows.h>
 #include <time.h>
+#include <MMSystem.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 

src/Dialog_WorkingBanner.cpp

@@ -28,7 +28,6 @@
 #include <QMovie>
 #include <QKeyEvent>
 #include <QFontMetrics>
-#include <Windows.h>
 
 #define EPS (1.0E-5)
 

src/Encoder_Abstract.cpp

@@ -22,7 +22,6 @@
 #include "Encoder_Abstract.h"
 
 #include "Global.h"
-#include <Windows.h>
 
 AbstractEncoder::AbstractEncoder(void)
 {

src/Global.cpp

@@ -46,24 +46,16 @@
 #include "Resource.h"
 #include "LockedFile.h"
 
-//Windows includes
-#include <Windows.h>
-
 //CRT includes
-#include <stdio.h>
 #include <io.h>
 #include <fcntl.h>
 #include <intrin.h>
 
+//COM includes
+#include <Objbase.h>
+
 //Debug only includes
 #ifdef _DEBUG
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif
-#if(_WIN32_WINNT < 0x0501)
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif
 #include <Psapi.h>
 #endif //_DEBUG
 

src/Global.h

@@ -21,14 +21,15 @@
 
 #pragma once
 
-//MSVC
+//Target version
 #include "Targetver.h"
 
-//Stdlib
+//inlcude C standard library
 #include <stdio.h>
 #include <tchar.h>
 
-//Win32
+//Windows includes
+#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
 //Declarations

src/ShellIntegration.cpp

@@ -29,7 +29,6 @@
 #include <QDir>
 #include <QMutexLocker>
 
-#include <Windows.h>
 #include <Shlobj.h>
 #include <Shlwapi.h>
 

src/Targetver.h

@@ -26,9 +26,16 @@
 // your application.  The macros work by enabling all features available on platform versions up to and 
 // including the version specified.
 
+// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
+// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+
+#include <WinSDKVer.h>
+
 // Modify the following defines if you have to target a platform prior to the ones specified below.
 // Refer to MSDN for the latest info on corresponding values for different platforms.
 
 #ifndef _WIN32_WINNT            // Specifies that the minimum required platform is Windows 2000.
-#define _WIN32_WINNT 0x0500     // Change this to the appropriate value to target other versions of Windows.
+#define _WIN32_WINNT 0x0501     // Change this to the appropriate value to target other versions of Windows.
 #endif
+
+#include <SDKDDKVer.h>

src/Thread_DiskObserver.cpp

@@ -24,7 +24,6 @@
 #include "Global.h"
 
 #include <QDir>
-#include <Windows.h>
 
 #define MIN_DISKSPACE 104857600LL //100 MB
 

src/Thread_Initialization.cpp

@@ -32,8 +32,6 @@
 #include <QResource>
 #include <QTime>
 
-#include <Windows.h>
-
 ////////////////////////////////////////////////////////////
 // TOOLS
 ////////////////////////////////////////////////////////////

src/Tool_Abstract.cpp

@@ -21,11 +21,12 @@
 
 #include "Tool_Abstract.h"
 
+#include "Global.h"
+
 #include <QProcess>
 #include <QMutex>
 #include <QMutexLocker>
 #include <QLibrary>
-#include <Windows.h>
 
 /*
  * Win32 API definitions