Remove unused KMimeMagic::mergeBufConfig method in preparation for converting to libmagic

This relates to Bug 656

tdejava/koala/org/trinitydesktop/koala/KMimeMagic.java

@@ -68,12 +68,6 @@ public class KMimeMagic implements QtSupport {
 
 		@short    Merge an existing parse table with the data from the  given buffer.
 	*/
-	public native boolean mergeBufConfig(String arg1);
-	/**
-		 Enable/Disable follow-links.
-			 (Default is disabled.)
-		   		@short    Enable/Disable follow-links.
-	*/
 	public native void setFollowLinks(boolean _enable);
 	/**
 		 Try to find a MimeType for the given file.

tdejava/koala/tdejava/KMimeMagic.cpp

@@ -76,14 +76,6 @@ Java_org_trinitydesktop_koala_KMimeMagic_isDisposed(JNIEnv* env, jobject obj)
 	return (QtSupport::getQt(env, obj) == 0);
 }
 
-JNIEXPORT jboolean JNICALL
-Java_org_trinitydesktop_koala_KMimeMagic_mergeBufConfig(JNIEnv* env, jobject obj, jstring arg1)
-{
-static TQCString* _qstring_arg1 = 0;
-	jboolean xret = (jboolean) ((KMimeMagic*) QtSupport::getQt(env, obj))->mergeBufConfig((char*) QtSupport::toCharString(env, arg1, &_qstring_arg1));
-	return xret;
-}
-
 JNIEXPORT jboolean JNICALL
 Java_org_trinitydesktop_koala_KMimeMagic_mergeConfig(JNIEnv* env, jobject obj, jstring configFile)
 {

tdejava/koala/tdejava/KMimeMagic.h

@@ -13,7 +13,6 @@ extern "C"
 extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KMimeMagic_newKMimeMagic__ (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KMimeMagic_newKMimeMagic__Ljava_lang_String_2 (JNIEnv *env, jobject, jstring);
 extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_koala_KMimeMagic_mergeConfig (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_koala_KMimeMagic_mergeBufConfig (JNIEnv *env, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KMimeMagic_setFollowLinks (JNIEnv *env, jobject, jboolean);
 extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_koala_KMimeMagic_findFileType (JNIEnv *env, jobject, jstring);
 extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_koala_KMimeMagic_findBufferType (JNIEnv *env, jobject, jbyteArray);