AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

codestyle fixes

Browse source
This commit is contained in:
pokamest 2021-09-06 12:39:46 +03:00
parent ea551ab0a0
commit d1ea625435
9 changed files with 9 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

45
client/ui/pages_logic/AppSettingsLogic.cpp
View file

@ -1,53 +1,12 @@
#include <QApplication>
#include <QClipboard>
#include <QDebug>
#include <QDesktopServices>
#include <QFileDialog>
#include <QHBoxLayout>
#include <QHostInfo>
#include <QItemSelectionModel>
#include <QJsonDocument>
#include <QJsonObject>
#include <QKeyEvent>
#include <QMenu>
#include <QMessageBox>
#include <QMetaEnum>
#include <QSysInfo>
#include <QThread>
#include <QTimer>
#include <QRegularExpression>
#include <QSaveFile>
//#include "configurators/cloak_configurator.h"
//#include "configurators/vpn_configurator.h"
//#include "configurators/openvpn_configurator.h"
//#include "configurators/shadowsocks_configurator.h"
//#include "configurators/ssh_configurator.h"
//#include "core/servercontroller.h"
//#include "core/server_defs.h"
//#include "core/errorstrings.h"
//#include "protocols/protocols_defs.h"
//#include "protocols/shadowsocksvpnprotocol.h"
#include "ui/qautostart.h"
#include "AppSettingsLogic.h"
#include "debug.h"
#include "defines.h"
#include "AppSettingsLogic.h"
#include "utils.h"
#include "vpnconnection.h"
#include <functional>
#if defined Q_OS_MAC || defined Q_OS_LINUX
#include "ui/macos_util.h"
#endif
#include "ui/qautostart.h"
using namespace amnezia;
using namespace PageEnumNS;
AppSettingsLogic::AppSettingsLogic(UiLogic *uiLogic, QObject *parent):
QObject(parent),
m_uiLogic(uiLogic),

2
client/ui/pages_logic/GeneralSettingsLogic.cpp
View file

@ -1,11 +1,11 @@
#include "GeneralSettingsLogic.h"
#include "../uilogic.h"
#include "ShareConnectionLogic.h"
using namespace amnezia;
using namespace PageEnumNS;
GeneralSettingsLogic::GeneralSettingsLogic(UiLogic *uiLogic, QObject *parent):
QObject(parent),
m_uiLogic(uiLogic)

23
client/ui/pages_logic/NetworkSettingsLogic.cpp
View file

@ -1,32 +1,11 @@
//#include <QApplication>
//#include <QClipboard>
//#include <QDebug>
//#include <QDesktopServices>
//#include <QFileDialog>
//#include <QHBoxLayout>
//#include <QHostInfo>
//#include <QItemSelectionModel>
//#include <QJsonDocument>
//#include <QJsonObject>
//#include <QKeyEvent>
//#include <QMenu>
//#include <QMessageBox>
//#include <QMetaEnum>
//#include <QSysInfo>
//#include <QThread>
//#include <QTimer>
//#include <QRegularExpression>
//#include <QSaveFile>
#include "NetworkSettingsLogic.h"
#include "defines.h"
#include "NetworkSettingsLogic.h"
#include "utils.h"
using namespace amnezia;
using namespace PageEnumNS;
NetworkSettingsLogic::NetworkSettingsLogic(UiLogic *uiLogic, QObject *parent):
QObject(parent),
m_uiLogic(uiLogic),

43
client/ui/pages_logic/NewServerLogic.cpp
View file

@ -1,51 +1,8 @@
#include <QApplication>
#include <QClipboard>
#include <QDebug>
#include <QDesktopServices>
#include <QFileDialog>
#include <QHBoxLayout>
#include <QHostInfo>
#include <QItemSelectionModel>
#include <QJsonDocument>
#include <QJsonObject>
#include <QKeyEvent>
#include <QMenu>
#include <QMessageBox>
#include <QMetaEnum>
#include <QSysInfo>
#include <QThread>
#include <QTimer>
#include <QRegularExpression>
#include <QSaveFile>
//#include "configurators/cloak_configurator.h"
//#include "configurators/vpn_configurator.h"
//#include "configurators/openvpn_configurator.h"
//#include "configurators/shadowsocks_configurator.h"
//#include "configurators/ssh_configurator.h"
//#include "core/servercontroller.h"
//#include "core/server_defs.h"
//#include "core/errorstrings.h"
//#include "protocols/protocols_defs.h"
//#include "protocols/shadowsocksvpnprotocol.h"
#include "debug.h"
#include "defines.h"
#include "NewServerLogic.h"
#include "utils.h"
#include "vpnconnection.h"
#include <functional>
#if defined Q_OS_MAC || defined Q_OS_LINUX
#include "ui/macos_util.h"
#endif
using namespace amnezia;
using namespace PageEnumNS;
NewServerLogic::NewServerLogic(UiLogic *uiLogic, QObject *parent):
QObject(parent),
m_uiLogic(uiLogic)

40
client/ui/pages_logic/ServerListLogic.cpp
View file

