aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/about/aboutdialog.cpp6
-rw-r--r--lib/configuration/configuration.cpp16
-rw-r--r--lib/configuration/defaults.h.in14
3 files changed, 18 insertions, 18 deletions
diff --git a/lib/about/aboutdialog.cpp b/lib/about/aboutdialog.cpp
index 2a3d210..c7ed385 100644
--- a/lib/about/aboutdialog.cpp
+++ b/lib/about/aboutdialog.cpp
@@ -8,7 +8,7 @@
#include "aboutdialog.h"
#include "ui_aboutdialog.h"
-#include "version.h"
+#include <version.h>
#include <QtWebEngine/QtWebEngineVersion>
#include <boost/version.hpp>
@@ -50,8 +50,8 @@ AboutDialog::AboutDialog(QWidget *parent)
"</ul>"
"<p>This program is distributed in the hope that it will be useful, but without any warranty.</p>"));
- ui->detailsLabel->setText(tr("<p>Version " SMOLBOTE_DESCRIBE "</p>"
- "<p>Build " SMOLBOTE_BUILD "</p>"
+ ui->detailsLabel->setText(tr("<p>Version " poi_Describe "</p>"
+ "<p>Build " poi_Build "</p>"
"<p>Compiled with " compiler "</p>"));
}
diff --git a/lib/configuration/configuration.cpp b/lib/configuration/configuration.cpp
index 48acecf..cf58d82 100644
--- a/lib/configuration/configuration.cpp
+++ b/lib/configuration/configuration.cpp
@@ -18,8 +18,8 @@ namespace po = boost::program_options;
inline std::string defaultUserConfigLocation()
{
-#ifdef ConfigPath
- return ConfigPath;
+#ifdef Path_Config
+ return Path_Config;
#else
// try to locate an existing config
QString path = QStandardPaths::locate(QStandardPaths::ConfigLocation, "smolbote/smolbote.cfg");
@@ -55,7 +55,7 @@ Configuration::Configuration(QObject *parent)
("browser.locale", po::value<std::string>(), "Set Qt localization.")
("browser.translation", po::value<std::string>(), "Set application localization.")
- ("browser.crash.path", po::value<std::string>()->default_value(CrashdumpPath))
+ ("browser.crash.path", po::value<std::string>()->default_value(Path_Crashdump))
("browser.crash.handler", po::value<std::string>())
// main window ui
@@ -100,7 +100,7 @@ Configuration::Configuration(QObject *parent)
("subwindow.shortcuts.fullscreen", po::value<std::string>()->default_value("F11"))
// Filter settings
- ("filter.path", po::value<std::string>()->default_value(FilterPath))
+ ("filter.path", po::value<std::string>()->default_value(Path_Filter))
("filter.adblock", po::value<std::string>())
("filter.header", po::value<std::vector<std::string>>())
// ("filter.cookies.block.all", po::value<bool>()->default_value(false))
@@ -108,22 +108,22 @@ Configuration::Configuration(QObject *parent)
// ("filter.cookies.path", po::value<std::string>()->default_value("~/.config/smolbote/cookies.d"))
// Plugin settings
- ("plugins.path", po::value<std::string>()->default_value(PluginsPath))
+ ("plugins.path", po::value<std::string>()->default_value(Path_Plugins))
// Profile settings
// default profile name the browser should use; "" is off-the-record
("profile.default", po::value<std::string>()->default_value(""))
- ("profile.path", po::value<std::string>()->default_value(ProfilesPath))
+ ("profile.path", po::value<std::string>()->default_value(Path_Profiles))
("profile.search", po::value<std::string>()->default_value("https://duckduckgo.com/?q=%1&ia=web"))
("profile.homepage", po::value<std::string>()->default_value("about:blank"))
("profile.newtab", po::value<std::string>()->default_value("about:blank"))
// Bookmark settings
- ("bookmarks.path", po::value<std::string>()->default_value(BookmarksPath))
+ ("bookmarks.path", po::value<std::string>()->default_value(Path_Bookmarks))
("bookmarks.shortcut", po::value<std::string>()->default_value("Ctrl+B"))
// Downloads settings
- ("downloads.path", po::value<std::string>()->default_value(DownloadsPath))
+ ("downloads.path", po::value<std::string>()->default_value(Path_Downloads))
("downloads.shortcut", po::value<std::string>()->default_value("Ctrl+D"))
;
}
diff --git a/lib/configuration/defaults.h.in b/lib/configuration/defaults.h.in
index f239b14..6a7232e 100644
--- a/lib/configuration/defaults.h.in
+++ b/lib/configuration/defaults.h.in
@@ -1,14 +1,14 @@
#ifndef SMOLBOTE_DEFAULTS
#define SMOLBOTE_DEFAULTS
-#cmakedefine ConfigPath "@ConfigPath@"
-#cmakedefine CrashdumpPath "@CrashdumpPath@"
+#cmakedefine Path_Config "@Path_Config@"
+#cmakedefine Path_Crashdump "@Path_Crashdump@"
-#cmakedefine FilterPath "@FilterPath@"
-#cmakedefine PluginsPath "@PluginsPath@"
-#cmakedefine ProfilesPath "@ProfilesPath@"
+#cmakedefine Path_Filter "@Path_Filter@"
+#cmakedefine Path_Plugins "@Path_Plugins@"
+#cmakedefine Path_Profiles "@Path_Profiles@"
-#cmakedefine BookmarksPath "@BookmarksPath@"
-#cmakedefine DownloadsPath "@DownloadsPath@"
+#cmakedefine Path_Bookmarks "@Path_Bookmarks@"
+#cmakedefine Path_Downloads "@Path_Downloads@"
#endif // SMOLBOTE_DEFAULTS