mirror of
https://github.com/YACReader/yacreader
synced 2025-07-14 02:54:46 -04:00
Rename s to httpServer
This commit is contained in:
@ -78,7 +78,7 @@ QList<QString> addresses()
|
||||
|
||||
#endif
|
||||
|
||||
extern YACReaderHttpServer *s;
|
||||
extern YACReaderHttpServer *httpServer;
|
||||
|
||||
ServerConfigDialog::ServerConfigDialog(QWidget *parent)
|
||||
: QDialog(parent)
|
||||
@ -184,11 +184,11 @@ void ServerConfigDialog::enableServer(int status)
|
||||
settings->beginGroup("libraryConfig");
|
||||
|
||||
if (status == Qt::Checked) {
|
||||
s->start();
|
||||
httpServer->start();
|
||||
this->generateQR();
|
||||
settings->setValue(SERVER_ON, true);
|
||||
} else {
|
||||
s->stop();
|
||||
httpServer->stop();
|
||||
qrCode->setPixmap(QPixmap());
|
||||
ip->clear();
|
||||
port->setText("");
|
||||
@ -247,14 +247,14 @@ void ServerConfigDialog::generateQR()
|
||||
|
||||
if (otherAddresses.length() > 0 || !dir.isEmpty()) {
|
||||
if (!dir.isEmpty()) {
|
||||
generateQR(dir + ":" + s->getPort());
|
||||
generateQR(dir + ":" + httpServer->getPort());
|
||||
|
||||
ip->addItem(dir);
|
||||
} else {
|
||||
generateQR(otherAddresses.first() + ":" + s->getPort());
|
||||
generateQR(otherAddresses.first() + ":" + httpServer->getPort());
|
||||
}
|
||||
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)
|
||||
{
|
||||
generateQR(ip + ":" + s->getPort());
|
||||
generateQR(ip + ":" + httpServer->getPort());
|
||||
}
|
||||
|
||||
void ServerConfigDialog::updatePort()
|
||||
@ -291,8 +291,8 @@ void ServerConfigDialog::updatePort()
|
||||
settings->setValue("port", port->text().toInt());
|
||||
settings->endGroup();
|
||||
|
||||
s->stop();
|
||||
s->start();
|
||||
httpServer->stop();
|
||||
httpServer->start();
|
||||
|
||||
generateQR(ip->currentText() + ":" + port->text());
|
||||
}
|
||||
|
Reference in New Issue
Block a user