summaryrefslogtreecommitdiffstats
path: root/tdejava
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-01 13:06:20 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-01 13:06:20 -0500
commita0e3f9a8f0f05361f52c392cbab8650366a29c5d (patch)
tree0c233e06421cebb4fc038b8908ab19c292b1ffcc /tdejava
parentc9f587dbd05a31aa98fdd4bcd2eb601202fbb442 (diff)
downloadtdebindings-a0e3f9a8f0f05361f52c392cbab8650366a29c5d.tar.gz
tdebindings-a0e3f9a8f0f05361f52c392cbab8650366a29c5d.zip
Remove unused KMimeMagic::mergeBufConfig method in preparation for converting to libmagic
This relates to Bug 656
Diffstat (limited to 'tdejava')
-rw-r--r--tdejava/koala/org/trinitydesktop/koala/KMimeMagic.java6
-rw-r--r--tdejava/koala/tdejava/KMimeMagic.cpp8
-rw-r--r--tdejava/koala/tdejava/KMimeMagic.h1
3 files changed, 0 insertions, 15 deletions
diff --git a/tdejava/koala/org/trinitydesktop/koala/KMimeMagic.java b/tdejava/koala/org/trinitydesktop/koala/KMimeMagic.java
index c7499a93..bbc2706b 100644
--- a/tdejava/koala/org/trinitydesktop/koala/KMimeMagic.java
+++ b/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.
diff --git a/tdejava/koala/tdejava/KMimeMagic.cpp b/tdejava/koala/tdejava/KMimeMagic.cpp
index 67e6232c..5168f6ca 100644
--- a/tdejava/koala/tdejava/KMimeMagic.cpp
+++ b/tdejava/koala/tdejava/KMimeMagic.cpp
@@ -77,14 +77,6 @@ Java_org_trinitydesktop_koala_KMimeMagic_isDisposed(JNIEnv* env, jobject obj)
}
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)
{
static TQString* _qstring_configFile = 0;
diff --git a/tdejava/koala/tdejava/KMimeMagic.h b/tdejava/koala/tdejava/KMimeMagic.h
index 92b8174f..873364f3 100644
--- a/tdejava/koala/tdejava/KMimeMagic.h
+++ b/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);