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

List:       kde-commits
Subject:    kdenonbeta/kdom/cache
From:       Frerich Raabe <raabe () kde ! org>
Date:       2005-08-30 22:13:10
Message-ID: 1125439990.265735.17119.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 455254 by raabe:

- Turned out KDOMCachedImage is so much work to port, let's just disable
  it for now so that we can at least link stuff.


 M  +3 -2      KDOMCache.cpp  
 M  +9 -2      KDOMLoader.cpp  
 M  +2 -3      Makefile.am  


--- trunk/kdenonbeta/kdom/cache/KDOMCache.cpp #455253:455254
@@ -37,7 +37,7 @@
 
 #include "KDOMCache.h"
 #include "KDOMLoader.h"
-#include "KDOMCachedImage.h"
+//#include "KDOMCachedImage.h"
 #include "KDOMCacheHelper.h"
 
 using namespace KDOM;
@@ -170,6 +170,7 @@
         {
             case CachedObject::Image:
             {
+#if 0
                 CachedImage *im = static_cast<CachedImage *>(o);
                 images++;
                 if(im->m_movie != 0)
@@ -177,7 +178,7 @@
                     movie++;
                     msize += im->size();
                 }
-                
+#endif
                 break;
             }
             case CachedObject::StyleSheet:
--- trunk/kdenonbeta/kdom/cache/KDOMLoader.cpp #455253:455254
@@ -33,7 +33,7 @@
 #include "KDOMCache.h"
 #include "KDOMLoader.moc"
 #include "KDOMCacheHelper.h"
-#include "KDOMCachedImage.h"
+//#include "KDOMCachedImage.h"
 #include "KDOMCachedScript.h"
 #include "KDOMCachedDocument.h"
 #include "KDOMCachedStyleSheet.h"
@@ -62,6 +62,9 @@
 
 CachedImage *DocumentLoader::requestImage(const KURL &url)
 {
+#if 1
+    return 0;
+#else
     // TODO: Add security checks (see khtml DocLoader!)
     CachedImage *img = Cache::requestObject<CachedImage, CachedObject::Image>(this, url, 0);
 
@@ -69,6 +72,7 @@
         Cache::loader()->load(this, img, true);
 
     return img;
+#endif
 }
 
 CachedStyleSheet *DocumentLoader::requestStyleSheet(const KURL &url, const QString &charset,
@@ -132,6 +136,7 @@
     if(!m_autoloadImages)
         return;
 
+#if 0
     for(Q3PtrDictIterator<CachedObject> it(m_docObjects); it.current(); ++it)
     {
         if(it.current()->type() == CachedObject::Image)
@@ -141,10 +146,10 @@
             CachedObject::Status status = img->status();
             if(status != CachedObject::Unknown)
                 continue;
-
             Cache::loader()->load(this, img, true);
         }
     }
+#endif
 }
 
 void DocumentLoader::setShowAnimations(KDOMSettings::KAnimationAdvice showAnimations)
@@ -154,6 +159,7 @@
 
     m_showAnimations = showAnimations;
 
+#if 0
     for(Q3PtrDictIterator<CachedObject> it(m_docObjects); it.current(); ++it)
     {
         if(it.current()->type() == CachedObject::Image)
@@ -162,6 +168,7 @@
             img->setShowAnimations( m_showAnimations );
         }
     }
+#endif
 }
 
 void DocumentLoader::insertCachedObject(CachedObject *object) const
--- trunk/kdenonbeta/kdom/cache/Makefile.am #455253:455254
@@ -4,8 +4,7 @@
 
 lib_LTLIBRARIES = libkdomcache.la
 libkdomcache_la_SOURCES = KDOMCache.cpp KDOMLoader.cpp KDOMCachedObject.cpp KDOMCachedScript.cpp \
-						  KDOMCachedStyleSheet.cpp KDOMCachedDocument.cpp \
-						  KDOMCachedImage.cpp
+						  KDOMCachedStyleSheet.cpp KDOMCachedDocument.cpp
 
 libkdomcache_la_LDFLAGS = -version-info 0:1:0 -lm $(all_libraries)
 libkdomcache_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO)
@@ -13,6 +12,6 @@
 
 myincludedir = $(includedir)/kdom/cache
 myinclude_HEADERS = KDOMCache.h KDOMLoader.h KDOMCachedObject.h KDOMCachedScript.h \
-					KDOMCachedStyleSheet.h KDOMCachedDocument.h KDOMCachedImage.h \
+					KDOMCachedStyleSheet.h KDOMCachedDocument.h \
 					ImageSource.h IconData.h KDOMCacheHelper.h KDOMCachedObjectClient.h
 					
[prev in list] [next in list] [prev in thread] [next in thread]