From 8cb6f64820b4bf39c64803db21a58e135465ff4f Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Mon, 13 Apr 2020 21:34:47 +0300
Subject: Move smolbote headers to include/smolbote

Headers will be installed to include/smolbote/
---
 src/browser.cpp             | 2 +-
 src/browser.h               | 2 +-
 src/builtins.h              | 2 +-
 src/main.cpp                | 1 -
 src/mainwindow/mainwindow.h | 2 +-
 src/session/sessiondialog.h | 2 +-
 src/subwindow/subwindow.h   | 2 +-
 src/version.h.in            | 8 ++++++++
 src/webengine/webview.h     | 2 +-
 9 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 src/version.h.in

(limited to 'src')

diff --git a/src/browser.cpp b/src/browser.cpp
index 3c39ec7..611a94b 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -36,7 +36,7 @@
 #include <QTimer>
 #include <QTranslator>
 #include <QVersionNumber>
-#include <plugininterface.h>
+#include "smolbote/plugininterface.h"
 #include <pluginloader.h>
 #include <spdlog/spdlog.h>
 #include <version.h>
diff --git a/src/browser.h b/src/browser.h
index 95ce936..ed585fc 100644
--- a/src/browser.h
+++ b/src/browser.h
@@ -9,7 +9,7 @@
 #ifndef SMOLBOTE_BROWSER_H
 #define SMOLBOTE_BROWSER_H
 
-#include "session.hpp"
+#include "smolbote/session.hpp"
 #include <QJsonObject>
 #include <QMenu>
 #include <QPluginLoader>
diff --git a/src/builtins.h b/src/builtins.h
index f805f6b..9534df0 100644
--- a/src/builtins.h
+++ b/src/builtins.h
@@ -10,7 +10,7 @@
 #define SMOLBOTE_BUILTINS_H
 
 #include <args.hxx>
-#include <plugininterface.h>
+#include "smolbote/plugininterface.h"
 
 typedef std::function<int(const std::string &, std::vector<std::string>::const_iterator, std::vector<std::string>::const_iterator)> subcommand_func;
 typedef std::unordered_map<std::string, subcommand_func> command_map;
diff --git a/src/main.cpp b/src/main.cpp
index 9ceda77..ca85b65 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,6 @@
 #include <QStandardPaths>
 #include <iostream>
 #include <memory>
-#include <plugininterface.h>
 #include <pluginloader.h>
 #include <spdlog/spdlog.h>
 
diff --git a/src/mainwindow/mainwindow.h b/src/mainwindow/mainwindow.h
index 2b9f82b..40f5c2d 100644
--- a/src/mainwindow/mainwindow.h
+++ b/src/mainwindow/mainwindow.h
@@ -9,7 +9,7 @@
 #ifndef SMOLBOTE_MAINWINDOW_H
 #define SMOLBOTE_MAINWINDOW_H
 
-#include "session.hpp"
+#include "smolbote/session.hpp"
 #include "subwindow/subwindow.h"
 #include <QJsonArray>
 #include <QJsonObject>
diff --git a/src/session/sessiondialog.h b/src/session/sessiondialog.h
index 0a04940..ecbfe46 100644
--- a/src/session/sessiondialog.h
+++ b/src/session/sessiondialog.h
@@ -9,7 +9,7 @@
 #ifndef SMOLBOTE_SESSIONDIALOG_H
 #define SMOLBOTE_SESSIONDIALOG_H
 
-#include "session.hpp"
+#include "smolbote/session.hpp"
 #include <QDialog>
 
 namespace Ui
diff --git a/src/subwindow/subwindow.h b/src/subwindow/subwindow.h
index 02f50d0..5bd91cb 100644
--- a/src/subwindow/subwindow.h
+++ b/src/subwindow/subwindow.h
@@ -9,7 +9,7 @@
 #ifndef SMOLBOTE_SUBWINDOW_H
 #define SMOLBOTE_SUBWINDOW_H
 
-#include "session.hpp"
+#include "smolbote/session.hpp"
 #include "tabwidget.h"
 #include "webengine/webview.h"
 #include <QMenu>
diff --git a/src/version.h.in b/src/version.h.in
new file mode 100644
index 0000000..44f10d9
--- /dev/null
+++ b/src/version.h.in
@@ -0,0 +1,8 @@
+#ifndef SMOLBOTE_VERSION_H
+#define SMOLBOTE_VERSION_H
+
+// output of 'git describe --long --abbrev=40':
+// x.y.z-0-g0123456789012345678901234567890123456789
+#define poi_Version "@VCS_TAG@"
+
+#endif // SMOLBOTE_VERSION_H
diff --git a/src/webengine/webview.h b/src/webengine/webview.h
index 5748691..e7d771a 100644
--- a/src/webengine/webview.h
+++ b/src/webengine/webview.h
@@ -11,7 +11,7 @@
 
 #include "webpage.h"
 #include <QWebEngineView>
-#include <session.hpp>
+#include "smolbote/session.hpp"
 
 class WebProfile;
 class SubWindow;
-- 
cgit v1.2.1