remove unneeded license file

2021-08-17 17:33:20 +02:00 · 2021-08-17 17:33:20 +02:00 · 993f9f7365
commit 993f9f7365
parent dd85b2905c
6 changed files with 123 additions and 232 deletions
--- a/resources/rssguard.qrc
+++ b/resources/rssguard.qrc
@ -1,125 +1,124 @@
 <RCC>
-    <qresource prefix="/">
-        <file>text/CHANGELOG</file>
-        <file>text/COPYING_BSD</file>
-        <file>text/COPYING_MIT</file>
-        <file>text/COPYING_GNU_GPL</file>
-        <file>text/COPYING_GNU_GPL_HTML</file>
+  <qresource prefix="/">
+    <file>text/CHANGELOG</file>
+    <file>text/COPYING_MIT</file>
+    <file>text/COPYING_GNU_GPL</file>
+    <file>text/COPYING_GNU_GPL_HTML</file>

-        <file>sounds/boing.wav</file>
-        <file>sounds/rooster.wav</file>
-        <file>sounds/sheep.wav</file>
+    <file>sounds/boing.wav</file>
+    <file>sounds/rooster.wav</file>
+    <file>sounds/sheep.wav</file>

-        <file>scripts/adblock/adblock-server.js</file>
-        <file>scripts/public_suffix_list.dat</file>
-        
-        <file>graphics/rssguard.ico</file>
+    <file>scripts/adblock/adblock-server.js</file>
+    <file>scripts/public_suffix_list.dat</file>

-        <file>graphics/rssguard.png</file>
-        <file>graphics/rssguard_plain.png</file>
+    <file>graphics/rssguard.ico</file>

-        <file>graphics/rssguard_mono.png</file>
-        <file>graphics/rssguard_plain_mono.png</file>
+    <file>graphics/rssguard.png</file>
+    <file>graphics/rssguard_plain.png</file>

-        <file>graphics/misc/adblock.png</file>
-        <file>graphics/misc/adblock-disabled.png</file>
-        <file>graphics/misc/bazqux.png</file>
-        <file>graphics/misc/feedly.png</file>
-        <file>graphics/misc/freshrss.png</file>
-        <file>graphics/misc/gmail.png</file>
-        <file>graphics/misc/google.png</file>
-        <file>graphics/misc/image-placeholder.png</file>
-        <file>graphics/misc/inoreader.png</file>
-        <file>graphics/misc/nextcloud.png</file>
-        <file>graphics/misc/reedah.png</file>
-        <file>graphics/misc/theoldreader.png</file>
-        <file>graphics/misc/tt-rss.png</file>
-        
-        <file>graphics/misc/flags/cs.png</file>
-        <file>graphics/misc/flags/da.png</file>
-        <file>graphics/misc/flags/de.png</file>
-        <file>graphics/misc/flags/en.png</file>
-        <file>graphics/misc/flags/en_GB.png</file>
-        <file>graphics/misc/flags/es.png</file>
-        <file>graphics/misc/flags/fi.png</file>
-        <file>graphics/misc/flags/fr.png</file>
-        <file>graphics/misc/flags/gl.png</file>
-        <file>graphics/misc/flags/he.png</file>
-        <file>graphics/misc/flags/id.png</file>
-        <file>graphics/misc/flags/it.png</file>
-        <file>graphics/misc/flags/ja.png</file>
-        <file>graphics/misc/flags/lt.png</file>
-        <file>graphics/misc/flags/nl.png</file>
-        <file>graphics/misc/flags/pl.png</file>
-        <file>graphics/misc/flags/pt_BR.png</file>
-        <file>graphics/misc/flags/pt_PT.png</file>
-        <file>graphics/misc/flags/ru.png</file>
-        <file>graphics/misc/flags/sv.png</file>
-        <file>graphics/misc/flags/uk.png</file>
-        <file>graphics/misc/flags/zh_CN.png</file>
-        <file>graphics/misc/flags/zh_TW.png</file>
-        
-        <file>skins/dark/html_adblocked.html</file>
-        <file>skins/dark/html_enclosure_every.html</file>
-        <file>skins/dark/html_enclosure_image.html</file>
-        <file>skins/dark/html_single_message.html</file>
-        <file>skins/dark/html_wrapper.html</file>
-        <file>skins/dark/metadata.xml</file>
-        <file>skins/dark/theme.css</file>
-        
-        <file>skins/vergilius/html_adblocked.html</file>
-        <file>skins/vergilius/html_enclosure_every.html</file>
-        <file>skins/vergilius/html_enclosure_image.html</file>
-        <file>skins/vergilius/html_single_message.html</file>
-        <file>skins/vergilius/html_wrapper.html</file>
-        <file>skins/vergilius/metadata.xml</file>
-        <file>skins/vergilius/theme.css</file>
-        
-        <file>initial_feeds/feeds-en.opml</file>
-        
-        <file>desktop/com.github.rssguard.desktop</file>
-        <file>desktop/com.github.rssguard.desktop.autostart</file>
-        
-        <file>../localization/rssguard_cs.qm</file>
-        <file>../localization/rssguard_da.qm</file>
-        <file>../localization/rssguard_de.qm</file>
-        <file>../localization/rssguard_en.qm</file>
-        <file>../localization/rssguard_en_GB.qm</file>
-        <file>../localization/rssguard_es.qm</file>
-        <file>../localization/rssguard_fi.qm</file>
-        <file>../localization/rssguard_fr.qm</file>
-        <file>../localization/rssguard_gl.qm</file>
-        <file>../localization/rssguard_he.qm</file>
-        <file>../localization/rssguard_id.qm</file>
-        <file>../localization/rssguard_it.qm</file>
-        <file>../localization/rssguard_ja.qm</file>
-        <file>../localization/rssguard_lt.qm</file>
-        <file>../localization/rssguard_nl.qm</file>
-        <file>../localization/rssguard_pl.qm</file>
-        <file>../localization/rssguard_pt_BR.qm</file>
-        <file>../localization/rssguard_pt_PT.qm</file>
-        <file>../localization/rssguard_ru.qm</file>
-        <file>../localization/rssguard_sv.qm</file>
-        <file>../localization/rssguard_uk.qm</file>
-        <file>../localization/rssguard_zh_CN.qm</file>
-        <file>../localization/rssguard_zh_TW.qm</file>
+    <file>graphics/rssguard_mono.png</file>
+    <file>graphics/rssguard_plain_mono.png</file>

