diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-08-19 22:23:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-19 22:23:47 +0200 |
| commit | 88b436e6a9c98af7215bd115e1b7a3f1a1db99d3 (patch) | |
| tree | f07cdd7f93ca26b84192d7b89f7b952e603ba5cf /src/unittest/test_noderesolver.cpp | |
| parent | 7528986e4449febead9b18b6118f0b096f7cf800 (diff) | |
| download | minetest-88b436e6a9c98af7215bd115e1b7a3f1a1db99d3.tar.gz minetest-88b436e6a9c98af7215bd115e1b7a3f1a1db99d3.tar.bz2 minetest-88b436e6a9c98af7215bd115e1b7a3f1a1db99d3.zip | |
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
Diffstat (limited to 'src/unittest/test_noderesolver.cpp')
| -rw-r--r-- | src/unittest/test_noderesolver.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
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); |