From 15992c2dc331964f208da0481a3202f22f890653 Mon Sep 17 00:00:00 2001 From: spx Date: Tue, 21 Sep 2010 22:47:53 +0000 Subject: [PATCH] Cosmetic changes. --- Library/AboutDialog.cpp | 3 --- Library/ConfigParser.cpp | 1 - Library/Error.cpp | 1 - Library/Group.cpp | 2 -- Library/Litestep.cpp | 4 ---- Library/Measure.cpp | 1 - Library/MeasureCalc.cpp | 4 +--- Library/MeasureTime.cpp | 5 +---- Library/MeasureUptime.cpp | 1 - Library/MeterImage.cpp | 1 - Library/MeterLine.cpp | 2 -- Library/MeterRoundLine.cpp | 3 --- Library/MeterString.h | 1 + Library/MeterWindow.cpp | 6 ------ Library/Rainmeter.cpp | 8 -------- Library/Rainmeter.h | 6 +++--- Library/StdAfx.h | 6 ++++++ Library/TrayWindow.cpp | 2 -- Library/UpdateCheck.cpp | 4 ---- 19 files changed, 12 insertions(+), 49 deletions(-) diff --git a/Library/AboutDialog.cpp b/Library/AboutDialog.cpp index c7a25332..8c4348c2 100644 --- a/Library/AboutDialog.cpp +++ b/Library/AboutDialog.cpp @@ -24,9 +24,6 @@ #include "resource.h" #include "AboutDialog.h" #include "../revision-number.h" -#include -#include -#include #define LOGTIMER 1 diff --git a/Library/ConfigParser.cpp b/Library/ConfigParser.cpp index 7f92a5e4..3d64f1cb 100644 --- a/Library/ConfigParser.cpp +++ b/Library/ConfigParser.cpp @@ -21,7 +21,6 @@ #include "Litestep.h" #include "Rainmeter.h" #include "System.h" -#include extern CRainmeter* Rainmeter; diff --git a/Library/Error.cpp b/Library/Error.cpp index 49c51c22..9e25e1aa 100644 --- a/Library/Error.cpp +++ b/Library/Error.cpp @@ -18,7 +18,6 @@ #include "StdAfx.h" #include "Error.h" -#include const WCHAR* CError::c_ErrorStrings[] = { diff --git a/Library/Group.cpp b/Library/Group.cpp index 3dc1d599..f1ad136b 100644 --- a/Library/Group.cpp +++ b/Library/Group.cpp @@ -19,8 +19,6 @@ #include "StdAfx.h" #include "Group.h" #include "ConfigParser.h" -#include -#include /* ** CGroup diff --git a/Library/Litestep.cpp b/Library/Litestep.cpp index 8f0b4ad9..da081b13 100644 --- a/Library/Litestep.cpp +++ b/Library/Litestep.cpp @@ -21,10 +21,6 @@ #include "Error.h" #include "Rainmeter.h" #include "System.h" -#include -#include -#include -#include extern CRainmeter* Rainmeter; diff --git a/Library/Measure.cpp b/Library/Measure.cpp index 885fcd53..15510f41 100644 --- a/Library/Measure.cpp +++ b/Library/Measure.cpp @@ -36,7 +36,6 @@ #include "Rainmeter.h" #include "Error.h" #include "Litestep.h" -#include const int MEDIAN_SIZE = 7; diff --git a/Library/MeasureCalc.cpp b/Library/MeasureCalc.cpp index c182dbcb..93baa1f3 100644 --- a/Library/MeasureCalc.cpp +++ b/Library/MeasureCalc.cpp @@ -19,9 +19,7 @@ #include "StdAfx.h" #include "MeasureCalc.h" #include "Rainmeter.h" -#include -#include -#include + using namespace std; hqStrMap* CMeasureCalc::c_VarMap = NULL; diff --git a/Library/MeasureTime.cpp b/Library/MeasureTime.cpp index 07143c2f..452ddce0 100644 --- a/Library/MeasureTime.cpp +++ b/Library/MeasureTime.cpp @@ -21,9 +21,6 @@ #include "StdAfx.h" #include "MeasureTime.h" #include "Rainmeter.h" -#include -#include -#include void MeasureTime_CRTInvalidParameterHandler(const wchar_t* expression, const wchar_t* function, const wchar_t* file, unsigned int line, uintptr_t pReserved) { @@ -62,7 +59,7 @@ CMeasureTime::CMeasureTime(CMeterWindow* meterWindow) : CMeasure(meterWindow) * the operating system is queried to obtain the default value * for the variable. */ - tzset(); + _tzset(); m_DeltaTime.QuadPart = 0; m_Time.QuadPart = 0; diff --git a/Library/MeasureUptime.cpp b/Library/MeasureUptime.cpp index 0cfe7f54..c4d8848a 100644 --- a/Library/MeasureUptime.cpp +++ b/Library/MeasureUptime.cpp @@ -19,7 +19,6 @@ #include "StdAfx.h" #include "MeasureUptime.h" #include "Rainmeter.h" -#include /* ** CMeasureUptime diff --git a/Library/MeterImage.cpp b/Library/MeterImage.cpp index bd29e3d7..3b0f102f 100644 --- a/Library/MeterImage.cpp +++ b/Library/MeterImage.cpp @@ -21,7 +21,6 @@ #include "Measure.h" #include "Error.h" #include "Rainmeter.h" -#include extern CRainmeter* Rainmeter; diff --git a/Library/MeterLine.cpp b/Library/MeterLine.cpp index 2467b61f..d3f4e03f 100644 --- a/Library/MeterLine.cpp +++ b/Library/MeterLine.cpp @@ -20,8 +20,6 @@ #include "MeterLine.h" #include "Measure.h" #include "Error.h" -#include -#include using namespace Gdiplus; diff --git a/Library/MeterRoundLine.cpp b/Library/MeterRoundLine.cpp index c089b670..91701f69 100644 --- a/Library/MeterRoundLine.cpp +++ b/Library/MeterRoundLine.cpp @@ -20,9 +20,6 @@ #include "MeterRoundLine.h" #include "Measure.h" #include "Error.h" -#include -#include -#include using namespace Gdiplus; #define PI 3.14159265 diff --git a/Library/MeterString.h b/Library/MeterString.h index 0f60a2b6..4db07dfe 100644 --- a/Library/MeterString.h +++ b/Library/MeterString.h @@ -21,6 +21,7 @@ #include "Meter.h" #include "MeterWindow.h" + namespace Gdiplus { class Font; diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp index 16ddac22..349a01b9 100644 --- a/Library/MeterWindow.cpp +++ b/Library/MeterWindow.cpp @@ -17,21 +17,15 @@ */ #include "StdAfx.h" -#include -#include #include "MeterWindow.h" #include "Rainmeter.h" #include "System.h" #include "Error.h" -#include -#include #include "Meter.h" #include "Measure.h" #include "AboutDialog.h" #include "resource.h" #include "Litestep.h" -#include -#include #include "MeasureCalc.h" #include "MeasureNet.h" #include "MeasurePlugin.h" diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp index e7af6f94..a2a03aa5 100644 --- a/Library/Rainmeter.cpp +++ b/Library/Rainmeter.cpp @@ -25,14 +25,6 @@ #include "MeterString.h" #include "Resource.h" #include "UpdateCheck.h" -#include -#include -#include -#include -#include -#include -#include -#include using namespace Gdiplus; diff --git a/Library/Rainmeter.h b/Library/Rainmeter.h index 76649968..d179160e 100644 --- a/Library/Rainmeter.h +++ b/Library/Rainmeter.h @@ -20,12 +20,12 @@ #define __RAINMETER_H__ #include -#include "Litestep.h" -#include "MeterWindow.h" -#include "TrayWindow.h" #include #include #include +#include "Litestep.h" +#include "MeterWindow.h" +#include "TrayWindow.h" #define MAX_LINE_LENGTH 4096 diff --git a/Library/StdAfx.h b/Library/StdAfx.h index 1b59ddcc..bda2ece6 100644 --- a/Library/StdAfx.h +++ b/Library/StdAfx.h @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -49,19 +50,24 @@ #include #include #include +#include #include #include #include +#include #include #include #include // RUNTIME #include +#include #include #include #include #include #include +#include +#include #endif diff --git a/Library/TrayWindow.cpp b/Library/TrayWindow.cpp index fe1fdfc4..783894ee 100644 --- a/Library/TrayWindow.cpp +++ b/Library/TrayWindow.cpp @@ -25,8 +25,6 @@ #include "Error.h" #include "RainmeterQuery.h" #include "../revision-number.h" -#include -#include #define TRAYTIMER 3 diff --git a/Library/UpdateCheck.cpp b/Library/UpdateCheck.cpp index 85f79f23..f4868477 100644 --- a/Library/UpdateCheck.cpp +++ b/Library/UpdateCheck.cpp @@ -17,12 +17,8 @@ */ #include "StdAfx.h" -#include #include "Litestep.h" #include "Rainmeter.h" -#include -#include -#include extern CRainmeter* Rainmeter;