Switch from Nz prefix to namespace Nz

What a huge commit


Former-commit-id: 38ac5eebf70adc1180f571f6006192d28fb99897

src/Nazara/Core/Clock.cpp

@@ -21,93 +21,96 @@
 
 #include <Nazara/Core/Debug.hpp>
 
-namespace
+namespace Nz
 {
-	nzUInt64 NzGetMicrosecondsLowPrecision()
+	namespace Detail
 	{
-		return NzClockImplGetMilliseconds()*1000ULL;
+		UInt64 GetMicrosecondsLowPrecision()
+		{
+			return ClockImplGetElapsedMilliseconds()*1000ULL;
+		}
+
+		UInt64 GetElapsedMicrosecondsFirstRun()
+		{
+			if (ClockImplInitializeHighPrecision())
+				GetElapsedMicroseconds = ClockImplGetElapsedMicroseconds;
+			else
+				GetElapsedMicroseconds = GetMicrosecondsLowPrecision;
+
+			return GetElapsedMicroseconds();
+		}
 	}
 
-	nzUInt64 NzGetMicrosecondsFirstRun()
+	Clock::Clock(UInt64 startingValue, bool paused) :
+	m_elapsedTime(startingValue),
+	m_refTime(GetElapsedMicroseconds()),
+	m_paused(paused)
 	{
-		if (NzClockImplInitializeHighPrecision())
-			NzGetMicroseconds = NzClockImplGetMicroseconds;
+	}
+
+	float Clock::GetSeconds() const
+	{
+		return GetMicroseconds()/1000000.f;
+	}
+
+	UInt64 Clock::GetMicroseconds() const
+	{
+		NazaraLock(m_mutex);
+
+		UInt64 elapsedMicroseconds = m_elapsedTime;
+		if (!m_paused)
+			elapsedMicroseconds += (GetElapsedMicroseconds() - m_refTime);
+
+		return elapsedMicroseconds;
+	}
+
+	UInt64 Clock::GetMilliseconds() const
+	{
+		return GetMicroseconds()/1000;
+	}
+
+	bool Clock::IsPaused() const
+	{
+		NazaraLock(m_mutex);
+
+		return m_paused;
+	}
+
+	void Clock::Pause()
+	{
+		NazaraLock(m_mutex);
+
+		if (!m_paused)
+		{
+			m_elapsedTime += GetElapsedMicroseconds() - m_refTime;
+			m_paused = true;
+		}
 		else
-			NzGetMicroseconds = NzGetMicrosecondsLowPrecision;
-
-		return NzGetMicroseconds();
+			NazaraWarning("Clock is already paused, ignoring...");
 	}
-}
 
-NzClock::NzClock(nzUInt64 startingValue, bool paused) :
-m_elapsedTime(startingValue),
-m_refTime(NzGetMicroseconds()),
-m_paused(paused)
-{
-}
-
-float NzClock::GetSeconds() const
-{
-	return GetMicroseconds()/1000000.f;
-}
-
-nzUInt64 NzClock::GetMicroseconds() const
-{
-	NazaraLock(m_mutex);
-
-	nzUInt64 elapsedMicroseconds = m_elapsedTime;
-	if (!m_paused)
-		elapsedMicroseconds += (NzGetMicroseconds() - m_refTime);
-
-	return elapsedMicroseconds;
-}
-
-nzUInt64 NzClock::GetMilliseconds() const
-{
-	return GetMicroseconds()/1000;
-}
-
-bool NzClock::IsPaused() const
-{
-	NazaraLock(m_mutex);
-
-	return m_paused;
-}
-
-void NzClock::Pause()
-{
-	NazaraLock(m_mutex);
-
-	if (!m_paused)
+	void Clock::Restart()
 	{
-		m_elapsedTime += NzGetMicroseconds()-m_refTime;
-		m_paused = true;
-	}
-	else
-		NazaraWarning("Clock is already paused, ignoring...");
-}
+		NazaraLock(m_mutex);
 
-void NzClock::Restart()
-{
-	NazaraLock(m_mutex);
-
-	m_elapsedTime = 0;
-	m_refTime = NzGetMicroseconds();
-	m_paused = false;
-}
-
-void NzClock::Unpause()
-{
-	NazaraLock(m_mutex);
-
-	if (m_paused)
-	{
-		m_refTime = NzGetMicroseconds();
+		m_elapsedTime = 0;
+		m_refTime = GetElapsedMicroseconds();
 		m_paused = false;
 	}
-	else
-		NazaraWarning("Clock is not paused, ignoring...");
-}
 
-NzClockFunction NzGetMicroseconds = NzGetMicrosecondsFirstRun;
-NzClockFunction NzGetMilliseconds = NzClockImplGetMilliseconds;
+	void Clock::Unpause()
+	{
+		NazaraLock(m_mutex);
+
+		if (m_paused)
+		{
+			m_refTime = GetElapsedMicroseconds();
+			m_paused = false;
+		}
+		else
+			NazaraWarning("Clock is not paused, ignoring...");
+	}
+
+	ClockFunction GetElapsedMicroseconds = Detail::GetElapsedMicrosecondsFirstRun;
+	ClockFunction GetElapsedMilliseconds = ClockImplGetElapsedMilliseconds;
+}