From c97ee5dda1808ff51270c430267ff2b455d203bf Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Sat, 26 Jan 2019 01:06:03 -0600
Subject: [PATCH] Remove reverse-applicable patches.

---
 debian/changelog                              |  1 +
 .../fix-too-large-settings-dialog.patch       | 18 -----
 .../remember-window-maximization-state.patch  | 78 -------------------
 debian/patches/series                         |  2 -
 4 files changed, 1 insertion(+), 98 deletions(-)
 delete mode 100644 debian/patches/fix-too-large-settings-dialog.patch
 delete mode 100644 debian/patches/remember-window-maximization-state.patch

diff --git a/debian/changelog b/debian/changelog
index 8b6d1fe..499ada3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qterminal (0.14.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release.
     - Bump build dependencies.
+    - Remove reverse-applicable patches.
   * Bump Standards-version to 4.3.0, no changes needed.
   * Bump debhelper compat to 12, no changes needed.
   * Add new qterminal-l10n package.
diff --git a/debian/patches/fix-too-large-settings-dialog.patch b/debian/patches/fix-too-large-settings-dialog.patch
deleted file mode 100644
index 0f4f930..0000000
--- a/debian/patches/fix-too-large-settings-dialog.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Smaller settings dialog
-Author: Tsu Jan <tsujan2000@gmail.com>
-Origin: upstream
-Bug: https://github.com/lxqt/qterminal/issues/412
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1784198
-Applied-Upstream: commit:9f82b04
-Last-Update: 2018-07-29
---- a/src/propertiesdialog.cpp
-+++ b/src/propertiesdialog.cpp
-@@ -180,6 +180,8 @@ PropertiesDialog::PropertiesDialog(QWidg
- 
-     trimPastedTrailingNewlinesCheckBox->setChecked(Properties::Instance()->trimPastedTrailingNewlines);
-     confirmMultilinePasteCheckBox->setChecked(Properties::Instance()->confirmMultilinePaste);
-+
-+    resize(sizeHint()); // show it compact but not too much
- }
- 
- 
diff --git a/debian/patches/remember-window-maximization-state.patch b/debian/patches/remember-window-maximization-state.patch
deleted file mode 100644
index ab39c88..0000000
--- a/debian/patches/remember-window-maximization-state.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Description: Remember the maximization state of the window.
-Author: Simon Quigley <tsimonq2@ubuntu.com>
-Origin: upstream
-Bug: https://github.com/lxqt/qterminal/issues/450
-Bug-Ubuntu: https://launchpad.net/bugs/1754496
-Applied-Upstream: commit:14b1ee0
-Last-Update: 2018-07-20
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -193,6 +193,8 @@ MainWindow *QTerminalApp::newWindow(bool
-     else
-     {
-         window = new MainWindow(cfg, dropMode);
-+        if (Properties::Instance()->windowMaximized)
-+            window->setWindowState(Qt::WindowMaximized);
-         window->show();
-     }
-     return window;
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -542,6 +542,7 @@ void MainWindow::closeEvent(QCloseEvent
-             if (Properties::Instance()->saveSizeOnExit) {
-             	Properties::Instance()->mainWindowSize = size();
-             }
-+            Properties::Instance()->windowMaximized = isMaximized();
-             Properties::Instance()->mainWindowState = saveState();
-         }
-         Properties::Instance()->saveSettings();
-@@ -575,6 +576,7 @@ void MainWindow::closeEvent(QCloseEvent
-         Properties::Instance()->mainWindowSize = size();
-         Properties::Instance()->mainWindowState = saveState();
-         Properties::Instance()->askOnExit = !dontAskCheck->isChecked();
-+        Properties::Instance()->windowMaximized = isMaximized();
-         Properties::Instance()->saveSettings();
-         for (int i = consoleTabulator->count(); i > 0; --i) {
-             consoleTabulator->removeTab(i - 1);
---- a/src/properties.cpp
-+++ b/src/properties.cpp
-@@ -147,6 +147,8 @@ void Properties::loadSettings()
- 
-     confirmMultilinePaste = m_settings->value("ConfirmMultilinePaste", false).toBool();
-     trimPastedTrailingNewlines = m_settings->value("TrimPastedTrailingNewlines", false).toBool();
-+
-+    windowMaximized = m_settings->value("LastWindowMaximized", false).toBool();
- }
- 
- void Properties::saveSettings()
-@@ -240,9 +242,10 @@ void Properties::saveSettings()
-     m_settings->setValue("ChangeWindowIcon", changeWindowIcon);
-     m_settings->setValue("enabledBidiSupport", enabledBidiSupport);
- 
--
-     m_settings->setValue("ConfirmMultilinePaste", confirmMultilinePaste);
-     m_settings->setValue("TrimPastedTrailingNewlines", trimPastedTrailingNewlines);
-+
-+    m_settings->setValue("LastWindowMaximized", windowMaximized);
- }
- 
- void Properties::migrate_settings()
-@@ -312,6 +315,7 @@ void Properties::migrate_settings()
- 	    geom.restoreGeometry(settings.value("MainWindow/geometry").toByteArray());
-             settings.setValue("MainWindow/size", geom.size());
-             settings.setValue("MainWindow/pos", geom.pos());
-+            settings.setValue("MainWindow/isMaximized", geom.isMaximized());
-             settings.remove("MainWindow/geometry");
- 	}
-     }
---- a/src/properties.h
-+++ b/src/properties.h
-@@ -106,6 +106,8 @@ class Properties
-         bool confirmMultilinePaste;
-         bool trimPastedTrailingNewlines;
- 
-+        bool windowMaximized;
-+
- 
-     private:
- 
diff --git a/debian/patches/series b/debian/patches/series
index 6e7d3af..f9e1d23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 appdata.patch
 fix-memory-api.patch
-remember-window-maximization-state.patch
-fix-too-large-settings-dialog.patch