.h -> .hpp for clearer ABI (non)compatibility
This commit is contained in:
@@ -2,9 +2,9 @@
|
||||
#define HYPRLAND_SERVICE_H
|
||||
|
||||
#include <list>
|
||||
#include "Workspace.h"
|
||||
#include "Client.h"
|
||||
#include "WindowRule.h"
|
||||
#include "Workspace.hpp"
|
||||
#include "Client.hpp"
|
||||
#include "WindowRule.hpp"
|
||||
|
||||
class HyprlandService {
|
||||
private:
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "../include/Client.h"
|
||||
#include "../include/Client.hpp"
|
||||
|
||||
void from_json(const json& j, WorkspaceSignature& ws) {
|
||||
j.at("id").get_to(ws.id);
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include <sstream>
|
||||
#include <fstream>
|
||||
#include "../include/FileService.h"
|
||||
#include "../include/Macros.h"
|
||||
#include "../include/ShellService.h"
|
||||
#include "../include/FileService.hpp"
|
||||
#include "../include/Macros.hpp"
|
||||
#include "../include/ShellService.hpp"
|
||||
|
||||
bool FileService::doesNonEmptyFileExist(std::string path) {
|
||||
std::ifstream file(path);
|
||||
@@ -60,4 +60,4 @@ std::vector<std::string> FileService::readLines(std::string path) {
|
||||
lines.push_back(line);
|
||||
}
|
||||
return lines;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
#include "../include/HyprlandService.hpp"
|
||||
#include "../include/FileService.hpp"
|
||||
#include "../include/Macros.hpp"
|
||||
#include "../include/ShellService.hpp"
|
||||
#include <nlohmann/json.hpp>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include "../include/HyprlandService.h"
|
||||
#include "../include/ShellService.h"
|
||||
#include "../include/Macros.h"
|
||||
#include "../include/FileService.h"
|
||||
|
||||
using json = nlohmann::json;
|
||||
|
||||
std::string HyprlandService::configFilePath;
|
||||
|
||||
void HyprlandService::setConfigFilePath(std::string path) {
|
||||
//Look for substring "~/". If found, expand it
|
||||
// Look for substring "~/". If found, expand it
|
||||
const std::string tilde = "~/";
|
||||
size_t pos = path.find(tilde);
|
||||
if (pos != std::string::npos) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "../include/ShellService.h"
|
||||
#include "../include/ShellService.hpp"
|
||||
#include <pwd.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include <algorithm>
|
||||
#include "../include/WindowRule.h"
|
||||
#include "../include/WindowRule.hpp"
|
||||
|
||||
std::string WindowRule::toString() {
|
||||
std::string mode = this->tile ? "tile on" : "float on";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "../include/Workspace.h"
|
||||
#include "../include/Workspace.hpp"
|
||||
|
||||
void from_json(const nlohmann::json &j, Workspace &w) {
|
||||
j.at("id").get_to(w.id);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
#include "../include/HyprlandService.h"
|
||||
#include "../include/HyprlandService.hpp"
|
||||
|
||||
void help(char* execPath) {
|
||||
std::cerr << "Usage: " << execPath << " <config_file_path> (flags)\n\n";
|
||||
|
||||
Reference in New Issue
Block a user