From 1e1ee4bb2395f389338e73e2eef54576f31dd00f Mon Sep 17 00:00:00 2001
From: Anders Bakken <agbakken@gmail.com>
Date: Thu, 24 Jun 2021 10:42:56 -0700
Subject: [PATCH] s/isEmpty/empty/g

---
 src/ClangIndexer.cpp          |  2 +-
 src/DependenciesJob.cpp       |  2 +-
 src/IndexParseData.h          |  2 +-
 src/Project.cpp               | 12 +++---
 src/Project.h                 |  7 +--
 src/Server.cpp                |  8 ++--
 src/ServerMessageHandlers.cpp | 80 +++++++++++++++++------------------
 7 files changed, 54 insertions(+), 59 deletions(-)

diff --git a/src/ClangIndexer.cpp b/src/ClangIndexer.cpp
index d8a3861d2..fc0c100bf 100644
--- a/src/ClangIndexer.cpp
+++ b/src/ClangIndexer.cpp
@@ -281,7 +281,7 @@ bool ClangIndexer::exec(const String &data)
 
     if (ClangIndexer::state() == Stopped)
         return true;
-    if (!mTrailer.isEmpty()) {
+    if (!mTrailer.empty()) {
         message += " (" + mTrailer + ')';
     }
     message += String::format<16>(" in %lldms. ", mTimer.elapsed());
diff --git a/src/DependenciesJob.cpp b/src/DependenciesJob.cpp
index cec9cd940..59f7f062b 100644
--- a/src/DependenciesJob.cpp
+++ b/src/DependenciesJob.cpp
@@ -37,7 +37,7 @@ int DependenciesJob::execute()
 {
     for (const auto &proj : projects()) {
         String ret = proj->dumpDependencies(mFileId, mArgs, queryFlags());
-        if (!ret.isEmpty()) {
+        if (!ret.empty()) {
             write(ret);
             break;
         }
diff --git a/src/IndexParseData.h b/src/IndexParseData.h
index 397a6d3a0..c3de5b06e 100644
--- a/src/IndexParseData.h
+++ b/src/IndexParseData.h
@@ -59,7 +59,7 @@ class IndexParseData
     Sources sources;
     List<String> environment;
 
-    bool empty() const { return environment.isEmpty() && sources.isEmpty(); }
+    bool empty() const { return environment.empty() && sources.empty(); }
     bool write(const std::function<bool(const String &)> &write, const Match &match = Match()) const;
 };
 
diff --git a/src/Project.cpp b/src/Project.cpp
index d68b70fd4..9ad923913 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -385,7 +385,7 @@ bool Project::init(const Path &srcPath, uint32_t compileCommandsFileId)
             return Path::Continue;
         });
         auto parseData = std::move(mIndexParseData);
-        processParseData(std::move(parseData), ProcessParseData::Init);
+        processParseData(std::move(parseData));
     };
 
     DataFile file(mProjectFilePath, RTags::DatabaseVersion);
@@ -447,7 +447,7 @@ void Project::check(CheckMode checkMode)
         bool outputDirty = false;
         if (checkMode == Check_Init && mDependencies.size() >= 100) {
             String name = mPath;
-            if (!mTrailer.isEmpty())
+            if (!mTrailer.empty())
                 name += " (" + mTrailer + ')';
             logDirect(LogLevel::Error, String::format<128>("Restoring %s ", name.constData()), LogOutput::StdOut);
             outputDirty = true;
@@ -1382,11 +1382,11 @@ Set<FixIt> Project::fixIts(uint32_t fileId) const
 String Project::fixItsToString(const Set<FixIt> &fixIts)
 {
     String out;
-    if (!fixIts.isEmpty()) {
+    if (!fixIts.empty()) {
         auto f = fixIts.end();
         do {
             --f;
-            if (!out.isEmpty())
+            if (!out.empty())
                 out.append('\n');
             out.append(String::format<32>("%d:%d %d %s", f->line, f->column, f->length, f->text.constData()));
         } while (f != fixIts.begin());
@@ -2526,7 +2526,7 @@ void Project::reloadCompileCommands()
         }
         // removeSources(removed);
         if (found)
-            processParseData(std::move(data), ProcessParseData::ReloadCompileCommands);
+            processParseData(std::move(data));
     }
 }
 
@@ -2613,7 +2613,7 @@ void Project::reindex(uint32_t fileId, Flags<IndexerJob::Flag> flags)
     index(std::make_shared<IndexerJob>(sources(fileId), flags, shared_from_this()));
 }
 
