Branch: master

6d268f3c 2014-10-01 13:04:52 Timothy Pearson
Remove unused KMimeMagic::mergeBufConfig method in preparation for converting to libmagic
This relates to Bug 656
M tdeio/tdeio/kmimemagic.cpp
M tdeio/tdeio/kmimemagic.h
diff --git a/tdeio/tdeio/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp
index 597710e..6aae4e3 100644
--- a/tdeio/tdeio/kmimemagic.cpp
+++ b/tdeio/tdeio/kmimemagic.cpp
@@ -2175,23 +2175,6 @@
 	return true;
 }
 
-bool
-KMimeMagic::mergeBufConfig(char * _configbuf)
-{
-	int result;
-
-	if (conf) {
-		result = buff_apprentice(_configbuf);
-		if (result == -1)
-			return false;
-#ifdef MIME_MAGIC_DEBUG_TABLE
-		test_table();
-#endif
-		return true;
-	}
-	return false;
-}
-
 void
 KMimeMagic::setFollowLinks( bool _enable )
 {
diff --git a/tdeio/tdeio/kmimemagic.h b/tdeio/tdeio/kmimemagic.h
index f5430a2..d812650 100644
--- a/tdeio/tdeio/kmimemagic.h
+++ b/tdeio/tdeio/kmimemagic.h
@@ -127,14 +127,6 @@
   bool mergeConfig( const TQString & configFile );
 
   /**
-   * Merge an existing parse table with the data from the
-   * given buffer.
-   *
-   * @return @p true on success.
-   */
-  bool mergeBufConfig(char *);
-
-  /**
    * Enable/Disable follow-links.
    *
    * (Default is disabled.)