From b2967b2814420bf5b76500668122908ddea0d82e Mon Sep 17 00:00:00 2001
From: spx <spx268@gmail.com>
Date: Tue, 16 Nov 2010 22:14:00 +0000
Subject: [PATCH] Small code optimization.

---
 Library/Group.cpp       | 20 --------------
 Library/Group.h         |  4 +--
 Library/MeterWindow.cpp | 60 +++++++++++++++++++----------------------
 3 files changed, 29 insertions(+), 55 deletions(-)

diff --git a/Library/Group.cpp b/Library/Group.cpp
index a760f59f..07f403c4 100644
--- a/Library/Group.cpp
+++ b/Library/Group.cpp
@@ -20,26 +20,6 @@
 #include "Group.h"
 #include "ConfigParser.h"
 
-/*
-** CGroup
-**
-** The constructor
-**
-*/
-CGroup::CGroup()
-{
-}
-
-/*
-** ~CGroup
-**
-** The destructor
-**
-*/
-CGroup::~CGroup()
-{
-}
-
 /*
 ** InitializeGroup
 **
diff --git a/Library/Group.h b/Library/Group.h
index 3bc653d4..0d4e0dcc 100644
--- a/Library/Group.h
+++ b/Library/Group.h
@@ -32,8 +32,8 @@ public:
 	const std::set<std::wstring>& GetGroup() { return m_Group; }
 
 protected:
-	CGroup();
-	virtual ~CGroup();
+	CGroup() {}
+	virtual ~CGroup() {}
 
 	void InitializeGroup(const std::wstring& group);
 
diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp
index b8596155..13cf3d62 100644
--- a/Library/MeterWindow.cpp
+++ b/Library/MeterWindow.cpp
@@ -2064,16 +2064,16 @@ void CMeterWindow::InitializeMeters()
 		try
 		{
 			(*j)->Initialize();
-
-			if (!(*j)->GetToolTipText().empty())
-			{
-				(*j)->CreateToolTip(this);
-			}
 		}
 		catch (CError& error)
 		{
 			MessageBox(m_Window, error.GetString().c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);
 		}
+
+		if (!(*j)->GetToolTipText().empty())
+		{
+			(*j)->CreateToolTip(this);
+		}
 	}
 
 	Update(true);
@@ -2375,26 +2375,19 @@ void CMeterWindow::Redraw()
 	std::list<CMeter*>::const_iterator j = m_Meters.begin();
 	for( ; j != m_Meters.end(); ++j)
 	{
-		try
+		if (!(*j)->GetTransformationMatrix().IsIdentity())
 		{
-			if (!(*j)->GetTransformationMatrix().IsIdentity())
-			{
-				// Change the world matrix
-				graphics.SetTransform(&((*j)->GetTransformationMatrix()));
+			// Change the world matrix
+			graphics.SetTransform(&((*j)->GetTransformationMatrix()));
 
-				(*j)->Draw(graphics);
+			(*j)->Draw(graphics);
 
-				// Set back to identity matrix
-				graphics.ResetTransform();
-			}
-			else
-			{
-				(*j)->Draw(graphics);
-			}
+			// Set back to identity matrix
+			graphics.ResetTransform();
 		}
-		catch (CError& error)
+		else
 		{
-			MessageBox(m_Window, error.GetString().c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);
+			(*j)->Draw(graphics);
 		}
 	}
 		
@@ -2427,18 +2420,18 @@ void CMeterWindow::Update(bool nodraw)
 	std::list<CMeasure*>::const_iterator i = m_Measures.begin();
 	for( ; i != m_Measures.end(); ++i)
 	{
-		try
+		if ((*i)->HasDynamicVariables())
 		{
-			if ((*i)->HasDynamicVariables())
+			try
 			{
 				(*i)->ReadConfig(m_Parser, (*i)->GetName());
 			}
-			(*i)->Update();
-		}
-		catch (CError& error)
-		{
-			MessageBox(m_Window, error.GetString().c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);
+			catch (CError& error)
+			{
+				MessageBox(m_Window, error.GetString().c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);
+			}
 		}
+		(*i)->Update();
 	}
 
 	// Update the meters
@@ -2447,21 +2440,22 @@ void CMeterWindow::Update(bool nodraw)
 	std::list<CMeter*>::const_iterator j = m_Meters.begin();
 	for( ; j != m_Meters.end(); ++j)
 	{
-		try
+		if ((*j)->HasDynamicVariables())
 		{
-			if ((*j)->HasDynamicVariables())
+			try
 			{
 				(*j)->ReadConfig((*j)->GetName());
 				m_Parser.ClearStyleTemplate();
 			}
-			if ((*j)->Update())
+			catch (CError& error)
 			{
-				bUpdate = true;
+				MessageBox(m_Window, error.GetString().c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);
 			}
 		}
-		catch (CError& error)
+
+		if ((*j)->Update())
 		{
-			MessageBox(m_Window, error.GetString().c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);
+			bUpdate = true;
 		}
 
 		// Update tooltips