-        <file>../localization/qtbase_cs.qm</file>
-        <file>../localization/qtbase_da.qm</file>
-        <file>../localization/qtbase_de.qm</file>
-        <file>../localization/qtbase_es.qm</file>
-        <file>../localization/qtbase_fi.qm</file>
-        <file>../localization/qtbase_fr.qm</file>
-        <file>../localization/qtbase_it.qm</file>
-        <file>../localization/qtbase_ja.qm</file>
-        <file>../localization/qtbase_lt.qm</file>
-        <file>../localization/qtbase_pl.qm</file>
-        <file>../localization/qtbase_pt_BR.qm</file>
-        <file>../localization/qtbase_pt_PT.qm</file>
-        <file>../localization/qtbase_ru.qm</file>
-        <file>../localization/qtbase_sv.qm</file>
-        <file>../localization/qtbase_uk.qm</file>
-        <file>../localization/qtbase_zh_CN.qm</file>
-        <file>../localization/qtbase_zh_TW.qm</file>
-    </qresource>
-</RCC>
+    <file>graphics/misc/adblock.png</file>
+    <file>graphics/misc/adblock-disabled.png</file>
+    <file>graphics/misc/bazqux.png</file>
+    <file>graphics/misc/feedly.png</file>
+    <file>graphics/misc/freshrss.png</file>
+    <file>graphics/misc/gmail.png</file>
+    <file>graphics/misc/google.png</file>
+    <file>graphics/misc/image-placeholder.png</file>
+    <file>graphics/misc/inoreader.png</file>
+    <file>graphics/misc/nextcloud.png</file>
+    <file>graphics/misc/reedah.png</file>
+    <file>graphics/misc/theoldreader.png</file>
+    <file>graphics/misc/tt-rss.png</file>
+
+    <file>graphics/misc/flags/cs.png</file>
+    <file>graphics/misc/flags/da.png</file>
+    <file>graphics/misc/flags/de.png</file>
+    <file>graphics/misc/flags/en.png</file>
+    <file>graphics/misc/flags/en_GB.png</file>
+    <file>graphics/misc/flags/es.png</file>
+    <file>graphics/misc/flags/fi.png</file>
+    <file>graphics/misc/flags/fr.png</file>
+    <file>graphics/misc/flags/gl.png</file>
+    <file>graphics/misc/flags/he.png</file>
+    <file>graphics/misc/flags/id.png</file>
+    <file>graphics/misc/flags/it.png</file>
+    <file>graphics/misc/flags/ja.png</file>
+    <file>graphics/misc/flags/lt.png</file>
+    <file>graphics/misc/flags/nl.png</file>
+    <file>graphics/misc/flags/pl.png</file>
+    <file>graphics/misc/flags/pt_BR.png</file>
+    <file>graphics/misc/flags/pt_PT.png</file>
+    <file>graphics/misc/flags/ru.png</file>
+    <file>graphics/misc/flags/sv.png</file>
+    <file>graphics/misc/flags/uk.png</file>
+    <file>graphics/misc/flags/zh_CN.png</file>
+    <file>graphics/misc/flags/zh_TW.png</file>
+
+    <file>skins/dark/html_adblocked.html</file>
+    <file>skins/dark/html_enclosure_every.html</file>
+    <file>skins/dark/html_enclosure_image.html</file>
+    <file>skins/dark/html_single_message.html</file>
+    <file>skins/dark/html_wrapper.html</file>
+    <file>skins/dark/metadata.xml</file>
+    <file>skins/dark/theme.css</file>
+
+    <file>skins/vergilius/html_adblocked.html</file>
+    <file>skins/vergilius/html_enclosure_every.html</file>
+    <file>skins/vergilius/html_enclosure_image.html</file>
+    <file>skins/vergilius/html_single_message.html</file>
+    <file>skins/vergilius/html_wrapper.html</file>
+    <file>skins/vergilius/metadata.xml</file>
+    <file>skins/vergilius/theme.css</file>
+
+    <file>initial_feeds/feeds-en.opml</file>
+
+    <file>desktop/com.github.rssguard.desktop</file>
+    <file>desktop/com.github.rssguard.desktop.autostart</file>
+
+    <file>../localization/rssguard_cs.qm</file>
+    <file>../localization/rssguard_da.qm</file>
+    <file>../localization/rssguard_de.qm</file>
+    <file>../localization/rssguard_en.qm</file>
+    <file>../localization/rssguard_en_GB.qm</file>
+    <file>../localization/rssguard_es.qm</file>
+    <file>../localization/rssguard_fi.qm</file>
+    <file>../localization/rssguard_fr.qm</file>
+    <file>../localization/rssguard_gl.qm</file>
+    <file>../localization/rssguard_he.qm</file>
+    <file>../localization/rssguard_id.qm</file>
+    <file>../localization/rssguard_it.qm</file>
+    <file>../localization/rssguard_ja.qm</file>
+    <file>../localization/rssguard_lt.qm</file>
+    <file>../localization/rssguard_nl.qm</file>
+    <file>../localization/rssguard_pl.qm</file>
+    <file>../localization/rssguard_pt_BR.qm</file>
+    <file>../localization/rssguard_pt_PT.qm</file>
+    <file>../localization/rssguard_ru.qm</file>
+    <file>../localization/rssguard_sv.qm</file>
+    <file>../localization/rssguard_uk.qm</file>
+    <file>../localization/rssguard_zh_CN.qm</file>
+    <file>../localization/rssguard_zh_TW.qm</file>
+
+    <file>../localization/qtbase_cs.qm</file>
+    <file>../localization/qtbase_da.qm</file>
+    <file>../localization/qtbase_de.qm</file>
+    <file>../localization/qtbase_es.qm</file>
+    <file>../localization/qtbase_fi.qm</file>
+    <file>../localization/qtbase_fr.qm</file>
+    <file>../localization/qtbase_it.qm</file>
+    <file>../localization/qtbase_ja.qm</file>
+    <file>../localization/qtbase_lt.qm</file>
+    <file>../localization/qtbase_pl.qm</file>
+    <file>../localization/qtbase_pt_BR.qm</file>
+    <file>../localization/qtbase_pt_PT.qm</file>
+    <file>../localization/qtbase_ru.qm</file>
+    <file>../localization/qtbase_sv.qm</file>
+    <file>../localization/qtbase_uk.qm</file>
+    <file>../localization/qtbase_zh_CN.qm</file>
+    <file>../localization/qtbase_zh_TW.qm</file>
+  </qresource>
+</RCC>
--- a/resources/text/COPYING_BSD
+++ b/resources/text/COPYING_BSD
@ -1,30 +0,0 @@
-Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-Contact: http://www.qt-project.org/legal
-QtSingleApplication is part of the Qt Solutions component.
-
-You may use this file under the terms of the BSD license as follows:
-
-"Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-  * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-    of its contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
--- a/src/librssguard/gui/dialogs/formabout.cpp
+++ b/src/librssguard/gui/dialogs/formabout.cpp
@ -63,13 +63,6 @@ void FormAbout::loadLicenseAndInformation() {
    m_ui.m_txtChangelog->setText(tr("Changelog not found."));
  }

