Merge branch 'master' of bitbucket.org:skunkos/rssguard

src/core/feeddownloader.h

@@ -35,6 +35,8 @@ struct FeedDownloadResults {
       return lhs.second > rhs.second;
     }
 
+    // QString represents title if the feed, int represents
+    // count of newly downloaded messages.
     QList<QPair<QString,int> > m_updatedFeeds;
 };
 

src/miscellaneous/application.cpp

@@ -128,13 +128,7 @@ void Application::processExecutionMessage(const QString &message) {
   qDebug("Received '%s' execution message from another application instance.", qPrintable(message));
 
   if (message == APP_IS_RUNNING) {
-    if (SystemTrayIcon::isSystemTrayActivated()) {
-      qApp->trayIcon()->showMessage(APP_NAME,
-                                    tr("Application is already running."),
-                                    QSystemTrayIcon::Information,
-                                    TRAY_ICON_BUBBLE_TIMEOUT);
-    }
-
+    showGuiMessage(APP_NAME, tr("Application is already running."), QSystemTrayIcon::Information);
     mainForm()->display();
   }
   else if (message == APP_QUIT_INSTANCE) {

src/network-web/webview.cpp

@@ -139,7 +139,7 @@ void WebView::saveCurrentPageToFile() {
       str << html_text;
       selected_file_handle.close();
     }
-    else {
+    else {     
       MessageBox::show(this, QMessageBox::Critical, tr("Cannot save web page"),
                        tr("Web page cannot be saved because destination file is not writtable."));
     }

src/qtsingleapplication/qtlocalpeer.cpp

@@ -42,6 +42,7 @@
 #include "qtlocalpeer.h"
 #include <QCoreApplication>
 #include <QTime>
+#include <QDataStream>
 
 #if defined(Q_OS_WIN)
 #include <QLibrary>