From 35d329bf34b4ae404f1010346feb9caf12965595 Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <nathaniel.vandiepen@gmail.com>
Date: Mon, 15 Jan 2024 23:06:58 -0700
Subject: [PATCH] Fix build errors

---
 applications/xdg-settings/main.cpp | 16 ++++++++--------
 shared/liboxide/oxide_sentry.cpp   |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/applications/xdg-settings/main.cpp b/applications/xdg-settings/main.cpp
index 7755558f6..49815894c 100644
--- a/applications/xdg-settings/main.cpp
+++ b/applications/xdg-settings/main.cpp
@@ -125,7 +125,7 @@ QObject* getObj(QStringList* args, int isGet = false){
     return obj;
 }
 
-int get(QCommandLineParser& parser){
+int get_command(QCommandLineParser& parser){
     parser.clearPositionalArguments();
     parser.addPositionalArgument("", "", "get");
     parser.addPositionalArgument("property", "Property to get", "{property}");
@@ -151,7 +151,7 @@ int get(QCommandLineParser& parser){
     return EXIT_SUCCESS;
 }
 
-int check(QCommandLineParser& parser){
+int check_command(QCommandLineParser& parser){
     parser.clearPositionalArguments();
     parser.addPositionalArgument("", "", "check");
     parser.addPositionalArgument("property", "Property to check", "{property}");
@@ -177,7 +177,7 @@ int check(QCommandLineParser& parser){
     return EXIT_SUCCESS;
 }
 
-int set(QCommandLineParser& parser){
+int set_command(QCommandLineParser& parser){
     parser.clearPositionalArguments();
     parser.addPositionalArgument("", "", "set");
     parser.addPositionalArgument("property", "Property to set", "{property}");
@@ -211,7 +211,7 @@ int set(QCommandLineParser& parser){
     return EXIT_FAILURE;
 }
 
-int list(QCommandLineParser& parser){
+int list_command(QCommandLineParser& parser){
     if(!parser.positionalArguments().isEmpty()){
         parser.showHelp(EXIT_FAILURE);
     }
@@ -261,7 +261,7 @@ int main(int argc, char *argv[]){
     parser.setOptionsAfterPositionalArgumentsMode(QCommandLineParser::ParseAsOptions);
     QStringList args = parser.positionalArguments();
     if(parser.isSet(listOption)){
-        return list(parser);
+        return list_command(parser);
     }
     if (args.isEmpty()) {
         parser.showHelp(EXIT_FAILURE);
@@ -271,15 +271,15 @@ int main(int argc, char *argv[]){
     auto command = args.first();
     if(command == "get"){
         parser.clearPositionalArguments();
-        return get(parser);
+        return get_command(parser);
     }
     if(command == "check"){
         parser.clearPositionalArguments();
-        return check(parser);
+        return check_command(parser);
     }
     if(command == "set"){
         parser.clearPositionalArguments();
-        return set(parser);
+        return set_command(parser);
     }
     parser.showHelp(EXIT_FAILURE);
 }
diff --git a/shared/liboxide/oxide_sentry.cpp b/shared/liboxide/oxide_sentry.cpp
index 3be3427ab..5cbf7976a 100644
--- a/shared/liboxide/oxide_sentry.cpp
+++ b/shared/liboxide/oxide_sentry.cpp
@@ -23,6 +23,8 @@ std::string readFile(const std::string& path){
     buffer << t.rdbuf();
     return buffer.str();
 }
+
+#include "devicesettings.h"
 #endif
 
 static void* invalid_mem = (void *)1;