-  try {
-    m_ui.m_txtLicenseBsd->setText(IOFactory::readFile(APP_INFO_PATH + QL1S("/COPYING_BSD")));
-  }
-  catch (...) {
-    m_ui.m_txtLicenseBsd->setText(tr("License not found."));
-  }
-
  try {
    m_ui.m_txtLicenseMit->setText(IOFactory::readFile(APP_INFO_PATH + QL1S("/COPYING_MIT")));
  }
--- a/src/librssguard/gui/dialogs/formabout.ui
+++ b/src/librssguard/gui/dialogs/formabout.ui
@ -92,7 +92,7 @@
      <locale language="English" country="UnitedStates"/>
     </property>
     <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
     </property>
     <widget class="QWidget" name="m_tabInfo">
      <attribute name="title">
@ -160,7 +160,7 @@ p, li { white-space: pre-wrap; }
            <x>0</x>
            <y>0</y>
            <width>685</width>
-            <height>157</height>
+            <height>184</height>
           </rect>
          </property>
          <property name="autoFillBackground">
@ -218,76 +218,6 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans Mono'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="textInteractionFlags">
-              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-             </property>
-             <property name="openExternalLinks">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-         <widget class="QWidget" name="page_BSD">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>98</width>
-            <height>69</height>
-           </rect>
-          </property>
-          <attribute name="label">
-           <string>BSD License (applies to QtSingleApplication source code)</string>
-          </attribute>
-          <layout class="QVBoxLayout" name="verticalLayout_5">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QTextBrowser" name="m_txtLicenseBsd">
-             <property name="font">
-              <font>
-               <family>DejaVu Sans Mono</family>
-              </font>
-             </property>
-             <property name="styleSheet">
-              <string notr="true"/>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::NoFrame</enum>
-             </property>
-             <property name="horizontalScrollBarPolicy">
-              <enum>Qt::ScrollBarAlwaysOff</enum>
-             </property>
-             <property name="autoFormatting">
-              <set>QTextEdit::AutoNone</set>
-             </property>
-             <property name="undoRedoEnabled">
-              <bool>false</bool>
-             </property>
-             <property name="lineWrapMode">
-              <enum>QTextEdit::WidgetWidth</enum>
-             </property>
-             <property name="readOnly">
-              <bool>true</bool>
-             </property>
-             <property name="html">
-              <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans Mono'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="textInteractionFlags">
@ -305,7 +235,7 @@ p, li { white-space: pre-wrap; }
           <rect>
            <x>0</x>
            <y>0</y>
