Remove unused using statements

.clang-tidy

@@ -1,5 +1,5 @@
 ---
-Checks:          'clang-diagnostic-*,clang-analyzer-*,misc-use-after-move'
+Checks:          'clang-diagnostic-*,clang-analyzer-*,misc-use-after-move,misc-unused-using-decls,misc-unused-alias-decls'
 WarningsAsErrors: ''
 HeaderFilterRegex: '/src/|/test/'
 CheckOptions:    

src/blobstore/implementations/onblocks/BlobOnBlocks.cpp

@@ -13,8 +13,6 @@ using std::unique_lock;
 using std::mutex;
 using cpputils::unique_ref;
 using cpputils::Data;
-using blobstore::onblocks::datanodestore::DataLeafNode;
-using blobstore::onblocks::datanodestore::DataNodeLayout;
 using blockstore::BlockId;
 using blobstore::onblocks::datatreestore::LeafHandle;
 

src/blobstore/implementations/onblocks/datanodestore/DataLeafNode.cpp

@@ -2,7 +2,6 @@
 #include "DataInnerNode.h"
 #include <cpp-utils/assert/assert.h>
 
-using blockstore::Block;
 using cpputils::Data;
 using blockstore::BlockId;
 using blockstore::BlockStore;

src/blobstore/implementations/onblocks/datanodestore/DataNode.cpp

@@ -4,10 +4,8 @@
 #include "DataNodeStore.h"
 #include <blockstore/utils/BlockStoreUtils.h>
 
-using blockstore::Block;
 using blockstore::BlockId;
 
