RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(custom): Change int conversion

pull/129/head
Robinhuett 2018-12-26 11:35:58 +01:00
parent 11c98f13e3
commit 4698c9d2cf
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/modules/custom.hpp
View File

@ -19,7 +19,6 @@ class Custom : public ALabel {
void continuousWorker(); void continuousWorker();
void parseOutputRaw(); void parseOutputRaw();
void parseOutputJson(); void parseOutputJson();
bool isInteger(const std::string&);
const std::string name_; const std::string name_;
std::string text_; std::string text_;

17
src/modules/custom.cpp
View File

@ -132,19 +132,6 @@ void waybar::modules::Custom::parseOutputRaw()
} }
} }
bool waybar::modules::Custom::isInteger(const std::string& n)
{
if (std::isdigit(n[0]) || (n.size() > 1 && (n[0] == '-' || n[0] == '+'))) {
for (std::string::size_type i{ 1 }; i < n.size(); ++i) {
if (!std::isdigit(n[i])) {
return false;
}
}
return true;
}
return false;
}
void waybar::modules::Custom::parseOutputJson() void waybar::modules::Custom::parseOutputJson()
{ {
std::istringstream output(output_.out); std::istringstream output(output_.out);
@ -154,8 +141,8 @@ void waybar::modules::Custom::parseOutputJson()
text_ = parsed["text"].asString(); text_ = parsed["text"].asString();
tooltip_ = parsed["tooltip"].asString(); tooltip_ = parsed["tooltip"].asString();
class_ = parsed["class"].asString(); class_ = parsed["class"].asString();
if (!parsed["percentage"].asString().empty() && isInteger(parsed["percentage"].asString())) { if (!parsed["percentage"].asString().empty() && parsed["percentage"].isUInt()) {
percentage_ = std::stoi(parsed["percentage"].asString(), nullptr); percentage_ = parsed["percentage"].asUInt();
} else { } else {
percentage_ = 0; percentage_ = 0;
} }