mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename s to httpServer

Browse Source
This commit is contained in:
Luis Ángel San Martín 2022-10-13 23:30:04 +02:00
parent be0c0ff341
commit 05a3172012
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
YACReaderLibrary/library_window.cpp
View File

@ -2596,7 +2596,7 @@ void LibraryWindow::showImportComicsInfo()
importComicsInfoDialog->open(); importComicsInfoDialog->open();
} }
#include "yacreader_http_server.h" #include "yacreader_http_server.h"
extern YACReaderHttpServer *s; extern YACReaderHttpServer *httpServer;
void LibraryWindow::closeEvent(QCloseEvent *event) void LibraryWindow::closeEvent(QCloseEvent *event)
{ {
if (!trayIconController->handleCloseToTrayIcon(event)) { if (!trayIconController->handleCloseToTrayIcon(event)) {
@ -2607,7 +2607,7 @@ void LibraryWindow::closeEvent(QCloseEvent *event)
void LibraryWindow::prepareToCloseApp() void LibraryWindow::prepareToCloseApp()
{ {
s->stop(); httpServer->stop();
settings->setValue(MAIN_WINDOW_GEOMETRY, saveGeometry()); settings->setValue(MAIN_WINDOW_GEOMETRY, saveGeometry());
contentViewsManager->comicsView->close(); contentViewsManager->comicsView->close();

10
YACReaderLibrary/main.cpp
View File

@ -30,7 +30,7 @@
#define PICTUREFLOW_QT4 1 #define PICTUREFLOW_QT4 1
// Server interface // Server interface
YACReaderHttpServer *s; YACReaderHttpServer *httpServer;
using namespace QsLogging; using namespace QsLogging;
@ -244,10 +244,10 @@ int main(int argc, char **argv)
QSettings *settings = new QSettings(YACReader::getSettingsPath() + "/YACReaderLibrary.ini", QSettings::IniFormat); QSettings *settings = new QSettings(YACReader::getSettingsPath() + "/YACReaderLibrary.ini", QSettings::IniFormat);
settings->beginGroup("libraryConfig"); settings->beginGroup("libraryConfig");
s = new YACReaderHttpServer(); httpServer = new YACReaderHttpServer();
if (settings->value(SERVER_ON, true).toBool()) { if (settings->value(SERVER_ON, true).toBool()) {
s->start(); httpServer->start();
} }
#endif #endif
@ -276,8 +276,8 @@ int main(int argc, char **argv)
YACReader::exitCheck(ret); YACReader::exitCheck(ret);
// shutdown // shutdown
s->stop(); httpServer->stop();
delete s; delete httpServer;
localServer->close(); localServer->close();
delete localServer; delete localServer;
delete mw; delete mw;

18
YACReaderLibrary/server_config_dialog.cpp
View File

@ -78,7 +78,7 @@ QList<QString> addresses()
#endif #endif
extern YACReaderHttpServer *s; extern YACReaderHttpServer *httpServer;
ServerConfigDialog::ServerConfigDialog(QWidget *parent) ServerConfigDialog::ServerConfigDialog(QWidget *parent)
: QDialog(parent) : QDialog(parent)
@ -184,11 +184,11 @@ void ServerConfigDialog::enableServer(int status)
settings->beginGroup("libraryConfig"); settings->beginGroup("libraryConfig");
if (status == Qt::Checked) { if (status == Qt::Checked) {
s->start(); httpServer->start();
this->generateQR(); this->generateQR();
settings->setValue(SERVER_ON, true); settings->setValue(SERVER_ON, true);
} else { } else {
s->stop(); httpServer->stop();
qrCode->setPixmap(QPixmap()); qrCode->setPixmap(QPixmap());
ip->clear(); ip->clear();
port->setText(""); port->setText("");
@ -247,14 +247,14 @@ void ServerConfigDialog::generateQR()
if (otherAddresses.length() > 0 || !dir.isEmpty()) { if (otherAddresses.length() > 0 || !dir.isEmpty()) {
if (!dir.isEmpty()) { if (!dir.isEmpty()) {
generateQR(dir + ":" + s->getPort()); generateQR(dir + ":" + httpServer->getPort());
ip->addItem(dir); ip->addItem(dir);
} else { } else {
generateQR(otherAddresses.first() + ":" + s->getPort()); generateQR(otherAddresses.first() + ":" + httpServer->getPort());
} }
ip->addItems(otherAddresses); ip->addItems(otherAddresses);
port->setText(s->getPort()); port->setText(httpServer->getPort());
} }
} }
@ -280,7 +280,7 @@ void ServerConfigDialog::generateQR(const QString &serverAddress)
void ServerConfigDialog::regenerateQR(const QString &ip) void ServerConfigDialog::regenerateQR(const QString &ip)
{ {
generateQR(ip + ":" + s->getPort()); generateQR(ip + ":" + httpServer->getPort());
} }
void ServerConfigDialog::updatePort() void ServerConfigDialog::updatePort()
@ -291,8 +291,8 @@ void ServerConfigDialog::updatePort()
settings->setValue("port", port->text().toInt()); settings->setValue("port", port->text().toInt());
settings->endGroup(); settings->endGroup();
s->stop(); httpServer->stop();
s->start(); httpServer->start();
generateQR(ip->currentText() + ":" + port->text()); generateQR(ip->currentText() + ":" + port->text());
} }

12
YACReaderLibraryServer/main.cpp
View File

@ -194,7 +194,7 @@ int main(int argc, char **argv)
settings->beginGroup("libraryConfig"); settings->beginGroup("libraryConfig");
// server // server
YACReaderHttpServer *s = new YACReaderHttpServer(); YACReaderHttpServer *httpServer = new YACReaderHttpServer();
if (parser.isSet("port")) { if (parser.isSet("port")) {
bool valid; bool valid;
qint32 port = parser.value("port").toInt(&valid); qint32 port = parser.value("port").toInt(&valid);
@ -203,14 +203,14 @@ int main(int argc, char **argv)
parser.showHelp(); parser.showHelp();
return 0; return 0;
} else { } else {
s->start(port); httpServer->start(port);
} }
} else { } else {
s->start(); httpServer->start();
} }
QLOG_INFO() << "Running on port" << s->getPort(); QLOG_INFO() << "Running on port" << httpServer->getPort();
// Update libraries to new versions // Update libraries to new versions
LibrariesUpdater updater; LibrariesUpdater updater;
@ -223,8 +223,8 @@ int main(int argc, char **argv)
QLOG_INFO() << "YACReaderLibrary closed with exit code :" << ret; QLOG_INFO() << "YACReaderLibrary closed with exit code :" << ret;
// shutdown // shutdown
s->stop(); httpServer->stop();
delete s; delete httpServer;
localServer->close(); localServer->close();
delete localServer; delete localServer;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN