Remove obsolete database repair feature

keepassxreboot · Sep 26, 2018 · 84efca5 · 84efca5
1 parent d4112fe
commit 84efca5
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 391 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -85,7 +85,6 @@ set(keepassx_SOURCES
     format/KeePass1Reader.cpp
     format/KeePass2.cpp
     format/KeePass2RandomStream.cpp
-    format/KeePass2Repair.cpp
     format/KdbxReader.cpp
     format/KdbxWriter.cpp
     format/KdbxXmlReader.cpp
@@ -102,7 +101,6 @@ set(keepassx_SOURCES
     gui/Clipboard.cpp
     gui/CloneDialog.cpp
     gui/DatabaseOpenWidget.cpp
-    gui/DatabaseRepairWidget.cpp
     gui/DatabaseTabWidget.cpp
     gui/DatabaseWidget.cpp
     gui/DatabaseWidgetStateSync.cpp
@@ -113,7 +111,6 @@ set(keepassx_SOURCES
     gui/EditWidgetIcons.cpp
     gui/EditWidgetProperties.cpp
     gui/FileDialog.cpp
-    gui/masterkey/KeyComponentWidget.cpp
     gui/Font.cpp
     gui/IconModels.cpp
     gui/KeePass1OpenWidget.cpp
@@ -150,16 +147,17 @@ set(keepassx_SOURCES
     gui/group/EditGroupWidget.cpp
     gui/group/GroupModel.cpp
     gui/group/GroupView.cpp
+    gui/masterkey/KeyComponentWidget.cpp
     gui/masterkey/PasswordEditWidget.cpp
     gui/masterkey/YubiKeyEditWidget.cpp
     gui/masterkey/KeyFileEditWidget.cpp
-    gui/settings/SettingsWidget.cpp
     gui/dbsettings/DatabaseSettingsWidget.cpp
     gui/dbsettings/DatabaseSettingsDialog.cpp
     gui/dbsettings/DatabaseSettingsWidgetGeneral.cpp
-        gui/dbsettings/DatabaseSettingsWidgetMetaDataSimple.cpp
+    gui/dbsettings/DatabaseSettingsWidgetMetaDataSimple.cpp
     gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp
-        gui/dbsettings/DatabaseSettingsWidgetMasterKey.cpp
+    gui/dbsettings/DatabaseSettingsWidgetMasterKey.cpp
+    gui/settings/SettingsWidget.cpp
     gui/wizard/NewDatabaseWizard.cpp
     gui/wizard/NewDatabaseWizardPage.cpp
     gui/wizard/NewDatabaseWizardPageMetaData.cpp

diff --git a/src/format/KdbxReader.cpp b/src/format/KdbxReader.cpp
@@ -120,11 +120,6 @@ QByteArray KdbxReader::xmlData() const
     return m_xmlData;
 }
 
-QByteArray KdbxReader::streamKey() const
-{
-    return m_protectedStreamKey;
-}
-
 KeePass2::ProtectedStreamAlgo KdbxReader::protectedStreamAlgo() const
 {
     return m_irsAlgo;

diff --git a/src/format/KdbxReader.h b/src/format/KdbxReader.h
@@ -48,7 +48,6 @@ class KdbxReader
     bool saveXml() const;
     void setSaveXml(bool save);
     QByteArray xmlData() const;
-    QByteArray streamKey() const;
     KeePass2::ProtectedStreamAlgo protectedStreamAlgo() const;
 
 protected:

diff --git a/src/format/KeePass2Repair.cpp b/src/format/KeePass2Repair.cpp
diff --git a/src/format/KeePass2Repair.h b/src/format/KeePass2Repair.h
diff --git a/src/gui/DatabaseRepairWidget.cpp b/src/gui/DatabaseRepairWidget.cpp
diff --git a/src/gui/DatabaseRepairWidget.h b/src/gui/DatabaseRepairWidget.h