# # # patch "guitone/guitone.pro" # from [fdade5db8418ed62c5d79d2c441df5fed4ed137d] # to [104f3d110970801b2d22fdd1b7c85b087bb63963] # # patch "guitone/res/i18n/guitone_de.ts" # from [979448d00353b46184bc542917dff278d1727e92] # to [5f876044580631f168c398c8c89524e7d92b65cb] # # patch "guitone/src/main.cpp" # from [43f4662e814165beeb2efdf51d1cc61d29e2595c] # to [a3a0d924e82435da9d29483c1a2d6b8c8c568c14] # # patch "guitone/src/model/Ancestors.h" # from [96bfb264268ea010fb73c84264783015ce4a2d00] # to [2042668e5501c751df4b86a02675e5c8161a546e] # # patch "guitone/src/model/Attributes.h" # from [805cb82c43892deca151f03e5afb89e4a00b1164] # to [a7b1c73df151ef5180930bf524ddcf9d1cf7e3c2] # # patch "guitone/src/model/Branches.h" # from [daee1ace7318b84518c726545de40d21c7f1e471] # to [8e72e87f8978514eced60eeba3aced6cc30660f4] # # patch "guitone/src/model/Certs.h" # from [356ad2d0c6fcf3564a4f931f48706390b004e57c] # to [e8d32b9f94f50763c1f5ade9179f99670aa6d8f4] # # patch "guitone/src/model/Changeset.h" # from [aec2c1bb862b11f4baf01a3e3c7f9bb1385f373a] # to [b5d4a823d5f5e1051af07c0077288eadbd6830e6] # # patch "guitone/src/model/ChangesetModel.h" # from [d0c0e7f5e180da843b0e02daf7b292aeddbbea55] # to [b71154fb47f36c6eb1987eb1c7d3999c73426573] # # patch "guitone/src/model/ContentDiff.h" # from [86560fd61cbd407660df9eb1db3344654d7a24c0] # to [931dc830c891c5deefe0a491db07c7cfefa16210] # # patch "guitone/src/model/GetBranchLog.h" # from [06a424c0931e783b6c2821d155a38e5ddbf3bb47] # to [6669c27fea52b1e692296b3071b1eae089ae4e41] # # patch "guitone/src/model/GetFile.h" # from [e79b9ac14a8750abfed1d83e2ff1420d51130c59] # to [f75439da6bbcd81118354b29c49eba904f2d8481] # # patch "guitone/src/model/GetFileProxyModel.h" # from [e6dcebee71cfbd700b2fb47f364ea4aa2d087545] # to [753146f5845d9650b84d5856ff475d1cc1e33e24] # # patch "guitone/src/model/Inventory.h" # from [c973a25c69e174e9598df452f48a574fbf2cc29f] # to [040e1f52db9f3eba0d3bc74dee809365650931d3] # # patch "guitone/src/model/InventoryItem.h" # from [286c2bd9af01cf48a5528558047d64a25abb315b] # to [a7b11730c19cfc594eb8f0599d32f09c5560c692] # # patch "guitone/src/model/InventoryProxyModel.h" # from [9c8e8ba4e5e3ae0afaa416a333dd9bfdc32a8395] # to [82a7cc223fd65e139d05d7fb04dc34b03e19da9f] # # patch "guitone/src/model/Keys.h" # from [9335a92a16ad7116039b8b26880d1b64dde9ce69] # to [2b1655fccc0613a644b1def232bd7af392b997ce] # # patch "guitone/src/model/Manifest.h" # from [2b26676773193ef4ee19ab4d9c42c53a8d1a4ad5] # to [4530a3916c153c55e35e586bf1e58062544a24ec] # # patch "guitone/src/model/MonotoneDelegate.h" # from [a7242348c55ff0b70f05e4d5e1aa18ceaddb79ba] # to [7d78ddbcdcd2a5515d3b3b19a03a3efae9384369] # # patch "guitone/src/model/Select.h" # from [b4f7c2eb05a523897fa69b4c863b1b4dbcfda8d0] # to [1905a800de721b9228dabbb5591f44f41c2192a6] # # patch "guitone/src/model/Tags.h" # from [7437bba37f9d18d2a24ca6bf43bce34bceedd981] # to [2f3fecd5e742a7a965e9f171f2225b8b227e0beb] # # patch "guitone/src/model/Toposort.h" # from [a0ef98c646c6ab8942129e056a68f278ebc12b98] # to [5b60cda2cf8f7209a70cf2f040f75ef93c77926c] # # patch "guitone/src/monotone/Monotone.h" # from [a2e4cab1e90b5aadb1ae2f2065360b394c4821e5] # to [b4868a98a8fc895235b9ce7717537b68d38354cb] # # patch "guitone/src/util/DebugLog.h" # from [0c0c76864be358fef7f8d8f860febe98d63456b5] # to [565294b1a66a13d3c943b40c7591752cfbb65f7e] # # patch "guitone/src/util/DiffParser.h" # from [a78d2d8db7ea0476d1ead3eae0d1f5cea96f19cc] # to [fd82c036a5e3572635261011cafb8a9cc7326ea1] # # patch "guitone/src/util/IconProvider.h" # from [e1a1b01147ebc550104470e4db11db1c5a74c0a5] # to [df1a60da076aa23be38d97258f0bdbc81e03d6e8] # # patch "guitone/src/util/MemoryTrack.h" # from [b61f699af58758857dab4da64484fa695b0df122] # to [0c21500e93a756eccf6bb988852ef4b1f1702040] # # patch "guitone/src/util/Platform.h" # from [46ea612d0762af0b3c9cc3b2a0a5d003a7fc971c] # to [6f9b3eda14b1268b3822828703c04c43c64768cc] # # patch "guitone/src/util/Settings.h" # from [35f43869a3b70b6436e79d6f65b4251215e51851] # to [77d6a7df03c03f3fd17bd16cfb700db036d42ea1] # # patch "guitone/src/util/SignalWaiter.h" # from [58d9908b44bfebd70860182cfe7f84e1c51561fd] # to [4a9b5ce5ccb5c2dd9b0c41dd14130b66d6877df5] # # patch "guitone/src/util/StanzaParser.h" # from [23db6cec41455ef357740ae2cfb0108a61208b4b] # to [e2374b071d26341d4a125d8c980762927f75a862] # # patch "guitone/src/util/StdioParser.h" # from [826d89933bf5e366067cbaf2142f561667d214b0] # to [a8a7d068b94bd00fd0517175bf2e2e0aae977c34] # # patch "guitone/src/util/TreeBuilder.h" # from [65462f44014dcb058ee042aa0bad4fd9d8bd7859] # to [f6b965d4efaa5f7e20f4fe64f616736f3960c219] # # patch "guitone/src/view/AttributesView.h" # from [a982f2781cad02aad1d6793b90b5f8400f0d45c4] # to [d5157a44cb3e1e70b9322af1916d270ed634b1f7] # # patch "guitone/src/view/DiffStatusView.h" # from [6a5bdab63a2fcd6bb2d9314a660bd8d72ee58e2a] # to [8473597a362dd86521f03f5b2fce39fb1a858fb3] # # patch "guitone/src/view/DiffView.h" # from [c5acc9527a4468aae4ffb3205edbd3cea5bb812b] # to [cbdddca20df6f274fec2a5801bf37eab970860e2] # # patch "guitone/src/view/InventoryView.h" # from [6f4cd9e8324131eedf640d9a059cb425df20b301] # to [92bfe5e840d52dadb554bada105a22fd0bca7b28] # # patch "guitone/src/view/MainWindow.cpp" # from [2c9f93a0ece1daca16d26c942171d44c0f7dce3c] # to [928c4689e62b90d92c0f5ee990b80133f3c77d71] # # patch "guitone/src/view/Splitter.h" # from [eab2fe18eac4205d66b0b89b35a41dc3d0d651b2] # to [503c11e640e897c34e7be2939ceff99b24b8b61c] # # patch "guitone/src/view/TreeView.h" # from [a7e3e63e2dbc16a0549b2e8bb1d5b3c86d732ae2] # to [0f74d916f50759c27e6f07e0a0e0c81afa8a6b61] # # patch "guitone/src/view/dialogs/About.h" # from [0ed5094e111f08eb88a78342dceacdcf31e8be94] # to [b6bb434c65516574c5f1bc8c73186e49a6438ebd] # # patch "guitone/src/view/dialogs/DatabaseView.h" # from [e602f3dce6da5bab31d83cccd238f6daa05344f6] # to [562a813deec025bb308a2fbc90d85d05b404545e] # # patch "guitone/src/view/dialogs/Dialog.h" # from [446ddb002b165d79fd02585318efdb1f4bef68c8] # to [f3865b84517576b9191c8d8fc76b4ef20a8134a6] # # patch "guitone/src/view/dialogs/FileDiff.h" # from [f4327fb59eb18a63a9fedebdde851c6c96ce5b1f] # to [832e6d653be07fab74dce76c99f76316100daacb] # # patch "guitone/src/view/dialogs/GenerateKeypair.h" # from [29f0cf0d6bf366e643c61912387926fd5335bb34] # to [54144cec4622f070bc63bc7002976bf54d3dfcda] # # patch "guitone/src/view/dialogs/KeyManagement.h" # from [46be2bc349b026dcea193bcdc3b7c7b1886b29b7] # to [77df5b779e94ab036d239680b12dd01c1fc46f53] # # patch "guitone/src/view/dialogs/Preferences.h" # from [2539d6b601831dd22f53b547de06bee0789a602c] # to [6cc94cfac4718c6a315b2935f9b9d19a18ba36b8] # # patch "guitone/src/view/dialogs/RevisionDiff.h" # from [e8041a4db627afee15cf96252b5da7356f61f911] # to [98067a5945a37108899fdef92af34c406511b62a] # # patch "guitone/src/view/dialogs/RevisionManifest.h" # from [3a644401d853c433b6fe2a27205a0555204f553a] # to [9f2c873a4f81302106d52ac71d450be08e38e5cb] # # patch "guitone/src/view/dialogs/SwitchWorkspaceRevision.h" # from [52fdc436557755f6852a23cd56dc0f2e90cf69cc] # to [7bb24a412130034f1f5761cb18cb185e87b679bf] # ============================================================ --- guitone/guitone.pro fdade5db8418ed62c5d79d2c441df5fed4ed137d +++ guitone/guitone.pro 104f3d110970801b2d22fdd1b7c85b087bb63963 @@ -5,6 +5,7 @@ CONFIG += qt debug TEMPLATE = app TARGET = guitone CONFIG += qt debug +DEFINES += _DEBUG INCLUDEPATH = src/ \ src/view \ ============================================================ --- guitone/res/i18n/guitone_de.ts 979448d00353b46184bc542917dff278d1727e92 +++ guitone/res/i18n/guitone_de.ts 5f876044580631f168c398c8c89524e7d92b65cb @@ -159,22 +159,22 @@ ContentDiff - + %1 (binary) %1 (binär) - + %1 (%2 hunks) %1 (%2 Bereiche) - + Line Zeile - + File/Content Datei/Inhalt @@ -628,7 +628,7 @@ Strg+O - + No previous workspaces available. Keine vorherigen Arbeitsbereiche verfügbar. @@ -653,7 +653,7 @@ Strg+Q - + Hide ignored files Ignorierte Dateien verstecken @@ -753,7 +753,7 @@ I - + Expand tree Baum aufklappen @@ -808,57 +808,57 @@ Fehler - + Critical Monotone Error Kritischer monotone-Fehler - + Select your workspace... Wählen Sie Ihren Arbeitsbereich aus... - + Loading aborted Laden abgebrochen - + Invalid workspace Ungültiger Arbeitsbereich - + The chosen directory is no monotone workspace! Das gewählte Verzeichnis ist kein monotone-Arbeitsverzeichnis! - + Unable to execute command Konnte Kommando nicht ausführen - + Unable to execute '%1' - maybe another command is still running? Konnte '%1' nicht ausführen - eventuell läuft noch ein anderes Kommando? - + Loading workspace... Lade Arbeitsbereich... - + Show ignored files Zeige ignorierte Dateien - + Collapse tree Baum zuklappen - + &%1 %2 &%1 %2 @@ -878,7 +878,7 @@ Datenbank öffnen - + No previous databases available. Keine vorherigen geöffneten Datenbanken verfügbar. @@ -893,22 +893,22 @@ Strg+Shift+O - + Loaded database: %1 Geladene Datenbank: %1 - + Select your database... Wählen Sie eine Datenbank aus... - + monotone Databases (*.mtn *.db) monotone-Datenbanken (*.mtn *.db) - + No database loaded Keine Datenbank geladen ============================================================ --- guitone/src/main.cpp 43f4662e814165beeb2efdf51d1cc61d29e2595c +++ guitone/src/main.cpp a3a0d924e82435da9d29483c1a2d6b8c8c568c14 @@ -20,6 +20,7 @@ #include "MainWindow.h" #include "DebugLog.h" +#include "MemoryTrack.h" #include #include @@ -75,6 +76,8 @@ int main(int argc, char** argv) mainWnd->show(); app.connect(&app, SIGNAL(lastWindowClosed()), mainWnd, SLOT(quit())); - return app.exec(); + int ret = app.exec(); + writeUnfreed(); + return ret; } ============================================================ --- guitone/src/model/Ancestors.h 96bfb264268ea010fb73c84264783015ce4a2d00 +++ guitone/src/model/Ancestors.h 2042668e5501c751df4b86a02675e5c8161a546e @@ -21,7 +21,7 @@ #ifndef ANCESTORS_H #define ANCESTORS_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "AutomateCommand.h" #include "MonotoneDelegate.h" ============================================================ --- guitone/src/model/Attributes.h 805cb82c43892deca151f03e5afb89e4a00b1164 +++ guitone/src/model/Attributes.h a7b1c73df151ef5180930bf524ddcf9d1cf7e3c2 @@ -23,7 +23,7 @@ #ifndef ATTRIBUTES_H #define ATTRIBUTES_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "AutomateCommand.h" #include "MonotoneDelegate.h" ============================================================ --- guitone/src/model/Branches.h daee1ace7318b84518c726545de40d21c7f1e471 +++ guitone/src/model/Branches.h 8e72e87f8978514eced60eeba3aced6cc30660f4 @@ -21,7 +21,7 @@ #ifndef BRANCHES_H #define BRANCHES_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "AutomateCommand.h" #include "TreeBuilder.h" #include "MonotoneDelegate.h" ============================================================ --- guitone/src/model/Certs.h 356ad2d0c6fcf3564a4f931f48706390b004e57c +++ guitone/src/model/Certs.h e8d32b9f94f50763c1f5ade9179f99670aa6d8f4 @@ -23,7 +23,7 @@ #ifndef CERTS_H #define CERTS_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "AutomateCommand.h" #include "MonotoneDelegate.h" ============================================================ --- guitone/src/model/Changeset.h aec2c1bb862b11f4baf01a3e3c7f9bb1385f373a +++ guitone/src/model/Changeset.h b5d4a823d5f5e1051af07c0077288eadbd6830e6 @@ -21,7 +21,7 @@ #ifndef CHANGESET_H #define CHANGESET_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include class Changeset ============================================================ --- guitone/src/model/ChangesetModel.h d0c0e7f5e180da843b0e02daf7b292aeddbbea55 +++ guitone/src/model/ChangesetModel.h b71154fb47f36c6eb1987eb1c7d3999c73426573 @@ -21,7 +21,7 @@ #ifndef CHANGESETMODE_H #define CHANGESETMODE_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "Changeset.h" #include "GetBranchLog.h" #include "Certs.h" ============================================================ --- guitone/src/model/ContentDiff.h 86560fd61cbd407660df9eb1db3344654d7a24c0 +++ guitone/src/model/ContentDiff.h 931dc830c891c5deefe0a491db07c7cfefa16210 @@ -23,7 +23,7 @@ #ifndef CONTENT_DIFF_H #define CONTENT_DIFF_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "AutomateCommand.h" #include "DiffParser.h" #include "MonotoneDelegate.h" ============================================================ --- guitone/src/model/GetBranchLog.h 06a424c0931e783b6c2821d155a38e5ddbf3bb47 +++ guitone/src/model/GetBranchLog.h 6669c27fea52b1e692296b3071b1eae089ae4e41 @@ -21,7 +21,7 @@ #ifndef GETBRANCHLOG_H #define GETBRANCHLOG_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "Ancestors.h" #include "Select.h" #include "Toposort.h" ============================================================ --- guitone/src/model/GetFile.h e79b9ac14a8750abfed1d83e2ff1420d51130c59 +++ guitone/src/model/GetFile.h f75439da6bbcd81118354b29c49eba904f2d8481 @@ -23,7 +23,7 @@ #ifndef GET_FILE_H #define GET_FILE_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "AutomateCommand.h" #include "DiffParser.h" #include "MonotoneDelegate.h" ============================================================ --- guitone/src/model/GetFileProxyModel.h e6dcebee71cfbd700b2fb47f364ea4aa2d087545 +++ guitone/src/model/GetFileProxyModel.h 753146f5845d9650b84d5856ff475d1cc1e33e24 @@ -21,7 +21,7 @@ #ifndef GETFILEPROXYMODEL_H #define GETFILEPROXYMODEL_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include class GetFileProxyModel : public QSortFilterProxyModel ============================================================ --- guitone/src/model/Inventory.h c973a25c69e174e9598df452f48a574fbf2cc29f +++ guitone/src/model/Inventory.h 040e1f52db9f3eba0d3bc74dee809365650931d3 @@ -21,7 +21,7 @@ #ifndef INVENTORY_H #define INVENTORY_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "AutomateCommand.h" #include "MonotoneDelegate.h" ============================================================ --- guitone/src/model/InventoryItem.h 286c2bd9af01cf48a5528558047d64a25abb315b +++ guitone/src/model/InventoryItem.h a7b11730c19cfc594eb8f0599d32f09c5560c692 @@ -21,7 +21,7 @@ #ifndef INVENTORY_ITEM_H #define INVENTORY_ITEM_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include class InventoryItem : public QObject ============================================================ --- guitone/src/model/InventoryProxyModel.h 9c8e8ba4e5e3ae0afaa416a333dd9bfdc32a8395 +++ guitone/src/model/InventoryProxyModel.h 82a7cc223fd65e139d05d7fb04dc34b03e19da9f @@ -21,7 +21,7 @@ #ifndef INVENTORYPROXYMODEL_H #define INVENTORYPROXYMODEL_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include class InventoryProxyModel : public QSortFilterProxyModel ============================================================ --- guitone/src/model/Keys.h 9335a92a16ad7116039b8b26880d1b64dde9ce69 +++ guitone/src/model/Keys.h 2b1655fccc0613a644b1def232bd7af392b997ce @@ -21,7 +21,7 @@ #ifndef KEYS_H #define KEYS_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "AutomateCommand.h" #include "MonotoneDelegate.h" ============================================================ --- guitone/src/model/Manifest.h 2b26676773193ef4ee19ab4d9c42c53a8d1a4ad5 +++ guitone/src/model/Manifest.h 4530a3916c153c55e35e586bf1e58062544a24ec @@ -21,7 +21,7 @@ #ifndef MANIFEST_H #define MANIFEST_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "AutomateCommand.h" #include "MonotoneDelegate.h" ============================================================ --- guitone/src/model/MonotoneDelegate.h a7242348c55ff0b70f05e4d5e1aa18ceaddb79ba +++ guitone/src/model/MonotoneDelegate.h 7d78ddbcdcd2a5515d3b3b19a03a3efae9384369 @@ -21,7 +21,7 @@ #ifndef MONOTONE_DELEGATE_H #define MONOTONE_DELEGATE_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "AutomateCommand.h" #include ============================================================ --- guitone/src/model/Select.h b4f7c2eb05a523897fa69b4c863b1b4dbcfda8d0 +++ guitone/src/model/Select.h 1905a800de721b9228dabbb5591f44f41c2192a6 @@ -21,7 +21,7 @@ #ifndef SELECT_H #define SELECT_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "AutomateCommand.h" #include "MonotoneDelegate.h" ============================================================ --- guitone/src/model/Tags.h 7437bba37f9d18d2a24ca6bf43bce34bceedd981 +++ guitone/src/model/Tags.h 2f3fecd5e742a7a965e9f171f2225b8b227e0beb @@ -21,7 +21,7 @@ #ifndef TAGS_H #define TAGS_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "AutomateCommand.h" #include "MonotoneDelegate.h" ============================================================ --- guitone/src/model/Toposort.h a0ef98c646c6ab8942129e056a68f278ebc12b98 +++ guitone/src/model/Toposort.h 5b60cda2cf8f7209a70cf2f040f75ef93c77926c @@ -21,7 +21,7 @@ #ifndef TOPOSOT_H #define TOPOSOT_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "AutomateCommand.h" #include "MonotoneDelegate.h" ============================================================ --- guitone/src/monotone/Monotone.h a2e4cab1e90b5aadb1ae2f2065360b394c4821e5 +++ guitone/src/monotone/Monotone.h b4868a98a8fc895235b9ce7717537b68d38354cb @@ -21,7 +21,7 @@ #ifndef MONOTONE_H #define MONOTONE_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include #include #include ============================================================ --- guitone/src/util/DebugLog.h 0c0c76864be358fef7f8d8f860febe98d63456b5 +++ guitone/src/util/DebugLog.h 565294b1a66a13d3c943b40c7591752cfbb65f7e @@ -21,7 +21,7 @@ #ifndef DEBUG_LOG_H #define DEBUG_LOG_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include #include ============================================================ --- guitone/src/util/DiffParser.h a78d2d8db7ea0476d1ead3eae0d1f5cea96f19cc +++ guitone/src/util/DiffParser.h fd82c036a5e3572635261011cafb8a9cc7326ea1 @@ -21,7 +21,7 @@ #ifndef DIFF_PARSER_H #define DIFF_PARSER_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include #include #include ============================================================ --- guitone/src/util/IconProvider.h e1a1b01147ebc550104470e4db11db1c5a74c0a5 +++ guitone/src/util/IconProvider.h df1a60da076aa23be38d97258f0bdbc81e03d6e8 @@ -21,7 +21,7 @@ #ifndef ICONPROVIDER_H #define ICONPROVIDER_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include #include ============================================================ --- guitone/src/util/MemoryTrack.h b61f699af58758857dab4da64484fa695b0df122 +++ guitone/src/util/MemoryTrack.h 0c21500e93a756eccf6bb988852ef4b1f1702040 @@ -61,6 +61,7 @@ inline void operator delete[](void *p) #define DEBUG_NEW new(__FILE__, __LINE__) #else #define DEBUG_NEW new +#define writeUnfreed void #endif #define new DEBUG_NEW ============================================================ --- guitone/src/util/Platform.h 46ea612d0762af0b3c9cc3b2a0a5d003a7fc971c +++ guitone/src/util/Platform.h 6f9b3eda14b1268b3822828703c04c43c64768cc @@ -21,7 +21,7 @@ #ifndef PLATFORM_H #define PLATFORM_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include #include ============================================================ --- guitone/src/util/Settings.h 35f43869a3b70b6436e79d6f65b4251215e51851 +++ guitone/src/util/Settings.h 77d6a7df03c03f3fd17bd16cfb700db036d42ea1 @@ -21,7 +21,7 @@ #ifndef SETTINGS_H #define SETTINGS_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include #include #include ============================================================ --- guitone/src/util/SignalWaiter.h 58d9908b44bfebd70860182cfe7f84e1c51561fd +++ guitone/src/util/SignalWaiter.h 4a9b5ce5ccb5c2dd9b0c41dd14130b66d6877df5 @@ -23,7 +23,7 @@ #ifndef SIGNALWAITER_H #define SIGNALWAITER_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include class QTimerEvent; ============================================================ --- guitone/src/util/StanzaParser.h 23db6cec41455ef357740ae2cfb0108a61208b4b +++ guitone/src/util/StanzaParser.h e2374b071d26341d4a125d8c980762927f75a862 @@ -21,7 +21,7 @@ #ifndef STANZA_PARSER_H #define STANZA_PARSER_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include typedef struct { ============================================================ --- guitone/src/util/StdioParser.h 826d89933bf5e366067cbaf2142f561667d214b0 +++ guitone/src/util/StdioParser.h a8a7d068b94bd00fd0517175bf2e2e0aae977c34 @@ -21,7 +21,7 @@ #ifndef STDIO_PARSER_H #define STDIO_PARSER_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include #include ============================================================ --- guitone/src/util/TreeBuilder.h 65462f44014dcb058ee042aa0bad4fd9d8bd7859 +++ guitone/src/util/TreeBuilder.h f6b965d4efaa5f7e20f4fe64f616736f3960c219 @@ -21,7 +21,7 @@ #ifndef TREEBUILDER_H #define TREEBUILDER_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include class TreeBuilder : public QObject ============================================================ --- guitone/src/view/AttributesView.h a982f2781cad02aad1d6793b90b5f8400f0d45c4 +++ guitone/src/view/AttributesView.h d5157a44cb3e1e70b9322af1916d270ed634b1f7 @@ -21,7 +21,7 @@ #ifndef ATTRIBUTES_VIEW_H #define ATTRIBUTES_VIEW_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "TreeView.h" class AttributesView : public TreeView ============================================================ --- guitone/src/view/DiffStatusView.h 6a5bdab63a2fcd6bb2d9314a660bd8d72ee58e2a +++ guitone/src/view/DiffStatusView.h 8473597a362dd86521f03f5b2fce39fb1a858fb3 @@ -21,7 +21,7 @@ #ifndef DIFF_STATUS_VIEW_H #define DIFF_STATUS_VIEW_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "GetFileProxyModel.h" #include ============================================================ --- guitone/src/view/DiffView.h c5acc9527a4468aae4ffb3205edbd3cea5bb812b +++ guitone/src/view/DiffView.h cbdddca20df6f274fec2a5801bf37eab970860e2 @@ -21,7 +21,7 @@ #ifndef DIFF_VIEW_H #define DIFF_VIEW_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "TreeView.h" class DiffView : public TreeView ============================================================ --- guitone/src/view/InventoryView.h 6f4cd9e8324131eedf640d9a059cb425df20b301 +++ guitone/src/view/InventoryView.h 92bfe5e840d52dadb554bada105a22fd0bca7b28 @@ -21,7 +21,7 @@ #ifndef INVENTORY_VIEW_H #define INVENTORY_VIEW_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "TreeView.h" #include #include ============================================================ --- guitone/src/view/MainWindow.cpp 2c9f93a0ece1daca16d26c942171d44c0f7dce3c +++ guitone/src/view/MainWindow.cpp 928c4689e62b90d92c0f5ee990b80133f3c77d71 @@ -178,7 +178,6 @@ void MainWindow::quit() { delete this; Settings::sync(); - writeUnfreed(); } void MainWindow::criticalMtnError(const QString & msg) ============================================================ --- guitone/src/view/Splitter.h eab2fe18eac4205d66b0b89b35a41dc3d0d651b2 +++ guitone/src/view/Splitter.h 503c11e640e897c34e7be2939ceff99b24b8b61c @@ -21,7 +21,7 @@ #ifndef SPLITTER_H #define SPLITTER_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include class Splitter : public QSplitter ============================================================ --- guitone/src/view/TreeView.h a7e3e63e2dbc16a0549b2e8bb1d5b3c86d732ae2 +++ guitone/src/view/TreeView.h 0f74d916f50759c27e6f07e0a0e0c81afa8a6b61 @@ -21,7 +21,7 @@ #ifndef TREE_VIEW_H #define TREE_VIEW_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include #include ============================================================ --- guitone/src/view/dialogs/About.h 0ed5094e111f08eb88a78342dceacdcf31e8be94 +++ guitone/src/view/dialogs/About.h b6bb434c65516574c5f1bc8c73186e49a6438ebd @@ -21,7 +21,7 @@ #ifndef ABOUT_H #define ABOUT_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "ui_about.h" #include "Dialog.h" ============================================================ --- guitone/src/view/dialogs/DatabaseView.h e602f3dce6da5bab31d83cccd238f6daa05344f6 +++ guitone/src/view/dialogs/DatabaseView.h 562a813deec025bb308a2fbc90d85d05b404545e @@ -21,7 +21,7 @@ #ifndef DATABASEVIEW_H #define DATABASEVIEW_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "ui_databaseview.h" #include "Monotone.h" #include "Branches.h" ============================================================ --- guitone/src/view/dialogs/Dialog.h 446ddb002b165d79fd02585318efdb1f4bef68c8 +++ guitone/src/view/dialogs/Dialog.h f3865b84517576b9191c8d8fc76b4ef20a8134a6 @@ -21,7 +21,7 @@ #ifndef DIALOG_H #define DIALOG_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include class Dialog : public QDialog ============================================================ --- guitone/src/view/dialogs/FileDiff.h f4327fb59eb18a63a9fedebdde851c6c96ce5b1f +++ guitone/src/view/dialogs/FileDiff.h 832e6d653be07fab74dce76c99f76316100daacb @@ -21,7 +21,7 @@ #ifndef FILE_DIFF_H #define FILE_DIFF_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "Dialog.h" #include "ui_file_diff.h" #include "ContentDiff.h" ============================================================ --- guitone/src/view/dialogs/GenerateKeypair.h 29f0cf0d6bf366e643c61912387926fd5335bb34 +++ guitone/src/view/dialogs/GenerateKeypair.h 54144cec4622f070bc63bc7002976bf54d3dfcda @@ -21,7 +21,7 @@ #ifndef GENERATEKEYPAIR_H #define GENERATEKEYPAIR_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "Dialog.h" #include "ui_generate_keypair.h" ============================================================ --- guitone/src/view/dialogs/KeyManagement.h 46be2bc349b026dcea193bcdc3b7c7b1886b29b7 +++ guitone/src/view/dialogs/KeyManagement.h 77df5b779e94ab036d239680b12dd01c1fc46f53 @@ -21,7 +21,7 @@ #ifndef KEYMANAGEMENT_H #define KEYMANAGEMENT_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "Keys.h" #include "Dialog.h" #include "ui_key_management.h" ============================================================ --- guitone/src/view/dialogs/Preferences.h 2539d6b601831dd22f53b547de06bee0789a602c +++ guitone/src/view/dialogs/Preferences.h 6cc94cfac4718c6a315b2935f9b9d19a18ba36b8 @@ -21,7 +21,7 @@ #ifndef PREFERENCES_H #define PREFERENCES_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "Dialog.h" #include "ui_preferences.h" ============================================================ --- guitone/src/view/dialogs/RevisionDiff.h e8041a4db627afee15cf96252b5da7356f61f911 +++ guitone/src/view/dialogs/RevisionDiff.h 98067a5945a37108899fdef92af34c406511b62a @@ -21,7 +21,7 @@ #ifndef REVISION_DIFF_H #define REVISION_DIFF_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "Dialog.h" #include "ui_revision_diff.h" #include "ContentDiff.h" ============================================================ --- guitone/src/view/dialogs/RevisionManifest.h 3a644401d853c433b6fe2a27205a0555204f553a +++ guitone/src/view/dialogs/RevisionManifest.h 9f2c873a4f81302106d52ac71d450be08e38e5cb @@ -21,7 +21,7 @@ #ifndef REVISION_MANIFEST_H #define REVISION_MANIFEST_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "Dialog.h" #include "ui_manifest.h" #include "Manifest.h" ============================================================ --- guitone/src/view/dialogs/SwitchWorkspaceRevision.h 52fdc436557755f6852a23cd56dc0f2e90cf69cc +++ guitone/src/view/dialogs/SwitchWorkspaceRevision.h 7bb24a412130034f1f5761cb18cb185e87b679bf @@ -21,7 +21,7 @@ #ifndef SWITCH_WORKSPACE_REVISION_H #define SWITCH_WORKSPACE_REVISION_H -#include "..\util\MemoryTrack.h" +#include "MemoryTrack.h" #include "Dialog.h" #include "ui_switch_workspace.h" #include "Select.h"