-void Project::processParseData(IndexParseData &&data, ProcessParseData type)
+void Project::processParseData(IndexParseData &&data)
 {
     Set<uint32_t> index;
     Hash<uint32_t, uint32_t> removed;
diff --git a/src/Project.h b/src/Project.h
index 0108e6d2d..dd9b4c40f 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -203,12 +203,7 @@ class Project : public std::enable_shared_from_this<Project>
 
     bool isIndexed(uint32_t fileId) const;
 
-    enum class ProcessParseData {
-        Init,
-        ReloadCompileCommands,
-        IndexMessage
-    };
-    void processParseData(IndexParseData &&data, ProcessParseData type);
+    void processParseData(IndexParseData &&data);
     const IndexParseData &indexParseData() const { return mIndexParseData; }
     void index(const std::shared_ptr<IndexerJob> &job);
     void reindex(uint32_t fileId, Flags<IndexerJob::Flag> flags);
diff --git a/src/Server.cpp b/src/Server.cpp
index 3d1d6cc83..1dc2c403d 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -372,7 +372,7 @@ static size_t sharedRoot(const Path &a, const Path &b)
 
 void Server::updateTrailers(const List<std::shared_ptr<Project>> &projects)
 {
-    assert(!projects.isEmpty());
+    assert(!projects.empty());
     if (projects.size() == 1) {
         projects.front()->setTrailer(String());
     } else {
@@ -381,7 +381,7 @@ void Server::updateTrailers(const List<std::shared_ptr<Project>> &projects)
         names.append(Location::path(projects[0]->compileCommandsFileId()).parentDir());
         size_t sharedRootLength = std::numeric_limits<size_t>::max();
         size_t startIndex = 0;
-        if (names[0].isEmpty()) {
+        if (names[0].empty()) {
             names[0] = "none";
             ++startIndex;
             names.append(Location::path(projects[1]->compileCommandsFileId()).parentDir());
@@ -1004,7 +1004,7 @@ bool Server::load()
         for (auto &pp : s.second) {
             auto p = addProject(s.first, pp.compileCommandsFileId);
             if (p) {
-                p->processParseData(std::move(pp), Project::ProcessParseData::Init);
+                p->processParseData(std::move(pp));
                 p->save();
             }
         }
@@ -1303,7 +1303,7 @@ void Server::prepareCompletion(const std::shared_ptr<QueryMessage> &query, uint3
         mCompletionThread->start();
     }
 
-    if (mCompletionThread && fileId && !projects.isEmpty()) {
+    if (mCompletionThread && fileId && !projects.empty()) {
         for (const auto &project : projects) {
             if (mCompletionThread->isCached(project, fileId)) {
                 return;
diff --git a/src/ServerMessageHandlers.cpp b/src/ServerMessageHandlers.cpp
index 7e9af8bac..394b847f2 100644
--- a/src/ServerMessageHandlers.cpp
+++ b/src/ServerMessageHandlers.cpp
@@ -113,7 +113,7 @@ void Server::handleIndexMessage(const std::shared_ptr<IndexMessage> &message, co
         if (proj) {
             assert(proj);
             proj->check(Project::Check_Init);
-            proj->processParseData(std::move(data), Project::ProcessParseData::IndexMessage);
+            proj->processParseData(std::move(data));
             if (!currentProject())
                 setCurrentProject(proj);
         }
@@ -275,7 +275,7 @@ void Server::followLocation(const std::shared_ptr<QueryMessage> &query, const st
         return;
     }
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         error("No project");
         conn->write("Not indexed");
         conn->finish(RTags::NotIndexed);
@@ -309,10 +309,10 @@ void Server::lastIndexed(const std::shared_ptr<QueryMessage> &query, const std::
     // Path path = query->path();
     const Match match = query->match();
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty())
+    if (projects.empty())
         projects.push_back(currentProject());
 
-    if (!projects.isEmpty()) {
+    if (!projects.empty()) {
         error("No project");
         conn->finish();
         return;
@@ -364,7 +364,7 @@ void Server::startClangThread(const std::shared_ptr<QueryMessage> &query, const
     }
 
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         conn->write<256>("%s is not indexed", query->query().constData());
         conn->finish();
         return;
@@ -431,13 +431,13 @@ void Server::diagnose(const std::shared_ptr<QueryMessage> &query, const std::sha
     }
 
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         if (!fileId) {
             auto project = mCurrentProject.lock();
             if (project)
                 projects.push_back(project);
         }
-        if (projects.isEmpty()) {
+        if (projects.empty()) {
             conn->write<256>("%s is not indexed", query->query().constData());
             conn->finish();
             return;
@@ -471,7 +471,7 @@ void Server::generateTest(const std::shared_ptr<QueryMessage> &query, const std:
     }
 
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (!projects.isEmpty()) {
+    if (!projects.empty()) {
         conn->write<256>("%s is not indexed", query->query().constData());
         conn->finish();
         return;
@@ -549,7 +549,7 @@ void Server::symbolInfo(const std::shared_ptr<QueryMessage> &query, const std::s
     }
 
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         List<Match> matches;
         matches << path;
         projects = projectsForMatches(query->flags(), matches);
@@ -588,7 +588,7 @@ void Server::includePath(const std::shared_ptr<QueryMessage> &query, const std::
     }
 
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         error("No project");
         conn->write("Not indexed");
         conn->finish(RTags::NotIndexed);
@@ -624,7 +624,7 @@ void Server::dependencies(const std::shared_ptr<QueryMessage> &query, const std:
     } else if (auto cur = currentProject()) {
         projects.push_back(std::move(cur));
     }
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         conn->write<256>("%s is not indexed", query->query().constData());
         conn->finish();
         return;
@@ -639,7 +639,7 @@ void Server::fixIts(const std::shared_ptr<QueryMessage> &query, const std::share
 {
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
     String out;
-    if (!projects.isEmpty()) {
+    if (!projects.empty()) {
         uint32_t fileId = Location::fileId(query->query());
         if (fileId) {
             prepareCompletion(query, fileId, projects);
@@ -661,7 +661,7 @@ void Server::referencesForLocation(const std::shared_ptr<QueryMessage> &query, c
     }
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
 
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         error("No project");
         conn->write("Not indexed");
         conn->finish(RTags::NotIndexed);
@@ -694,13 +694,13 @@ void Server::referencesForName(const std::shared_ptr<QueryMessage> &query, const
     const String name = query->query();
 
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         auto cur = currentProject();
         if (cur)
             projects.push_back(std::move(cur));
     }
 
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         error("No project");
         conn->finish();
         return;
@@ -716,14 +716,14 @@ void Server::findSymbols(const std::shared_ptr<QueryMessage> &query, const std::
     const String partial = query->query();
 
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         auto cur = currentProject();
         if (cur)
             projects.push_back(std::move(cur));
     }
 
     int ret = 0;
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         ret = 1;
         error("No project");
     } else {
@@ -738,13 +738,13 @@ void Server::listSymbols(const std::shared_ptr<QueryMessage> &query, const std::
     const String partial = query->query();
 
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         auto cur = currentProject();
         if (cur)
             projects.push_back(std::move(cur));
     }
 
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         error("No project");
         conn->finish();
         return;
@@ -771,7 +771,7 @@ void Server::isIndexed(const std::shared_ptr<QueryMessage> &query, const std::sh
     String ret = "unknown";
     const Match match = query->match();
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (!projects.isEmpty()) {
+    if (!projects.empty()) {
         for (const auto &project : projects) {
             bool indexed = false;
             if (project->match(match, &indexed)) {
@@ -795,14 +795,14 @@ void Server::isIndexed(const std::shared_ptr<QueryMessage> &query, const std::sh
 void Server::reloadFileManager(const std::shared_ptr<QueryMessage> &query, const std::shared_ptr<Connection> &conn)
 {
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         auto cur = currentProject();
         if (cur) {
             projects.append(std::move(cur));
         }
     }
 
-    if (!projects.isEmpty()) {
+    if (!projects.empty()) {
         if (mOptions.options & NoFileManager) {
             conn->write<512>("Not watching files");
             conn->finish(RTags::GeneralFailure);
@@ -821,10 +821,10 @@ void Server::hasFileManager(const std::shared_ptr<QueryMessage> &query, const st
 {
     const Path path = query->query();
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty() && currentProject()) {
+    if (projects.empty() && currentProject()) {
         projects.append(currentProject());
     }
-    if (!projects.isEmpty() && (projects.first()->fileManager() ? projects.first()->fileManager()->contains(path) : projects.first()->match(query->match()))) {
+    if (!projects.empty() && (projects.first()->fileManager() ? projects.first()->fileManager()->contains(path) : projects.first()->match(query->match()))) {
         if (!(query->flags() & QueryMessage::SilentQuery))
             warning("=> 1");
         conn->write("1");
@@ -839,7 +839,7 @@ void Server::hasFileManager(const std::shared_ptr<QueryMessage> &query, const st
 void Server::includeFile(const std::shared_ptr<QueryMessage> &query, const std::shared_ptr<Connection> &conn)
 {
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         conn->write("No project");
         conn->finish();
         return;
@@ -852,7 +852,7 @@ void Server::includeFile(const std::shared_ptr<QueryMessage> &query, const std::
 void Server::preprocessFile(const std::shared_ptr<QueryMessage> &query, const std::shared_ptr<Connection> &conn)
 {
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         conn->write("No project");
         conn->finish();
         return;
@@ -882,11 +882,11 @@ void Server::reindex(const std::shared_ptr<QueryMessage> &query, const std::shar
 {
     Match match = query->match();
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         auto cur = currentProject();
         if (cur)
             projects.append(std::move(cur));
-        if (projects.isEmpty()) {
+        if (projects.empty()) {
             error("No project");
             conn->finish();
             return;
@@ -929,11 +929,11 @@ static List<std::shared_ptr<Project>> sortProjects(const List<std::shared_ptr<Pr
 void Server::project(const std::shared_ptr<QueryMessage> &query, const std::shared_ptr<Connection> &conn)
 {
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (!projects.isEmpty()) {
+    if (!projects.empty()) {
         setCurrentProject(projects.first());
     }
 
-    if (!projects.isEmpty() || query->flags() & QueryMessage::CurrentProjectOnly) {
+    if (!projects.empty() || query->flags() & QueryMessage::CurrentProjectOnly) {
         if (std::shared_ptr<Project> current = currentProject()) {
             conn->write(current->path());
         }
@@ -997,7 +997,7 @@ void Server::project(const std::shared_ptr<QueryMessage> &query, const std::shar
         if (selected) {
             String name = selected->path();
             String trailer = selected->trailer();
-            if (!trailer.isEmpty())
+            if (!trailer.empty())
                 name += " (" + trailer + ')';
             if (selected == currentProject()) {
                 conn->write<128>("%s is already the active project", name.constData());
@@ -1054,12 +1054,12 @@ void Server::jobCount(const std::shared_ptr<QueryMessage> &query, const std::sha
 void Server::deadFunctions(const std::shared_ptr<QueryMessage> &query, const std::shared_ptr<Connection> &conn)
 {
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         auto project = currentProject();
         if (project)
             projects.append(std::move(project));
     }
-    if (!projects.isEmpty()) {
+    if (!projects.empty()) {
         class DeadFunctionsJob : public QueryJob
         {
         public:
@@ -1178,7 +1178,7 @@ void Server::sources(const std::shared_ptr<QueryMessage> &query, const std::shar
     };
     if (path.isFile()) {
         List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-        if (!projects.isEmpty()) {
+        if (!projects.empty()) {
             const uint32_t fileId = Location::fileId(path);
             if (fileId) {
                 prepareCompletion(query, fileId, projects);
@@ -1264,12 +1264,12 @@ void Server::dumpCompletions(const std::shared_ptr<QueryMessage> &/*query*/, con
 void Server::dumpCompileCommands(const std::shared_ptr<QueryMessage> &query, const std::shared_ptr<Connection> &conn)
 {
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         auto cur = currentProject();
         if (cur)
             projects.append(std::move(cur));
     }
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         conn->write("No current project");
         conn->finish(RTags::GeneralFailure);
         return;
@@ -1434,7 +1434,7 @@ void Server::classHierarchy(const std::shared_ptr<QueryMessage> &query, const st
         return;
     }
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         error("No project");
         conn->write("Not indexed");
         conn->finish(RTags::NotIndexed);
@@ -1507,12 +1507,12 @@ void Server::tokens(const std::shared_ptr<QueryMessage> &query, const std::share
 void Server::validate(const std::shared_ptr<QueryMessage> &query, const std::shared_ptr<Connection> &conn)
 {
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         auto cur = mCurrentProject.lock();
         if (cur)
             projects.append(std::move(cur));
     }
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         error("No project");
         conn->write("No current project");
         conn->finish(RTags::GeneralFailure);
@@ -1547,7 +1547,7 @@ void Server::codeCompleteAt(const std::shared_ptr<QueryMessage> &query, const st
 {
     const Location loc = query->location(Location::CreateLocation);
     List<std::shared_ptr<Project>> projects = projectsForQuery(query);
-    if (projects.isEmpty()) {
+    if (projects.empty()) {
         error("No project found for %s", loc.path().constData());
         conn->finish();
         return;