summaryrefslogtreecommitdiffstats
path: root/kio
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-01 13:04:52 -0500
committerSlávek Banko <slavek.banko@axis.cz>2017-07-22 15:56:41 +0200
commita515deffb886039f0581f25544ffe1cb11f615b1 (patch)
treeb3e96cda670752b17e0c3cf103f8ecd20cb6baa9 /kio
parentfc073bef59b83a10ca17c82fe19771f5edee321d (diff)
downloadtdelibs-a515deffb886039f0581f25544ffe1cb11f615b1.tar.gz
tdelibs-a515deffb886039f0581f25544ffe1cb11f615b1.zip
Remove unused KMimeMagic::mergeBufConfig method in preparation for converting to libmagic
This relates to Bug 656 (cherry picked from commit 6d268f3c559ac6351666de4a362a0536ecc7c78a)
Diffstat (limited to 'kio')
-rw-r--r--kio/kio/kmimemagic.cpp17
-rw-r--r--kio/kio/kmimemagic.h8
2 files changed, 0 insertions, 25 deletions
diff --git a/kio/kio/kmimemagic.cpp b/kio/kio/kmimemagic.cpp
index 24f81be6b..bbc3b70b1 100644
--- a/kio/kio/kmimemagic.cpp
+++ b/kio/kio/kmimemagic.cpp
@@ -2175,23 +2175,6 @@ KMimeMagic::mergeConfig(const TQString & _configfile)
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/kio/kio/kmimemagic.h b/kio/kio/kmimemagic.h
index d73dd306a..b4b824b3f 100644
--- a/kio/kio/kmimemagic.h
+++ b/kio/kio/kmimemagic.h
@@ -127,14 +127,6 @@ public:
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.)