-            <width>98</width>
+            <width>83</width>
            <height>69</height>
           </rect>
          </property>
@ -512,7 +442,6 @@ p, li { white-space: pre-wrap; }
  <tabstop>m_txtPathsSettingsFile</tabstop>
  <tabstop>m_txtPathsDatabaseRoot</tabstop>
  <tabstop>m_txtPathsSkinsRoot</tabstop>
-  <tabstop>m_txtLicenseBsd</tabstop>
 </tabstops>
 <resources/>
 <connections>
--- a/src/librssguard/gui/messagesview.cpp
+++ b/src/librssguard/gui/messagesview.cpp
@ -71,8 +71,8 @@ QByteArray MessagesView::saveHeaderState() const {
  return arr;
 }

-void MessagesView::restoreHeaderState(const QByteArray& data) {
-  QByteArray arr = data;
+void MessagesView::restoreHeaderState(const QByteArray& dta) {
+  QByteArray arr = dta;
  QDataStream inn(&arr, QIODevice::OpenModeFlag::ReadOnly);

  inn.setVersion(QDataStream::Version::Qt_4_7);
--- a/src/librssguard/gui/messagesview.h
+++ b/src/librssguard/gui/messagesview.h
@ -25,7 +25,7 @@ class MessagesView : public QTreeView {
    void reloadFontSettings();

    QByteArray saveHeaderState() const;
-    void restoreHeaderState(const QByteArray& data);
+    void restoreHeaderState(const QByteArray& dta);

  public slots:
    void keyboardSearch(const QString& search);