minor refactor

This commit is contained in:
arm64v8a
2023-05-22 11:07:14 +09:00
parent 1b050dd3fb
commit c5122b77e4
98 changed files with 1173 additions and 1142 deletions

View File

@@ -1,28 +1,28 @@
#pragma once
#include "main/NekoRay.hpp"
#include "TrafficData.hpp"
#include "main/NekoGui.hpp"
#include "db/traffic/TrafficData.hpp"
#include "fmt/AbstractBean.hpp"
namespace NekoRay {
namespace fmt {
class SocksHttpBean;
namespace NekoGui_fmt {
class SocksHttpBean;
class ShadowSocksBean;
class ShadowSocksBean;
class VMessBean;
class VMessBean;
class TrojanVLESSBean;
class TrojanVLESSBean;
class NaiveBean;
class NaiveBean;
class HysteriaBean;
class HysteriaBean;
class CustomBean;
class CustomBean;
class ChainBean;
}; // namespace fmt
class ChainBean;
}; // namespace NekoGui_fmt
namespace NekoGui {
class ProxyEntity : public JsonStore {
public:
QString type;
@@ -30,47 +30,47 @@ namespace NekoRay {
int id = -1;
int gid = 0;
int latency = 0;
QSharedPointer<fmt::AbstractBean> bean;
QSharedPointer<traffic::TrafficData> traffic_data = QSharedPointer<traffic::TrafficData>(new traffic::TrafficData(""));
std::shared_ptr<NekoGui_fmt::AbstractBean> bean;
std::shared_ptr<NekoGui_traffic::TrafficData> traffic_data = std::make_shared<NekoGui_traffic::TrafficData>("");
QString full_test_report;
ProxyEntity(fmt::AbstractBean *bean, const QString &type_);
ProxyEntity(NekoGui_fmt::AbstractBean *bean, const QString &type_);
[[nodiscard]] QString DisplayLatency() const;
[[nodiscard]] QColor DisplayLatencyColor() const;
[[nodiscard]] fmt::ChainBean *ChainBean() const {
return (fmt::ChainBean *) bean.get();
[[nodiscard]] NekoGui_fmt::ChainBean *ChainBean() const {
return (NekoGui_fmt::ChainBean *) bean.get();
};
[[nodiscard]] fmt::SocksHttpBean *SocksHTTPBean() const {
return (fmt::SocksHttpBean *) bean.get();
[[nodiscard]] NekoGui_fmt::SocksHttpBean *SocksHTTPBean() const {
return (NekoGui_fmt::SocksHttpBean *) bean.get();
};
[[nodiscard]] fmt::ShadowSocksBean *ShadowSocksBean() const {
return (fmt::ShadowSocksBean *) bean.get();
[[nodiscard]] NekoGui_fmt::ShadowSocksBean *ShadowSocksBean() const {
return (NekoGui_fmt::ShadowSocksBean *) bean.get();
};
[[nodiscard]] fmt::VMessBean *VMessBean() const {
return (fmt::VMessBean *) bean.get();
[[nodiscard]] NekoGui_fmt::VMessBean *VMessBean() const {
return (NekoGui_fmt::VMessBean *) bean.get();
};
[[nodiscard]] fmt::TrojanVLESSBean *TrojanVLESSBean() const {
return (fmt::TrojanVLESSBean *) bean.get();
[[nodiscard]] NekoGui_fmt::TrojanVLESSBean *TrojanVLESSBean() const {
return (NekoGui_fmt::TrojanVLESSBean *) bean.get();
};
[[nodiscard]] fmt::NaiveBean *NaiveBean() const {
return (fmt::NaiveBean *) bean.get();
[[nodiscard]] NekoGui_fmt::NaiveBean *NaiveBean() const {
return (NekoGui_fmt::NaiveBean *) bean.get();
};
[[nodiscard]] fmt::HysteriaBean *HysteriaBean() const {
return (fmt::HysteriaBean *) bean.get();
[[nodiscard]] NekoGui_fmt::HysteriaBean *HysteriaBean() const {
return (NekoGui_fmt::HysteriaBean *) bean.get();
};
[[nodiscard]] fmt::CustomBean *CustomBean() const {
return (fmt::CustomBean *) bean.get();
[[nodiscard]] NekoGui_fmt::CustomBean *CustomBean() const {
return (NekoGui_fmt::CustomBean *) bean.get();
};
};
} // namespace NekoRay
} // namespace NekoGui