[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    PATCH: mark KFilterDev::createFilterDevice as deprecated + replace all occurences
From:       "Wilco Greven" <j.w.greven () student ! utwente ! nl>
Date:       2002-03-05 19:08:04
[Download RAW message or body]

Hi,

The following patch disables KFilterDev::createFilterDevice() when
KDE_NO_COMPAT is defined. The remaining calls are replaced with
KFilterDev::deviceForFile() (these occured in kio_man.cpp, khelpcenter's
khc_infofile.cpp and kdoctools' xslt.cpp). Ok to apply?

Greetings,
Wilco

["createFilterDevice.diff" (text/plain)]

Index: kdelibs/kio/kio/kfilterdev.h
===================================================================
RCS file: /home/kde/kdelibs/kio/kio/kfilterdev.h,v
retrieving revision 1.12
diff -u -p -b -r1.12 kfilterdev.h
--- kdelibs/kio/kio/kfilterdev.h	2001/12/14 12:18:34	1.12
+++ kdelibs/kio/kio/kfilterdev.h	2002/03/05 18:55:39
@@ -75,6 +75,7 @@ public:
     virtual int putch( int );
     virtual int ungetch( int );
 
+#ifndef KDE_NO_COMPAT
     /**
      * Call this to create the appropriate filter device for @p base
      * working on @p file . The returned QIODevice has to be deleted
@@ -83,7 +84,7 @@ public:
      * To be removed in KDE 3.0
      */
     static QIODevice* createFilterDevice(KFilterBase* base, QFile* file);
-
+#endif
 
     /**
      * Creates an i/o device that is able to read from @p fileName,
Index: kdelibs/kio/kio/kfilterdev.cpp
===================================================================
RCS file: /home/kde/kdelibs/kio/kio/kfilterdev.cpp,v
retrieving revision 1.23
diff -u -p -b -r1.23 kfilterdev.cpp
--- kdelibs/kio/kio/kfilterdev.cpp	2002/01/27 12:26:08	1.23
+++ kdelibs/kio/kio/kfilterdev.cpp	2002/03/05 18:55:39
@@ -51,6 +51,7 @@ KFilterDev::~KFilterDev()
     delete d;
 }
 
+#ifndef KDE_NO_COMPAT
 //this one is static
 // Cumbersome API. To be removed in KDE 3.0.
 QIODevice* KFilterDev::createFilterDevice(KFilterBase* base, QFile* file)
@@ -65,6 +66,7 @@ QIODevice* KFilterDev::createFilterDevic
    base->setDevice(file);
    return new KFilterDev(base);
 };
+#endif
 
 //static
 QIODevice * KFilterDev::deviceForFile( const QString & fileName, const QString & mimetype,
Index: kdelibs/kdoctools/xslt.cpp
===================================================================
RCS file: /home/kde/kdelibs/kdoctools/xslt.cpp,v
retrieving revision 1.47
diff -u -p -b -r1.47 xslt.cpp
--- kdelibs/kdoctools/xslt.cpp	2002/01/03 10:21:26	1.47
+++ kdelibs/kdoctools/xslt.cpp	2002/03/05 18:55:39
@@ -300,12 +300,10 @@ static KFilterBase *findFilterByFileName
 
 bool saveToCache( const QString &contents, const QString &filename )
 {
-    QFile raw(filename);
-    KFilterBase *f = ::findFilterByFileName(filename);
-    if ( !f )
-        return false;
+    QIODevice *fd= KFilterDev::deviceForFile(filename, QString::null, true);
 
-    QIODevice *fd= KFilterDev::createFilterDevice(f, &raw);
+    if (!fd)
+	return false;
 
     if (!fd->open(IO_WriteOnly))
     {
@@ -329,9 +327,7 @@ static bool readCache( const QString &fi
         return false;
 
     kdDebug( 7119 ) << "create filter" << endl;
-    QFile raw(cache);
-    KFilterBase *f = ::findFilterByFileName(cache);
-    QIODevice *fd= KFilterDev::createFilterDevice(f, &raw);
+    QIODevice *fd= KFilterDev::deviceForFile(cache);
 
     if (!fd->open(IO_ReadOnly))
     {
Index: kdebase/khelpcenter/khc_infofile.cc
===================================================================
RCS file: /home/kde/kdebase/khelpcenter/khc_infofile.cc,v
retrieving revision 1.4
diff -u -p -b -r1.4 khc_infofile.cc
--- kdebase/khelpcenter/khc_infofile.cc	2002/02/14 13:45:18	1.4
+++ kdebase/khelpcenter/khc_infofile.cc	2002/03/05 18:55:40
@@ -55,14 +55,10 @@ uint khcInfoFile::read()
 
   if (m_sName.right(3) == ".gz" || m_sName.right(4) == ".bz2")
   {
-    QFile raw(m_sName);
-    KFilterBase *filter = KFilterBase::findFilterByFileName(m_sName);
+    QIODevice *fd = KFilterDev::deviceForFile(m_sName);
     
-    QIODevice *fd = KFilterDev::createFilterDevice(filter, &raw);
-    
     if (!fd->open(IO_ReadOnly))
     {
-      delete filter;
       delete fd;
       return ERR_FILE_UNAVAILABLE;
     }
@@ -79,7 +75,6 @@ uint khcInfoFile::read()
 
     fd->close();
     delete fd;
-    delete filter;
   }
   else
   {
Index: kdebase/kioslave/man/kio_man.cpp
===================================================================
RCS file: /home/kde/kdebase/kioslave/man/kio_man.cpp,v
retrieving revision 1.48
diff -u -p -b -r1.48 kio_man.cpp
--- kdebase/kioslave/man/kio_man.cpp	2002/01/12 17:30:06	1.48
+++ kdebase/kioslave/man/kio_man.cpp	2002/03/05 18:55:40
@@ -359,14 +359,10 @@ char *MANProtocol::readManPage(const cha
     }
     lastdir = filename.left(filename.findRev('/'));
 
-    QFile raw(filename);
-    KFilterBase *f = KFilterBase::findFilterByFileName(filename);
+    QIODevice *fd= KFilterDev::deviceForFile(filename);
 
-    QIODevice *fd= KFilterDev::createFilterDevice(f,&raw);
-
     if (!fd->open(IO_ReadOnly))
     {
-       delete f;
        delete fd;
        return 0;
     }
@@ -382,7 +378,6 @@ char *MANProtocol::readManPage(const cha
     fd->close();
 
     delete fd;
-    delete f;
 
     int l = text.length();
     char *buf = new char[l + 4];


[prev in list] [next in list] [prev in thread] [next in thread]