Use global Window object.

This makes it easier to control initialization and maintain RAII.

1 files changed, 5 insertions, 5 deletions

diff --git a/c/test.cpp b/c/test.cpp
index 6e291c7..35c6904 100644
--- a/c/test.cpp
+++ b/c/test.cpp
@@ -4,10 +4,11 @@
 #include "data.h"
 #include "episodelistview.h"
 #include "ext.h"
+#include "main.h"
 #include "util.h"
 #include "win.h"
 
-extern CfgA& g_cfg;
+extern Window* g_window;
 
 struct Test
 {
@@ -35,9 +36,8 @@ TESTS
 
 	TEST(IO)
 	{
-		extern FileView<ElvDataA> g_fvElv;
-		ElvDataA& e1_0 = g_fvElv.At(5);
-		ElvDataA& e2_0 = g_fvElv.At(9);
+		ElvDataA& e1_0 = g_window->fvElv.At(5);
+		ElvDataA& e2_0 = g_window->fvElv.At(9);
 
 		/* Write two ElvDataA structs to disk. */
 		{
@@ -91,7 +91,7 @@ TESTS
 // 	TEST(MigrateCfg)
 // 	{
 // 		FileView<CfgB> fvb = FileView<CfgB>::Initialized(L"cfgb.dat", 1);
-// 		CfgA* a = &g_cfg;
+// 		CfgA* a = &g_window->cfg;
 // 		CfgB* b = fvb+0;
 
 // #define CPY(member) b->member = a->member;