Rename s to httpServer

YACReaderLibrary/library_window.cpp

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

YACReaderLibrary/main.cpp

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

YACReaderLibrary/server_config_dialog.cpp

@@ -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());
 }

YACReaderLibraryServer/main.cpp

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