github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-15 01:25:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix gn cpplint warnings (#14583)

Browse Source 
* chore: fix cpplint 'include_what_you_use' warnings

Typically by including <memory>, <utility> etc.

* chore: fix 'static/global string constant' warning

Use C style strings instead of std::string.

Style guide forbids non-trivial static / global variables. https://google.github.io/styleguide/cppguide.html#Static_and_Global_Variables

/home/charles/electron/electron-gn/src/electron/script/cpplint.js

* refactor: remove global string variables.

Fix 'global string variables are not permitted' linter warnings
by using the base::NoDestructor<> wrapper to make it explicit that
these variables are never destroyed.

The style guide's take on globals with nontrivial destructors:
https://google.github.io/styleguide/cppguide.html#Static_and_Global_Variables

* fix: initializer error introduced in last commit

* fix: remove WIP file that was included by accident

* fix: include order

* fix: include order

* fix: include order

* fix: include order, again
This commit is contained in:
Charles Kerr
2018-09-12 19:25:56 -05:00
committed by GitHub
parent 183a043216
commit d663b4eaee
120 changed files with 204 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
brightray/common/application_info.cc
View File

@@ -1,28 +1,29 @@
#include "base/no_destructor.h"
#include "brightray/common/application_info.h"
namespace brightray {
namespace {
std::string g_overridden_application_name;
std::string g_overridden_application_version;
base::NoDestructor<std::string> g_overridden_application_name;
base::NoDestructor<std::string> g_overridden_application_version;
} // namespace
// name
void OverrideApplicationName(const std::string& name) {
g_overridden_application_name = name;
*g_overridden_application_name = name;
}
std::string GetOverriddenApplicationName() {
return g_overridden_application_name;
return *g_overridden_application_name;
}
// version
void OverrideApplicationVersion(const std::string& version) {
g_overridden_application_version = version;
*g_overridden_application_version = version;
}
std::string GetOverriddenApplicationVersion() {
return g_overridden_application_version;
return *g_overridden_application_version;
}
} // namespace brightray