code cleaning

Author: ddmitov

src/main.cpp

@@ -437,17 +437,17 @@ int main(int argc, char **argv)
                     mainWindow.qDisplayError(
                                 localServerSettingsFilePath + "<br>" +
                                 "is malformed.");
-                    qDebug() << localServerSettingsFilePath << "<br>"
-                             << "is malformed.";
+                    qDebug() << localServerSettingsFilePath
+                             << " is malformed.";
                 }
             }
 
             if (localServerJsonDocument.isNull()) {
                 mainWindow.qDisplayError(
                             localServerSettingsFilePath + "<br>" +
                             "is empty.");
-                qDebug() << localServerSettingsFilePath << "<br>"
-                         << "is empty.";
+                qDebug() << localServerSettingsFilePath
+                         << " is empty.";
             }
 
             // Local server has to be started as

src/peb.pro

@@ -135,7 +135,7 @@ greaterThan (QT_MAJOR_VERSION, 4) {
     }
 
     greaterThan (QT_MINOR_VERSION, 5) {
-        equals (QTWEBKIT, 0) {
+        equals (ANNULEN_QTWEBKIT, 0) {
             # Source files:
             SOURCES += \
                 main.cpp \
@@ -156,7 +156,7 @@ greaterThan (QT_MAJOR_VERSION, 4) {
                 webengine-view.h
         }
 
-        equals (QTWEBKIT, 1) {
+        equals (ANNULEN_QTWEBKIT, 1) {
             # Source files:
             SOURCES += \
                 main.cpp \

src/webengine-page.cpp

@@ -48,12 +48,6 @@ QPage::QPage()
     QWebEngineSettings::globalSettings()->
             setAttribute(QWebEngineSettings::XSSAuditingEnabled, true);
 
-    // Signal and slot for file downloads:
-//    QObject::connect(QWebEngineProfile::defaultProfile(),
-//                     SIGNAL(downloadRequested(QWebEngineDownloadItem*)),
-//                     this,
-//                     SLOT(qDownloadRequestedSlot(QWebEngineDownloadItem*)));
-
     // Signal and slot for actions taken after page is loaded:
     QObject::connect(this, SIGNAL(loadFinished(bool)),
                      this, SLOT(qPageLoadedSlot(bool)));

src/webengine-page.h

@@ -68,14 +68,6 @@ public slots:
         }
     }
 
-    // ==============================
-    // Downloads handling:
-    // ==============================
-//    void qDownloadRequestedSlot(QWebEngineDownloadItem* download) {
-//        qDebug() << "Path: " << download->path();
-//        download->accept();
-//    }
-
     // ==============================
     // Page settings handling:
     // ==============================

src/webkit-page.cpp

@@ -30,9 +30,9 @@ QPage::QPage()
 {
     // QWebPage settings:
     QNetworkProxyFactory::setUseSystemConfiguration(true);
+
     QWebSettings::globalSettings()->
             setDefaultTextEncoding(QString("utf-8"));
-
     QWebSettings::globalSettings()->
             setAttribute(QWebSettings::JavaEnabled, false);
     QWebSettings::globalSettings()->