-using std::runtime_error;
 using cpputils::unique_ref;
 
 namespace blobstore {

src/blobstore/implementations/onblocks/datatreestore/DataTree.cpp

@@ -18,20 +18,14 @@ using blobstore::onblocks::datanodestore::DataNodeStore;
 using blobstore::onblocks::datanodestore::DataNode;
 using blobstore::onblocks::datanodestore::DataInnerNode;
 using blobstore::onblocks::datanodestore::DataLeafNode;
-using blobstore::onblocks::datanodestore::DataNodeLayout;
 
-using std::dynamic_pointer_cast;
 using std::function;
 using boost::shared_mutex;
 using boost::shared_lock;
 using boost::unique_lock;
 using boost::none;
-using std::vector;
 
-using cpputils::dynamic_pointer_move;
 using cpputils::optional_ownership_ptr;
-using cpputils::WithOwnership;
-using cpputils::WithoutOwnership;
 using cpputils::unique_ref;
 using cpputils::Data;
 

src/blobstore/implementations/onblocks/datatreestore/DataTreeStore.cpp

@@ -9,7 +9,6 @@ using boost::optional;
 using boost::none;
 
 using blobstore::onblocks::datanodestore::DataNodeStore;
-using blobstore::onblocks::datanodestore::DataNode;
 
 namespace blobstore {
 namespace onblocks {

src/blobstore/implementations/onblocks/parallelaccessdatatreestore/ParallelAccessDataTreeStore.cpp

@@ -14,7 +14,6 @@ using blockstore::BlockId;
 namespace blobstore {
 namespace onblocks {
 using datatreestore::DataTreeStore;
-using datatreestore::DataTree;
 namespace parallelaccessdatatreestore {
 
 //TODO Here and for other stores (DataTreeStore, ...): Make small functions inline

src/blockstore/implementations/caching/CachingBlockStore2.cpp

@@ -3,14 +3,8 @@
 #include <cpp-utils/assert/assert.h>
 #include <cpp-utils/system/get_total_memory.h>
 
-using std::make_unique;
 using std::string;
 using std::mutex;
-using std::lock_guard;
-using std::piecewise_construct;
-using std::make_tuple;
-using std::make_pair;
-using std::vector;
 using cpputils::Data;
 using cpputils::unique_ref;
 using cpputils::make_unique_ref;

src/blockstore/implementations/caching/cache/PeriodicTask.cpp

@@ -2,7 +2,6 @@
 #include <cpp-utils/logging/logging.h>
 
 using std::function;
-using std::endl;
 using namespace cpputils::logging;
 
 namespace blockstore {

src/blockstore/implementations/inmemory/InMemoryBlockStore2.cpp

@@ -3,17 +3,11 @@
 #include <cpp-utils/assert/assert.h>
 #include <cpp-utils/system/get_total_memory.h>
 
-using std::make_unique;
 using std::string;
 using std::mutex;
-using std::lock_guard;
-using std::piecewise_construct;
-using std::make_tuple;
 using std::make_pair;
 using std::vector;
 using cpputils::Data;
-using cpputils::unique_ref;
-using cpputils::make_unique_ref;
 using boost::optional;
 using boost::none;
 

src/blockstore/implementations/integrity/KnownBlockVersions.cpp

@@ -4,7 +4,6 @@
 #include "KnownBlockVersions.h"
 
 namespace bf = boost::filesystem;
-using std::unordered_map;
 using std::pair;
 using std::string;
 using std::unique_lock;
@@ -12,7 +11,6 @@ using std::mutex;
 using boost::optional;
 using boost::none;
 using cpputils::Data;
-using cpputils::Random;
 using cpputils::Serializer;
 using cpputils::Deserializer;
 

src/blockstore/implementations/low2highlevel/LowToHighLevelBlockStore.cpp

@@ -3,12 +3,10 @@
 #include "LowToHighLevelBlock.h"
 
 using cpputils::unique_ref;
-using cpputils::make_unique_ref;
 using cpputils::Data;
 using boost::none;
 using boost::optional;
 using std::string;
-namespace bf = boost::filesystem;
 
 namespace blockstore {
 namespace lowtohighlevel {

src/blockstore/implementations/parallelaccess/ParallelAccessBlockStore.cpp

@@ -6,7 +6,6 @@
 #include <cpp-utils/assert/assert.h>
 
 using std::string;
-using std::promise;
 using cpputils::dynamic_pointer_move;
 using cpputils::make_unique_ref;
 using boost::none;

src/blockstore/implementations/testfake/FakeBlockStore.cpp

@@ -6,7 +6,6 @@
 using std::make_shared;
 using std::string;
 using std::mutex;
-using std::lock_guard;
 using cpputils::Data;
 using cpputils::unique_ref;
 using cpputils::make_unique_ref;

src/cpp-utils/crypto/kdf/SCryptParameters.cpp

@@ -2,8 +2,6 @@
 
 using std::istream;
 using std::ostream;
-using boost::optional;
-using boost::none;
 using cpputils::Data;
 
 namespace cpputils {

src/cpp-utils/system/homedir.cpp

@@ -4,8 +4,6 @@
 
 namespace bf = boost::filesystem;
 using std::string;
-using cpputils::unique_ref;
-using cpputils::make_unique_ref;
 
 namespace cpputils {
     namespace system {

src/cryfs-cli/Cli.cpp

@@ -36,7 +36,6 @@ using blockstore::ondisk::OnDiskBlockStore2;
 using program_options::ProgramOptions;
 
 using cpputils::make_unique_ref;
-using cpputils::Random;
 using cpputils::NoninteractiveConsole;
 using cpputils::TempFile;
 using cpputils::RandomGenerator;
@@ -49,17 +48,12 @@ using std::cin;
 using std::cout;
 using std::string;
 using std::endl;
-using std::vector;
 using std::shared_ptr;
 using std::make_shared;
-using std::unique_ptr;
-using std::make_unique;
 using std::function;
 using std::make_shared;
 using boost::optional;
 using boost::none;
-using boost::chrono::duration;
-using boost::chrono::duration_cast;
 using boost::chrono::minutes;
 using boost::chrono::milliseconds;
 using cpputils::dynamic_pointer_move;

src/cryfs-cli/VersionChecker.cpp

@@ -9,10 +9,8 @@ using boost::optional;
 using boost::none;
 using std::string;
 using cpputils::HttpClient;
-using cpputils::CurlHttpClient;
 using boost::property_tree::ptree;
 using boost::property_tree::json_parser_error;
-using cpputils::unique_ref;
 using namespace cpputils::logging;
 
 namespace cryfs {

src/cryfs-cli/program_options/Parser.cpp

@@ -9,7 +9,6 @@ namespace po = boost::program_options;
 namespace bf = boost::filesystem;
 using namespace cryfs::program_options;
 using cryfs::CryConfigConsole;
-using std::pair;
 using std::vector;
 using std::cerr;
 using std::endl;

src/cryfs/config/CryConfig.cpp

@@ -7,7 +7,6 @@
 #include <gitversion/VersionCompare.h>
 #include <cpp-utils/random/Random.h>
 
-namespace bf = boost::filesystem;
 
 using boost::property_tree::ptree;
 using boost::optional;
@@ -15,7 +14,6 @@ using boost::none;
 using std::string;
 using std::stringstream;
 using cpputils::Data;
-using gitversion::VersionCompare;
 using cpputils::Random;
 
 namespace cryfs {

src/cryfs/config/CryConfigConsole.cpp

@@ -1,9 +1,7 @@
 #include "CryConfigConsole.h"
 #include "CryCipher.h"
 
-using cpputils::unique_ref;
 using cpputils::Console;
-using boost::optional;
 using boost::none;
 using std::string;
 using std::vector;

src/cryfs/config/CryConfigCreator.cpp

@@ -6,12 +6,10 @@
 #include <cryfs/localstate/LocalStateMetadata.h>
 
 using cpputils::Console;
-using cpputils::unique_ref;
 using cpputils::RandomGenerator;
 using cpputils::Random;
 using std::string;
 using std::shared_ptr;
-using std::vector;
 using boost::optional;
 using boost::none;
 

src/cryfs/config/CryConfigLoader.cpp

@@ -10,21 +10,15 @@
 #include "../localstate/LocalStateMetadata.h"
 
 namespace bf = boost::filesystem;
-using cpputils::unique_ref;
-using cpputils::make_unique_ref;
 using cpputils::Console;
-using cpputils::Random;
 using cpputils::RandomGenerator;
 using cpputils::SCryptSettings;
 using boost::optional;
 using boost::none;
 using std::shared_ptr;
-using std::vector;
 using std::string;
 using std::function;
 using std::shared_ptr;
-using std::unique_ptr;
-using std::make_unique;
 using gitversion::VersionCompare;
 using namespace cpputils::logging;
 

src/cryfs/config/crypto/CryConfigEncryptor.cpp

@@ -5,7 +5,6 @@ using std::string;
 using cpputils::unique_ref;
 using cpputils::make_unique_ref;
 using cpputils::Data;
-using cpputils::RandomPadding;
 using cpputils::FixedSizeData;
 using boost::optional;
 using boost::none;

src/cryfs/config/crypto/CryConfigEncryptorFactory.cpp

@@ -8,8 +8,6 @@ using boost::none;
 using cpputils::unique_ref;
 using cpputils::make_unique_ref;
 using cpputils::Data;
-using cpputils::FixedSizeData;
-using cpputils::SCryptParameters;
 using cpputils::SCrypt;
 using cpputils::SCryptSettings;
 using std::string;

src/cryfs/config/crypto/outer/OuterEncryptor.cpp

@@ -3,7 +3,6 @@
 #include "OuterConfig.h"
 
 using std::string;
-using cpputils::unique_ref;
 using cpputils::Data;
 using cpputils::RandomPadding;
 using boost::optional;

src/cryfs/filesystem/CryDevice.cpp

@@ -24,20 +24,15 @@
 using std::string;
 
 //TODO Get rid of this in favor of exception hierarchy
-using fspp::fuse::CHECK_RETVAL;
 using fspp::fuse::FuseErrnoException;
 
-using blockstore::BlockStore;
 using blockstore::BlockStore2;
 using blockstore::BlockId;
-using blockstore::encrypted::EncryptedBlockStore2;
 using blobstore::BlobStore;
 using blockstore::lowtohighlevel::LowToHighLevelBlockStore;
 using blobstore::onblocks::BlobStoreOnBlocks;
-using blobstore::onblocks::BlobOnBlocks;
 using blockstore::caching::CachingBlockStore2;
 using blockstore::integrity::IntegrityBlockStore2;
-using gitversion::VersionCompare;
 using cpputils::unique_ref;
 using cpputils::make_unique_ref;
 using cpputils::dynamic_pointer_move;

src/cryfs/filesystem/CryDir.cpp

@@ -13,7 +13,6 @@
 #include "fsblobstore/utils/TimestampUpdateBehavior.h"
 
 //TODO Get rid of this in favor of exception hierarchy
-using fspp::fuse::CHECK_RETVAL;
 using fspp::fuse::FuseErrnoException;
 
 namespace bf = boost::filesystem;

src/cryfs/filesystem/CryFile.cpp

@@ -4,11 +4,8 @@
 #include "CryOpenFile.h"
 #include <fspp/fuse/FuseErrnoException.h>
 
-namespace bf = boost::filesystem;
 
 //TODO Get rid of this in favor of exception hierarchy
-using fspp::fuse::CHECK_RETVAL;
-using fspp::fuse::FuseErrnoException;
 
 using blockstore::BlockId;
 using boost::none;

src/cryfs/filesystem/CryNode.cpp

@@ -14,8 +14,6 @@
 namespace bf = boost::filesystem;
 
 using blockstore::BlockId;
-using blobstore::Blob;
-using cpputils::dynamic_pointer_move;
 using cpputils::unique_ref;
 using boost::optional;
 using boost::none;
@@ -25,7 +23,6 @@ using cryfs::parallelaccessfsblobstore::DirBlobRef;
 using namespace cpputils::logging;
 
 //TODO Get rid of this in favor of an exception hierarchy
-using fspp::fuse::CHECK_RETVAL;
 using fspp::fuse::FuseErrnoException;
 
 namespace cryfs {

src/cryfs/filesystem/CryOpenFile.cpp

@@ -6,7 +6,6 @@
 #include "CryDevice.h"
 #include <fspp/fuse/FuseErrnoException.h>
 
-namespace bf = boost::filesystem;
 
 using std::shared_ptr;
 using cpputils::unique_ref;
@@ -14,8 +13,6 @@ using cryfs::parallelaccessfsblobstore::FileBlobRef;
 using cryfs::parallelaccessfsblobstore::DirBlobRef;
 
 //TODO Get rid of this in favor of a exception hierarchy
-using fspp::fuse::CHECK_RETVAL;
-using fspp::fuse::FuseErrnoException;
 
 namespace cryfs {
 

src/cryfs/filesystem/CrySymlink.cpp

@@ -7,19 +7,15 @@
 #include "fsblobstore/utils/TimestampUpdateBehavior.h"
 
 //TODO Get rid of this in favor of exception hierarchy
-using fspp::fuse::CHECK_RETVAL;
-using fspp::fuse::FuseErrnoException;
 
 namespace bf = boost::filesystem;
 
 using std::string;
-using std::vector;
 
 using blockstore::BlockId;
 using boost::none;
 using boost::optional;
 using cpputils::unique_ref;
-using cpputils::make_unique_ref;
 using cpputils::dynamic_pointer_move;
 using cryfs::parallelaccessfsblobstore::SymlinkBlobRef;
 using cryfs::parallelaccessfsblobstore::DirBlobRef;

src/cryfs/filesystem/cachingfsblobstore/CachingFsBlobStore.cpp

@@ -1,16 +1,12 @@
 #include "CachingFsBlobStore.h"
 #include "../fsblobstore/FsBlobStore.h"
 
-namespace bf = boost::filesystem;
 using cpputils::unique_ref;
 using cpputils::make_unique_ref;
 using cpputils::dynamic_pointer_move;
-using blobstore::BlobStore;
 using blockstore::BlockId;
 using boost::optional;
 using boost::none;
-using std::function;
-using cryfs::fsblobstore::FsBlobStore;
 using cryfs::fsblobstore::FsBlob;
 using cryfs::fsblobstore::FileBlob;
 using cryfs::fsblobstore::DirBlob;

src/cryfs/filesystem/fsblobstore/DirBlob.cpp

@@ -13,8 +13,6 @@
 
 using std::vector;
 using std::string;
-using std::pair;
-using std::make_pair;
 
 using blobstore::Blob;
 using blockstore::BlockId;

src/cryfs/filesystem/fsblobstore/FsBlobStore.cpp

@@ -3,13 +3,11 @@
 #include "DirBlob.h"
 #include "SymlinkBlob.h"
 
-namespace bf = boost::filesystem;
 using cpputils::unique_ref;
 using cpputils::make_unique_ref;
 using blobstore::BlobStore;
 using blockstore::BlockId;
 using boost::none;
-using std::function;
 using std::vector;
 
 namespace cryfs {

src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp

@@ -3,15 +3,9 @@
 #include "../fsblobstore/FsBlobStore.h"
 
 namespace bf = boost::filesystem;
-using cryfs::cachingfsblobstore::CachingFsBlobStore;
-using cryfs::fsblobstore::FsBlob;
-using cryfs::fsblobstore::FileBlob;
-using cryfs::fsblobstore::DirBlob;
-using cryfs::fsblobstore::SymlinkBlob;
 using cpputils::unique_ref;
 using cpputils::make_unique_ref;
 using boost::optional;
-using boost::none;
 using blockstore::BlockId;
 
 namespace cryfs {

src/cryfs/localstate/BasedirMetadata.cpp

@@ -9,7 +9,6 @@ namespace bf = boost::filesystem;
 using boost::property_tree::ptree;
 using boost::property_tree::write_json;
 using boost::property_tree::read_json;
-using boost::optional;
 using boost::none;
 using std::ostream;
 using std::istream;

src/fspp/impl/FilesystemImpl.cpp

@@ -14,9 +14,7 @@
 #include <sstream>
 
 using namespace fspp;
-using cpputils::dynamic_pointer_move;
 using cpputils::unique_ref;
-using cpputils::make_unique_ref;
 using std::vector;
 using std::string;
 using boost::none;