Skip to content

Commit

Permalink
Fix build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Eeems committed Jan 16, 2024
1 parent 825980b commit 35d329b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
16 changes: 8 additions & 8 deletions applications/xdg-settings/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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}");
Expand All @@ -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}");
Expand All @@ -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}");
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand All @@ -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);
}
2 changes: 2 additions & 0 deletions shared/liboxide/oxide_sentry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 35d329b

Please sign in to comment.