From 88b436e6a9c98af7215bd115e1b7a3f1a1db99d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Sat, 19 Aug 2017 22:23:47 +0200 Subject: Code modernization: subfolders (#6283) * Code modernization: subfolders Modernize various code on subfolders client, network, script, threading, unittests, util * empty function * default constructor/destructor * for range-based loops * use emplace_back instead of push_back * C++ STL header style * Make connection.cpp readable in a pointed place + typo --- src/unittest/test_noderesolver.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/unittest/test_noderesolver.cpp') diff --git a/src/unittest/test_noderesolver.cpp b/src/unittest/test_noderesolver.cpp index b009f5d2e..dc2106a54 100644 --- a/src/unittest/test_noderesolver.cpp +++ b/src/unittest/test_noderesolver.cpp @@ -109,28 +109,28 @@ void TestNodeResolver::testNodeResolving(IWritableNodeDefManager *ndef) Foobar foobar; size_t i; - foobar.m_nodenames.push_back("default:torch"); + foobar.m_nodenames.emplace_back("default:torch"); - foobar.m_nodenames.push_back("default:dirt_with_grass"); - foobar.m_nodenames.push_back("default:water"); - foobar.m_nodenames.push_back("default:abloobloobloo"); - foobar.m_nodenames.push_back("default:stone"); - foobar.m_nodenames.push_back("default:shmegoldorf"); + foobar.m_nodenames.emplace_back("default:dirt_with_grass"); + foobar.m_nodenames.emplace_back("default:water"); + foobar.m_nodenames.emplace_back("default:abloobloobloo"); + foobar.m_nodenames.emplace_back("default:stone"); + foobar.m_nodenames.emplace_back("default:shmegoldorf"); foobar.m_nnlistsizes.push_back(5); - foobar.m_nodenames.push_back("group:liquids"); + foobar.m_nodenames.emplace_back("group:liquids"); foobar.m_nnlistsizes.push_back(1); - foobar.m_nodenames.push_back("default:warf"); - foobar.m_nodenames.push_back("default:stone"); - foobar.m_nodenames.push_back("default:bloop"); + foobar.m_nodenames.emplace_back("default:warf"); + foobar.m_nodenames.emplace_back("default:stone"); + foobar.m_nodenames.emplace_back("default:bloop"); foobar.m_nnlistsizes.push_back(3); foobar.m_nnlistsizes.push_back(0); - foobar.m_nodenames.push_back("default:brick"); - foobar.m_nodenames.push_back("default:desert_stone"); - foobar.m_nodenames.push_back("default:shnitzle"); + foobar.m_nodenames.emplace_back("default:brick"); + foobar.m_nodenames.emplace_back("default:desert_stone"); + foobar.m_nodenames.emplace_back("default:shnitzle"); ndef->pendNodeResolve(&foobar); UASSERT(foobar.m_ndef == ndef); @@ -187,15 +187,15 @@ void TestNodeResolver::testPendingResolveCancellation(IWritableNodeDefManager *n Foobaz foobaz1; foobaz1.test_content1 = 1234; foobaz1.test_content2 = 5678; - foobaz1.m_nodenames.push_back("default:dirt_with_grass"); - foobaz1.m_nodenames.push_back("default:abloobloobloo"); + foobaz1.m_nodenames.emplace_back("default:dirt_with_grass"); + foobaz1.m_nodenames.emplace_back("default:abloobloobloo"); ndef->pendNodeResolve(&foobaz1); Foobaz foobaz2; foobaz2.test_content1 = 1234; foobaz2.test_content2 = 5678; - foobaz2.m_nodenames.push_back("default:dirt_with_grass"); - foobaz2.m_nodenames.push_back("default:abloobloobloo"); + foobaz2.m_nodenames.emplace_back("default:dirt_with_grass"); + foobaz2.m_nodenames.emplace_back("default:abloobloobloo"); ndef->pendNodeResolve(&foobaz2); ndef->cancelNodeResolveCallback(&foobaz1); -- cgit v1.2.3