# 
# 
# patch "guitone/src/main.cpp"
#  from [579911ac98f8e279d5325026e29dbd2f76793fff]
#    to [c88cada9094d4c992fc8a9cd1d45698731e521f5]
# 
# patch "guitone/src/model/Ancestors.cpp"
#  from [39e442993ecedbce40ab73a6f1ac37b4019aa127]
#    to [4f7b6c236b77394636842ae8bf2c86b00b78fba4]
# 
# patch "guitone/src/model/Attributes.cpp"
#  from [5a06562cb354ab61e2580ec1207174bddf698283]
#    to [8f04bbd7d5a39b7ce58437e1cb83ebd194baac40]
# 
# patch "guitone/src/model/Certs.cpp"
#  from [0fd05611a6c091b46c08740bdf2a059b64dd97f9]
#    to [7872678efa938114c445716dc746a080fd869887]
# 
# patch "guitone/src/model/Inventory.cpp"
#  from [17b32add147761b4e73e21e6eba2815c03f4e07b]
#    to [0ceea0517362e7242bf89226bff3c992c2c23fe1]
# 
# patch "guitone/src/model/Keys.cpp"
#  from [c66537e65be48f2b08639fd8feac83b479dc74c1]
#    to [8ef6991ae0c6f9be50d8d4e4c22be80327736d04]
# 
# patch "guitone/src/model/Manifest.cpp"
#  from [4e59fa6e31c5fe70c3e3d0bad5f02fafa1c5ced8]
#    to [ea7e6ec9d70abd5e1f79e3e6fee4b8988126382e]
# 
# patch "guitone/src/model/Select.cpp"
#  from [76e34dd9646c8b47d71ac0a9874b89c46c78f30a]
#    to [2dd6445b5b3b664224c561e9c784f1e6c3abc70c]
# 
# patch "guitone/src/model/Tags.cpp"
#  from [1020ef054d35a2f73178d5a0e8fcde9d8c23c6f9]
#    to [1518ed7a4d464a2745934d2d4fc192e486921757]
# 
# patch "guitone/src/model/Toposort.cpp"
#  from [544f0de836eb532c6d35372b87c2667f6585d741]
#    to [72735c539ab47f8a1ef1be5ff8739d32ac9b0578]
# 
# patch "guitone/src/util/DebugLog.cpp"
#  from [8e2edf66cdb61664357366a0bd3b630e049bf110]
#    to [d109d78cf32bc0898c50f70e55e407b6b6a46782]
# 
# patch "guitone/src/util/DiffParser.cpp"
#  from [657af31d18e2da6d8decc87593c864ee18f83ded]
#    to [3e7fcc734bdabfbdb515d6807bb58ede155e704f]
# 
# patch "guitone/src/util/MemoryTrack.h"
#  from [db4905418c5e55db1f636e12143fd121681fc6c9]
#    to [b3e3adc29975d860dcff268fcce83fc2bc0eeebd]
# 
# patch "guitone/src/util/Settings.cpp"
#  from [f080174d7e869a08be44b56f520233c70d89b628]
#    to [3c31b5d7240c187f39b0dad19fb0df0a7b462f6a]
# 
# patch "guitone/src/util/TreeBuilder.cpp"
#  from [02428e13772ec4b16a2f7e827a81ed7069704df8]
#    to [45cbb82047e43b0fac1e7c74a2e9c279953cfabc]
# 
============================================================
--- guitone/src/main.cpp	579911ac98f8e279d5325026e29dbd2f76793fff
+++ guitone/src/main.cpp	c88cada9094d4c992fc8a9cd1d45698731e521f5
@@ -65,7 +65,7 @@ int main(int argc, char** argv)
     }
 
     // create and show the main window
-    MainWindow *mainWnd = mtnew(MainWindow, );
+    MainWindow *mainWnd = mtnew(MainWindow);
     
     // try initialize the main window
     if (!mainWnd->init())
============================================================
--- guitone/src/model/Ancestors.cpp	39e442993ecedbce40ab73a6f1ac37b4019aa127
+++ guitone/src/model/Ancestors.cpp	4f7b6c236b77394636842ae8bf2c86b00b78fba4
@@ -27,7 +27,7 @@ Ancestors::Ancestors(QObject *parent) 
 Ancestors::Ancestors(QObject *parent) 
     : QAbstractItemModel(parent)
 {
-    selRevisions = mtnew(RevisionList, );
+    selRevisions = mtnew(RevisionList);
 	mtnDelegate = mtnew(MonotoneDelegate, this);
 }
 
