From ba47744a528b312c8ce3ce97fade4d73e3138fd8 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Thu, 14 Aug 2014 04:59:07 +0200 Subject: [PATCH] Put trivial FileLister method implementations in header This cuts a few hundred bytes off the stripped binary size. --- src/filelister.cpp | 40 ---------------------------------------- src/filelister.h | 17 +++++++++-------- 2 files changed, 9 insertions(+), 48 deletions(-) diff --git a/src/filelister.cpp b/src/filelister.cpp index 7961781..adfdafd 100644 --- a/src/filelister.cpp +++ b/src/filelister.cpp @@ -51,21 +51,6 @@ void FileLister::setFilter(const string &filter) } } -void FileLister::setShowDirectories(bool showDirectories) -{ - this->showDirectories = showDirectories; -} - -void FileLister::setShowUpdir(bool showUpdir) -{ - this->showUpdir = showUpdir; -} - -void FileLister::setShowFiles(bool showFiles) -{ - this->showFiles = showFiles; -} - static void moveNames(set&& from, vector& to) { to.reserve(from.size()); @@ -179,21 +164,6 @@ void FileLister::browse(const string& path, bool clean) } } -unsigned int FileLister::size() -{ - return files.size() + directories.size(); -} - -unsigned int FileLister::dirCount() -{ - return directories.size(); -} - -unsigned int FileLister::fileCount() -{ - return files.size(); -} - string FileLister::operator[](uint x) { return at(x); @@ -207,16 +177,6 @@ string FileLister::at(uint x) return files[x-directories.size()]; } -bool FileLister::isFile(unsigned int x) -{ - return x >= directories.size() && x < size(); -} - -bool FileLister::isDirectory(unsigned int x) -{ - return x < directories.size(); -} - void FileLister::insertFile(const string &file) { files.insert(files.begin(), file); } diff --git a/src/filelister.h b/src/filelister.h index 4e39df7..7cedb98 100644 --- a/src/filelister.h +++ b/src/filelister.h @@ -35,19 +35,20 @@ public: FileLister(); void browse(const std::string& path, bool clean = true); - unsigned int size(); - unsigned int dirCount(); - unsigned int fileCount(); + unsigned int size() { return files.size() + directories.size(); } + unsigned int dirCount() { return directories.size(); } + unsigned int fileCount() { return files.size(); } + std::string operator[](unsigned int); std::string at(unsigned int); - bool isFile(unsigned int); - bool isDirectory(unsigned int); + bool isFile(unsigned int x) { return x >= directories.size(); } + bool isDirectory(unsigned int x) { return x < directories.size(); } void setFilter(const std::string &filter); - void setShowDirectories(bool); - void setShowUpdir(bool); - void setShowFiles(bool); + void setShowDirectories(bool enabled) { showDirectories = enabled; } + void setShowUpdir(bool enabled) { showUpdir = enabled; } + void setShowFiles(bool enabled) { showFiles = enabled; } const std::vector &getDirectories() { return directories; } const std::vector &getFiles() { return files; }