@ -1,49 +1,11 @@
#include <QApplication>
#include <QClipboard>
#include <QDebug>
#include <QDesktopServices>
#include <QFileDialog>
#include <QHBoxLayout>
#include <QHostInfo>
#include <QItemSelectionModel>
#include <QJsonDocument>
#include <QJsonObject>
#include <QKeyEvent>
#include <QMenu>
#include <QMessageBox>
#include <QMetaEnum>
#include <QSysInfo>
#include <QThread>
#include <QTimer>
#include <QRegularExpression>
#include <QSaveFile>
//#include "configurators/cloak_configurator.h"
//#include "configurators/vpn_configurator.h"
//#include "configurators/openvpn_configurator.h"
//#include "configurators/shadowsocks_configurator.h"
//#include "configurators/ssh_configurator.h"
//#include "core/servercontroller.h"
//#include "core/server_defs.h"
//#include "core/errorstrings.h"
//#include "protocols/protocols_defs.h"
//#include "protocols/shadowsocksvpnprotocol.h"
#include "debug.h"
#include "defines.h"
#include "ServerListLogic.h"
#include "utils.h"
#include "vpnconnection.h"
#include <functional>
#include "vpnconnection.h"
#include "../uilogic.h"
using namespace amnezia;
using namespace PageEnumNS;
ServerListLogic::ServerListLogic(UiLogic *uiLogic, QObject *parent):
QObject(parent),
m_uiLogic(uiLogic),

29
client/ui/pages_logic/ShareConnectionLogic.cpp
View file

@ -1,42 +1,20 @@
#include <QApplication>
#include <QApplication>
#include <QBuffer>
#include <QClipboard>
//#include <QDesktopServices>
#include <QFileDialog>
//#include <QHBoxLayout>
//#include <QHostInfo>
//#include <QItemSelectionModel>
//#include <QJsonDocument>
//#include <QJsonObject>
//#include <QKeyEvent>
//#include <QMenu>
//#include <QMessageBox>
//#include <QMetaEnum>
//#include <QSysInfo>
//#include <QThread>
#include <QTimer>
//#include <QRegularExpression>
#include <QSaveFile>
#include <QStandardPaths>
#include "ShareConnectionLogic.h"
#include "configurators/cloak_configurator.h"
#include "configurators/vpn_configurator.h"
#include "configurators/openvpn_configurator.h"
#include "configurators/shadowsocks_configurator.h"
#include "configurators/ssh_configurator.h"
//#include "core/servercontroller.h"
//#include "core/server_defs.h"
//#include "core/errorstrings.h"
//#include "protocols/protocols_defs.h"
//#include "protocols/shadowsocksvpnprotocol.h"
//#include "debug.h"
#include "defines.h"
#include "ShareConnectionLogic.h"
//#include "utils.h"
//#include "vpnconnection.h"
#include <functional>
#include "../uilogic.h"
@ -44,7 +22,6 @@
using namespace amnezia;
using namespace PageEnumNS;
ShareConnectionLogic::ShareConnectionLogic(UiLogic *uiLogic, QObject *parent):
QObject(parent),
m_uiLogic(uiLogic),

4
client/ui/pages_logic/SitesLogic.cpp
View file

@ -1,9 +1,8 @@
#include <QDebug>
#include <QDebug>
#include <QDesktopServices>
#include <QFile>
#include <QHostInfo>
#include "SitesLogic.h"
#include "utils.h"
#include "vpnconnection.h"
@ -12,7 +11,6 @@
#include "../uilogic.h"
#include "../sites_model.h"
using namespace amnezia;
using namespace PageEnumNS;

1
client/ui/pages_logic/StartPageLogic.cpp
View file

@ -6,7 +6,6 @@
using namespace amnezia;
using namespace PageEnumNS;
StartPageLogic::StartPageLogic(UiLogic *uiLogic, QObject *parent):
QObject(parent),
m_uiLogic(uiLogic),

40
client/ui/pages_logic/WizardLogic.cpp
View file

@ -1,49 +1,9 @@
#include <QApplication>
#include <QClipboard>
#include <QDebug>
#include <QDesktopServices>
#include <QFileDialog>
#include <QHBoxLayout>
#include <QHostInfo>
#include <QItemSelectionModel>
#include <QJsonDocument>
#include <QJsonObject>
#include <QKeyEvent>
#include <QMenu>
#include <QMessageBox>
#include <QMetaEnum>
#include <QSysInfo>
#include <QThread>
#include <QTimer>
#include <QRegularExpression>
#include <QSaveFile>
//#include "configurators/cloak_configurator.h"
//#include "configurators/vpn_configurator.h"
//#include "configurators/openvpn_configurator.h"
//#include "configurators/shadowsocks_configurator.h"
//#include "configurators/ssh_configurator.h"
//#include "core/servercontroller.h"
//#include "core/server_defs.h"
//#include "core/errorstrings.h"
//#include "protocols/protocols_defs.h"
//#include "protocols/shadowsocksvpnprotocol.h"
//#include "debug.h"
//#include "defines.h"
#include "WizardLogic.h"
//#include "utils.h"
//#include "vpnconnection.h"
//#include <functional>
#include "../uilogic.h"
using namespace amnezia;
using namespace PageEnumNS;
WizardLogic::WizardLogic(UiLogic *uiLogic, QObject *parent):
QObject(parent),
m_uiLogic(uiLogic),