From a0326dda98d667d8b3543cb37bd5838c7745b4dc Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 1 Oct 2014 13:06:44 -0500
Subject: [PATCH] Remove unused KMimeMagic::mergeBufConfig method in
 preparation for converting to libmagic This relates to Bug 656

---
 doc/classref/tdeio/KMimeMagic.html | 6 ------
 sip/tdeio/kmimemagic.sip           | 1 -
 2 files changed, 7 deletions(-)

diff --git a/doc/classref/tdeio/KMimeMagic.html b/doc/classref/tdeio/KMimeMagic.html
index 77de11c..5ee3552 100644
--- a/doc/classref/tdeio/KMimeMagic.html
+++ b/doc/classref/tdeio/KMimeMagic.html
@@ -68,12 +68,6 @@
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 <tr><td><i>static</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>mergeBufConfig</b> (a0)
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
-</table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
-<tr><td>a0</td><td>char</td><td></td></tr>
-</table>
-</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>mergeConfig</b> (configFile)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
diff --git a/sip/tdeio/kmimemagic.sip b/sip/tdeio/kmimemagic.sip
index f646114..5142df8 100644
--- a/sip/tdeio/kmimemagic.sip
+++ b/sip/tdeio/kmimemagic.sip
@@ -60,7 +60,6 @@ public:
 
                          KMimeMagic (const TQString&);
     bool                 mergeConfig (const TQString&);
-    bool                 mergeBufConfig (char*);
     void                 setFollowLinks (bool);
     KMimeMagicResult*    findFileType (const TQString&);
     KMimeMagicResult*    findBufferType (const TQByteArray&);