From 82c8459055ead78d1e6b534bceb2c7790ba7a875 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Sat, 27 Aug 2016 17:18:12 -0400
Subject: [PATCH] Minor tidying of namespace usage declarations.

---
 Storage/Disk/DiskDrive.cpp            | 3 +--
 Storage/Disk/Formats/G64.cpp          | 3 +--
 Storage/Tape/Formats/CommodoreTAP.cpp | 3 +--
 Storage/Tape/Formats/TapePRG.cpp      | 3 +--
 Storage/Tape/Formats/TapeUEF.cpp      | 3 +--
 Storage/Tape/Tape.cpp                 | 5 ++---
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Storage/Disk/DiskDrive.cpp b/Storage/Disk/DiskDrive.cpp
index c9953b40c..29f9cb4eb 100644
--- a/Storage/Disk/DiskDrive.cpp
+++ b/Storage/Disk/DiskDrive.cpp
@@ -8,8 +8,7 @@
 
 #include "DiskDrive.hpp"
 
-using namespace Storage;
-using namespace Disk;
+using namespace Storage::Disk;
 
 Drive::Drive(unsigned int clock_rate, unsigned int clock_rate_multiplier, unsigned int revolutions_per_minute) :
 	_clock_rate(clock_rate * clock_rate_multiplier),
diff --git a/Storage/Disk/Formats/G64.cpp b/Storage/Disk/Formats/G64.cpp
index 3403e0188..546155433 100644
--- a/Storage/Disk/Formats/G64.cpp
+++ b/Storage/Disk/Formats/G64.cpp
@@ -12,8 +12,7 @@
 #include "../PCMTrack.hpp"
 #include "../Encodings/CommodoreGCR.hpp"
 
-using namespace Storage;
-using namespace Disk;
+using namespace Storage::Disk;
 
 G64::G64(const char *file_name)
 {
diff --git a/Storage/Tape/Formats/CommodoreTAP.cpp b/Storage/Tape/Formats/CommodoreTAP.cpp
index 0a7de2876..3fc5bf669 100644
--- a/Storage/Tape/Formats/CommodoreTAP.cpp
+++ b/Storage/Tape/Formats/CommodoreTAP.cpp
@@ -10,8 +10,7 @@
 #include <cstdio>
 #include <cstring>
 
-using namespace Storage;
-using namespace Tape;
+using namespace Storage::Tape;
 
 CommodoreTAP::CommodoreTAP(const char *file_name)
 {
diff --git a/Storage/Tape/Formats/TapePRG.cpp b/Storage/Tape/Formats/TapePRG.cpp
index 34bb7c7d3..d728e73e5 100644
--- a/Storage/Tape/Formats/TapePRG.cpp
+++ b/Storage/Tape/Formats/TapePRG.cpp
@@ -46,8 +46,7 @@
 
 #include <sys/stat.h>
 
-using namespace Storage;
-using namespace Tape;
+using namespace Storage::Tape;
 
 PRG::PRG(const char *file_name) : _file(nullptr), _bitPhase(3), _filePhase(FilePhaseLeadIn), _phaseOffset(0), _copy_mask(0x80)
 {
diff --git a/Storage/Tape/Formats/TapeUEF.cpp b/Storage/Tape/Formats/TapeUEF.cpp
index 0ae10c707..bac0b4627 100644
--- a/Storage/Tape/Formats/TapeUEF.cpp
+++ b/Storage/Tape/Formats/TapeUEF.cpp
@@ -10,8 +10,7 @@
 #include <string.h>
 #include <math.h>
 
-using namespace Storage;
-using namespace Tape;
+using namespace Storage::Tape;
 
 static float gzgetfloat(gzFile file)
 {
diff --git a/Storage/Tape/Tape.cpp b/Storage/Tape/Tape.cpp
index 70dd9cdcb..e8856d2c1 100644
--- a/Storage/Tape/Tape.cpp
+++ b/Storage/Tape/Tape.cpp
@@ -9,8 +9,7 @@
 #include "Tape.hpp"
 #include "../../NumberTheory/Factors.hpp"
 
-using namespace Storage;
-using namespace Tape;
+using namespace Storage::Tape;
 
 void Storage::Tape::Tape::seek(Time seek_time)
 {
@@ -52,7 +51,7 @@ void TapePlayer::run_for_cycles(int number_of_cycles)
 {
 	if(has_tape())
 	{
-		::TimedEventLoop::run_for_cycles(number_of_cycles);
+		TimedEventLoop::run_for_cycles(number_of_cycles);
 	}
 }