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

List:       kde-commits
Subject:    kdelibs/khtml/misc
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-03-01 1:07:47
[Download RAW message or body]

CVS commit by mueller: 

- don't export the KHTMLPixmap class
- fix #54515


  M +5 -4      loader.cpp   1.144
  M +0 -1      loader.h   1.55


--- kdelibs/khtml/misc/loader.cpp  #1.143:1.144
@@ -546,4 +546,6 @@ void CachedImage::deref( CachedObjectCli
 #define BGMINHEIGHT     32
 
+namespace khtml {
+
 class KHTMLPixmap : public QPixmap
 {
@@ -556,4 +558,6 @@ public:
 };
 
+} // namespace khtml
+
 const QPixmap &CachedImage::tiled_pixmap(const QColor& newc)
 {
@@ -929,4 +933,5 @@ DocLoader::DocLoader(KHTMLPart* part, Do
 DocLoader::~DocLoader()
 {
+    Cache::loader()->cancelRequests( this );
     Cache::docloader->remove( this );
 }
@@ -1066,8 +1071,4 @@ Loader::Loader() : QObject()
     m_requestsPending.setAutoDelete( true );
     m_requestsLoading.setAutoDelete( true );
-}
-
-Loader::~Loader()
-{
 }
 

--- kdelibs/khtml/misc/loader.h  #1.54:1.55
@@ -387,5 +387,4 @@ namespace khtml
     public:
         Loader();
-        ~Loader();
 
         void load(DocLoader* dl, CachedObject *object, bool incremental = true);


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