projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: replace some list with vector.
[dcpomatic.git]
/
test
/
config_test.cc
diff --git
a/test/config_test.cc
b/test/config_test.cc
index fc3a27601e4d763a646b744621652a98c3b4810a..103a6a58555ac0f181353afac8f6f257c14f495d 100644
(file)
--- a/
test/config_test.cc
+++ b/
test/config_test.cc
@@
-26,10
+26,10
@@
#include <fstream>
#include <fstream>
-using std::list;
-using std::ofstream;
using std::make_shared;
using std::make_shared;
+using std::ofstream;
using std::string;
using std::string;
+using std::vector;
using boost::optional;
using boost::optional;
@@
-177,7
+177,7
@@
BOOST_AUTO_TEST_CASE (config_upgrade_test)
boost::filesystem::copy_file ("test/data/2.14.cinemas.xml", dir / "cinemas.xml");
Config::instance();
try {
boost::filesystem::copy_file ("test/data/2.14.cinemas.xml", dir / "cinemas.xml");
Config::instance();
try {
- /* This will fail to write cinemas.xml since the link is to a non-exist
a
nt directory */
+ /* This will fail to write cinemas.xml since the link is to a non-exist
e
nt directory */
Config::instance()->write();
} catch (...) {}
Config::instance()->write();
} catch (...) {}
@@
-206,7
+206,7
@@
BOOST_AUTO_TEST_CASE (config_keep_cinemas_if_making_new_config)
Config::instance()->write();
Config::instance()->write();
- Config::instance()->add_cinema(make_shared<Cinema>("My Great Cinema",
list
<string>(), "", 0, 0));
+ Config::instance()->add_cinema(make_shared<Cinema>("My Great Cinema",
vector
<string>(), "", 0, 0));
Config::instance()->write();
boost::filesystem::copy_file (dir / "cinemas.xml", dir / "backup_for_test.xml");
Config::instance()->write();
boost::filesystem::copy_file (dir / "cinemas.xml", dir / "backup_for_test.xml");