it works; closes #8

swisssurfer/src/browser.hxx

@@ -26,7 +26,7 @@
 #include <cassert>
 #include <QtCore/QDebug>
 
-#define LOG qDebug()<<__PRETTY_FUNCTION__;
+#define LOG qDebug()<<__PRETTY_FUNCTION__
 
 class SslClientAuthNetworkAccessManager: public QNetworkAccessManager {
     Q_OBJECT;
@@ -42,7 +42,7 @@ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager {
     virtual QNetworkReply* createRequest(Operation op,
                                          const QNetworkRequest& req,
                                          QIODevice* outgoingData = 0 ) {
-      LOG;
+      LOG<<req.url();
       QNetworkReply* rep
         (QNetworkAccessManager::createRequest(op, req, outgoingData));
       //qDebug()<<"Reply created: "<<(int)rep;
@@ -60,7 +60,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
     Browser(const QString& url, bool kiosk = false, bool proxydetection = true):
         _url(0), _home(url), _proxy(0),
         _kiosk(kiosk) {
-      LOG;
+      LOG<<url;
       if (!check(url))
         throw std::runtime_error(tr("access to URL %1 not allowed")
                                  .arg(url).toStdString());
@@ -338,7 +338,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
 
     QString networkError(QNetworkReply::NetworkError err) {
-      LOG;
+      LOG<<err;
       switch (err) {
         case QNetworkReply::NoError:
           return tr("Network connection successful, remote host can be"
@@ -427,7 +427,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
     
     void load(QUrl page) {
-      LOG;
+      LOG<<page.toString();
       statusBar()->showMessage(tr("Checking: %1").arg(page.toString()));
       try {
         if (!check(page)) {
@@ -457,7 +457,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
     
     void startDownload(QUrl url) {
-      LOG;
+      LOG<<url.toString();
       statusBar()->showMessage(tr("Reading: %1").arg(url.toString()));
       if (!url.isValid()) {
         statusBar()->showMessage(tr("Illegal URL: %1").arg(url.errorString()));
@@ -469,7 +469,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
     
     void reply_error(QNetworkReply::NetworkError err) {
-      LOG;
+      LOG<<err;
       statusBar()->showMessage(tr("network error"));
       _error += tr("<h2>%1</h2><p>%2</p>")
         .arg(tr("Reply Error"))
@@ -479,7 +479,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
     //! intermediate proxy error
     void proxy_error(QNetworkReply::NetworkError err,
                      QString errStr, QString proxy) {
-      LOG;
+      LOG<<err<<errStr;
       statusBar()->showMessage(tr("proxy error"));
       _error += tr("<h2>%1</h2><p>Proxy: %3</p><p>%2</p><p>%4</p>")
         .arg(tr("Possible Proxy Failed"))
@@ -490,7 +490,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
 
     //! final proxy error
     void proxy_error(QNetworkReply::NetworkError err) {
-      LOG;
+      LOG<<err;
       statusBar()->showMessage(tr("proxy error"));
       _error = tr("<h2>%1</h2><p>%2</p>")
         .arg(tr("Connection Cannot Be Established"))
@@ -499,7 +499,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
     
     void zoom(int i) {
-      LOG;
+      LOG<<100.0*i/10.0;
       statusBar()->showMessage(tr("Zoom: %1%").arg(100.0*i/10.0));
       _browser->setZoomFactor(i/10.0);
     }
@@ -510,12 +510,12 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
     
     void on__browser_urlChanged(const QUrl& url) {
-      LOG;
+      LOG<<url.toString();
       if (_url) _url->setText(url.toString());
     }
     
     void on__browser_linkClicked(const QUrl& url) {
-      LOG;
+      LOG<<url.toString();
       load(url);
     }
     
@@ -525,18 +525,18 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
     
     void on__browser_titleChanged(const QString& text) {
-      LOG;
+      LOG<<text;
       setWindowTitle(trUtf8("%1 - SwissSurfer").arg(text));
     }
     
     void on__browser_statusBarMessage(const QString& text) {
-      LOG;
+      LOG<<text;
       qDebug()<<"Message: "<<text;
       if (text.size()) statusBar()->showMessage(tr("Info: %1").arg(text));
     }
     
     void on__browser_loadProgress(int i) {
-      LOG;
+      LOG<<i;
       _progress->setValue(i);
     }
     
@@ -553,7 +553,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
     
     void on__browser_loadFinished(bool ok) {
-      LOG;
+      LOG<<(ok?"success":"error");
       if (!ok) {
         _browser->setHtml(tr("<html><title>Page Load Error</title>"
                              "<body><h1>Page Load Error</h1>%1"
@@ -814,7 +814,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
     
     void databaseQuotaExceeded(QWebFrame* frame, QString databaseName) {
-      LOG;
+      LOG<<databaseName;
     }
     
     void downloadRequested(const QNetworkRequest& request) {
@@ -830,22 +830,22 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
     
     void linkClicked(const QUrl& url) {
-      LOG;
+      LOG<<url.toString();
     }
     
     void linkHovered(const QString& link, const QString& title,
                      const QString& textContent) {
-      LOG;
+      LOG<<link<<title<<textContent;
       statusBar()->showMessage(tr("%1", "statusbar for hovered link %1=url")
                                .arg(link));
     }
     
     void loadFinished(bool ok) {
-      LOG;
+      LOG<<(ok?"succeess":"error");
     }
     
     void loadProgress(int progress) {
-      LOG;
+      LOG<<progress;
     }
     
     void loadStarted() {
@@ -927,7 +927,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
     
     void finished(QNetworkReply* reply) {
-      LOG;
+      LOG<<(reply->error()==QNetworkReply::NoError?"success":"error");
       if (reply->error()!=QNetworkReply::NoError) {
         _error += tr("<h2>%1</h2><p>URL: %3</p><p>%2</p>")
           .arg(tr("Network Error"))