============================================================
--- guitone/src/model/Attributes.cpp	5a06562cb354ab61e2580ec1207174bddf698283
+++ guitone/src/model/Attributes.cpp	8f04bbd7d5a39b7ce58437e1cb83ebd194baac40
@@ -28,7 +28,7 @@ Attributes::Attributes(QObject *parent) 
 Attributes::Attributes(QObject *parent) 
     : QAbstractItemModel(parent)
 {
-    attributes = mtnew(AttributeList, );
+    attributes = mtnew(AttributeList);
     mtnDelegate = mtnew(MonotoneDelegate, this);
 }
 
============================================================
--- guitone/src/model/Certs.cpp	0fd05611a6c091b46c08740bdf2a059b64dd97f9
+++ guitone/src/model/Certs.cpp	7872678efa938114c445716dc746a080fd869887
@@ -24,7 +24,7 @@ Certs::Certs(QObject *parent) : QAbstrac
 
 Certs::Certs(QObject *parent) : QAbstractItemModel(parent)
 {
-    certs = mtnew(CertList, );
+    certs = mtnew(CertList);
     mtnDelegate = mtnew(MonotoneDelegate, this);
 }
 
============================================================
--- guitone/src/model/Inventory.cpp	17b32add147761b4e73e21e6eba2815c03f4e07b
+++ guitone/src/model/Inventory.cpp	0ceea0517362e7242bf89226bff3c992c2c23fe1
@@ -29,9 +29,9 @@ Inventory::Inventory(QObject *parent) : 
 {
 	// create a dummy item since the view needs at least one item
 	// in the model, otherwise the app crashes
-	rootItem	 = mtnew(InventoryItem, );
+	rootItem	 = mtnew(InventoryItem);
 
-	iconProvider = mtnew(IconProvider, );
+	iconProvider = mtnew(IconProvider);
 	regex		 = mtnew(QRegExp, "^(R|D|[ ])(R|A|[ ])(M|P|U|I|[ ])\\s(\\d+)\\s(\\d+)\\s(.+)$");
     regex->setMinimal(true);
     
============================================================
--- guitone/src/model/Keys.cpp	c66537e65be48f2b08639fd8feac83b479dc74c1
+++ guitone/src/model/Keys.cpp	8ef6991ae0c6f9be50d8d4e4c22be80327736d04
@@ -56,7 +56,7 @@ void Keys::parseOutput()
     {
         Stanza stanza = list.at(i);
         
-        key = mtnew(Key, );
+        key = mtnew(Key);
         bool isItem = false;
         
         for (int j=0, size2 = stanza.size(); j < size2; j++)
============================================================
--- guitone/src/model/Manifest.cpp	4e59fa6e31c5fe70c3e3d0bad5f02fafa1c5ced8
+++ guitone/src/model/Manifest.cpp	ea7e6ec9d70abd5e1f79e3e6fee4b8988126382e
@@ -64,7 +64,7 @@ void Manifest::parseOutput()
             if (j == 0)
             {
                 if (entry.sym == "format_version") break;
-                mEntry = mtnew(ManifestEntry, );
+                mEntry = mtnew(ManifestEntry);
             }
             
             Q_ASSERT(mEntry);
============================================================
--- guitone/src/model/Select.cpp	76e34dd9646c8b47d71ac0a9874b89c46c78f30a
+++ guitone/src/model/Select.cpp	2dd6445b5b3b664224c561e9c784f1e6c3abc70c
@@ -27,7 +27,7 @@ Select::Select(QObject *parent) 
 Select::Select(QObject *parent) 
     : QAbstractItemModel(parent)
 {
-    selRevisions = mtnew(RevisionList, );
+    selRevisions = mtnew(RevisionList);
 	mtnDelegate = mtnew(MonotoneDelegate, this);
 }
 
============================================================
--- guitone/src/model/Tags.cpp	1020ef054d35a2f73178d5a0e8fcde9d8c23c6f9
+++ guitone/src/model/Tags.cpp	1518ed7a4d464a2745934d2d4fc192e486921757
@@ -24,7 +24,7 @@ Tags::Tags(QObject *parent) : QAbstractI
 
 Tags::Tags(QObject *parent) : QAbstractItemModel(parent)
 {
-    tags = mtnew(TagList, );
+    tags = mtnew(TagList);
     mtnDelegate = mtnew(MonotoneDelegate, this);
 }
 
============================================================
--- guitone/src/model/Toposort.cpp	544f0de836eb532c6d35372b87c2667f6585d741
+++ guitone/src/model/Toposort.cpp	72735c539ab47f8a1ef1be5ff8739d32ac9b0578
@@ -27,7 +27,7 @@ Toposort::Toposort(QObject *parent) : QS
 Toposort::Toposort(QObject *parent) : QSortFilterProxyModel(parent),
   sortColumn(0), sortOrder(Qt::AscendingOrder)
 {
-    ordRevisions = mtnew(RevisionMap, );
+    ordRevisions = mtnew(RevisionMap);
     mtnDelegate  = mtnew(MonotoneDelegate, this);
     showRows     = false;
 }
============================================================
--- guitone/src/util/DebugLog.cpp	8e2edf66cdb61664357366a0bd3b630e049bf110
+++ guitone/src/util/DebugLog.cpp	d109d78cf32bc0898c50f70e55e407b6b6a46782
@@ -36,7 +36,7 @@ DebugLog* DebugLog::singleton()
 {
 	if (!instance)
 	{
-		instance = mtnew(DebugLog, );
+		instance = mtnew(DebugLog);
 	}
 	return instance;		
 }
============================================================
--- guitone/src/util/DiffParser.cpp	657af31d18e2da6d8decc87593c864ee18f83ded
+++ guitone/src/util/DiffParser.cpp	3e7fcc734bdabfbdb515d6807bb58ede155e704f
@@ -67,7 +67,7 @@ void DiffParser::parse(const QString & i
             QString nextGroup(lines.at(++i));
             
             // create a new diff
-            curDiff = mtnew(Diff, );
+            curDiff = mtnew(Diff);
             
             // check if this is a binary
             QRegExp rx = QRegExp("^#\\s(.+)\\sis binary");
@@ -106,7 +106,7 @@ void DiffParser::parse(const QString & i
             Q_ASSERT(list.size() >= 2);
             
             // create a new Hunk
-            curHunk = mtnew(DiffHunk, );
+            curHunk = mtnew(DiffHunk);
             curDiff->hunks.push_back(curHunk);
             
             // extract line numbers and positions
@@ -127,7 +127,7 @@ void DiffParser::parse(const QString & i
         
         Q_ASSERT(curHunk);
         
-        DiffLine * diffLine = mtnew(DiffLine, );
+        DiffLine * diffLine = mtnew(DiffLine);
         curHunk->lines.push_back(diffLine);
         diffLine->content = line.mid(1);
         
============================================================
--- guitone/src/util/MemoryTrack.h	db4905418c5e55db1f636e12143fd121681fc6c9
+++ guitone/src/util/MemoryTrack.h	b3e3adc29975d860dcff268fcce83fc2bc0eeebd
@@ -29,7 +29,7 @@ void writeUnfreed();
 void writeUnfreed();
 
 #define mtnew(type, ...) (type*) mtTrackNew(sizeof(type), (void*) new type(__VA_ARGS__), __FILE__, __LINE__)
-#define mtdelete(ptr) { delete ptr; mtTrackDelete(ptr); }
+#define mtdelete(ptr) { mtTrackDelete(ptr); delete ptr; }
 
 #else
 
============================================================
--- guitone/src/util/Settings.cpp	f080174d7e869a08be44b56f520233c70d89b628
+++ guitone/src/util/Settings.cpp	3c31b5d7240c187f39b0dad19fb0df0a7b462f6a
@@ -26,7 +26,7 @@ Settings* Settings::singleton()
 {
 	if (!instance)
 	{
-		instance = mtnew(Settings, );
+		instance = mtnew(Settings);
 	}
 	return instance;		
 }
============================================================
--- guitone/src/util/TreeBuilder.cpp	02428e13772ec4b16a2f7e827a81ed7069704df8
+++ guitone/src/util/TreeBuilder.cpp	45cbb82047e43b0fac1e7c74a2e9c279953cfabc
@@ -86,7 +86,7 @@ QStandardItem* TreeBuilder::add(const QS
 				parent->removeRow(index);
 
 				// Create a new parent to replace the old child
-				QStandardItem *newparent = mtnew(QStandardItem, );
+				QStandardItem *newparent = mtnew(QStandardItem);
 				newparent->setData(branch.left(pos));
 
 				// Add the new parent to the parent
@@ -110,7 +110,7 @@ QStandardItem* TreeBuilder::add(const QS
 		}
 	}
 
-	QStandardItem *it = mtnew(QStandardItem, );
+	QStandardItem *it = mtnew(QStandardItem);
 	it->setData(branch);
 	parent->appendRow(it);
 	addData(it);