diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/App.cpp | 2 | ||||
| -rw-r--r-- | src/Configuration.hpp | 8 | ||||
| -rw-r--r-- | src/InstanceManager.hpp | 1 | ||||
| -rw-r--r-- | src/widgets/BrowserApp.cpp | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/App.cpp b/src/App.cpp index 7ce8932..63ecfa6 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -16,7 +16,7 @@ void App::run() { auto config_dir = get_cli_config_dir(); if (!config_dir.isEmpty()) - configuration.set_config_dir(config_dir); + configuration.set_user_config_dir(config_dir); if (instance_manager.is_server()) { init_server(); diff --git a/src/Configuration.hpp b/src/Configuration.hpp index 1a0f0dc..587205b 100644 --- a/src/Configuration.hpp +++ b/src/Configuration.hpp @@ -65,11 +65,11 @@ public: return QWebEngineProfile::PersistentPermissionsPolicy::StoreOnDisk; } - DEFINE_GETTER(get_config_dir, config_dir) - DEFINE_SETTER(set_config_dir, config_dir) + DEFINE_GETTER(get_user_config_dir, config_dir) + DEFINE_SETTER(set_user_config_dir, config_dir) - QString get_config_lua_init_file() const { return config_dir.filePath("init.lua"); } - QString get_config_lua_dir() const { return config_dir.filePath("lua"); } + QString get_user_config_lua_init_file() const { return config_dir.filePath("init.lua"); } + QString get_user_config_lua_dir() const { return config_dir.filePath("lua"); } private: void on_update(const QString &name, const QVariant &value) { diff --git a/src/InstanceManager.hpp b/src/InstanceManager.hpp index 47d4932..5d70347 100644 --- a/src/InstanceManager.hpp +++ b/src/InstanceManager.hpp @@ -41,6 +41,7 @@ private: bool is_server_mode = false; // TODO: On windows, \\.\pipe\null-browser + // TODO: Use path unique to app data const char *socket_path = "/tmp/null-browser-socket.sock"; }; diff --git a/src/widgets/BrowserApp.cpp b/src/widgets/BrowserApp.cpp index e57b923..9bf86d6 100644 --- a/src/widgets/BrowserApp.cpp +++ b/src/widgets/BrowserApp.cpp @@ -24,13 +24,13 @@ BrowserApp::BrowserApp(Configuration &configuration) : configuration(configurati // Global event filter qApp->installEventFilter(this); - qDebug() << "Config dir:" << configuration.get_config_dir().path(); + qDebug() << "Config dir:" << configuration.get_user_config_dir().path(); // Load lua directory into package path - lua.append_package_path(configuration.get_config_lua_dir()); + lua.append_package_path(configuration.get_user_config_lua_dir()); // Load init.lua - auto lua_init_file = configuration.get_config_lua_init_file(); + auto lua_init_file = configuration.get_user_config_lua_init_file(); if (QFile::exists(lua_init_file)) { lua.load_file_sync(lua_init_file); } else { |