RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 21:17:45 +00:00
Code Issues Activity Actions

Revert "Userland: static vs non-static constexpr variables"

Browse source 
This reverts commit 800ea8ea96.

Booting the system no longer worked after these changes.
This commit is contained in:
Linus Groh 2021-05-21 10:30:21 +01:00
parent 68f76b9e37
commit d60ebbbba6
38 changed files with 184 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Applications/SpaceAnalyzer/TreeMapWidget.cpp
View file

@ -5,7 +5,6 @@
*/
#include "TreeMapWidget.h"
#include <AK/Array.h>
#include <AK/NumberFormat.h>
#include <LibGUI/Painter.h>
#include <LibGUI/WindowServerConnection.h>
@ -25,7 +24,7 @@ TreeMapWidget::~TreeMapWidget()
{
}
static constexpr Array colors = {
static const Color colors[] = {
Color(253, 231, 37),
Color(148, 216, 64),
Color(60, 188, 117),

5
Userland/Applications/SpaceAnalyzer/main.cpp
View file

@ -9,7 +9,6 @@
#include <AK/Queue.h>
#include <AK/QuickSort.h>
#include <AK/RefCounted.h>
#include <AK/StringView.h>
#include <AK/URL.h>
#include <Applications/SpaceAnalyzer/SpaceAnalyzerGML.h>
#include <LibCore/DirIterator.h>
@ -28,6 +27,8 @@
#include <sys/stat.h>
#include <unistd.h>
static const char* APP_NAME = "Space Analyzer";
struct TreeNode : public SpaceAnalyzer::TreeMapNode {
TreeNode(String name)
: m_name(move(name)) {};
@ -252,8 +253,6 @@ static String get_absolute_path_to_selected_node(const SpaceAnalyzer::TreeMapWid
int main(int argc, char* argv[])
{
constexpr StringView APP_NAME = "Space Analyzer";
auto app = GUI::Application::construct(argc, argv);
RefPtr<Tree> tree = adopt_ref(*new Tree(""));