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

List:       kde-commits
Subject:    kdebase/nsplugins
From:       Dirk Mueller <mueller () kde ! org>
Date:       2004-03-13 13:22:18
Message-ID: 20040313132218.1924999AC () office ! kde ! org
[Download RAW message or body]

CVS commit by mueller: 

fix KURL handling


  M +1 -1      plugin_part.cpp   1.55
  M +8 -6      viewer/nsplugin.cpp   1.107
  M +1 -1      viewer/nsplugin.h   1.41


--- kdebase/nsplugins/plugin_part.cpp  #1.54:1.55
@@ -360,5 +360,5 @@ void PluginPart::pluginResized(int w, in
 void PluginPart::changeSrc(const QString& url) {
     closeURL();
-    openURL(url);
+    openURL(KURL( url ));
 }
 

--- kdebase/nsplugins/viewer/nsplugin.cpp  #1.106:1.107
@@ -661,5 +661,6 @@ void NSPluginInstance::timer()
             url = req.url;
         else if ( KURL::isRelativeURL(req.url) ) {
-            KURL absUrl( _baseURL, req.url );
+            KURL bu( _baseURL );
+            KURL absUrl( bu, req.url );
             url = absUrl.url();
         } else if ( req.url[0]=='/' && KURL(_baseURL).hasHost() ) {
@@ -739,5 +740,6 @@ void NSPluginInstance::timer()
 
 QString NSPluginInstance::normalizedURL(const QString& url) const {
-    KURL inURL(_baseURL, url);
+    KURL bu( _baseURL );
+    KURL inURL(bu, url);
     KConfig cfg("kcmnspluginrc", true);
     cfg.setGroup("Misc");
@@ -1557,5 +1559,5 @@ void NSPluginStreamBase::finish( bool er
         _instance->NPDestroyStream( _stream, NPRES_DONE );
         if ( _notifyData )
-            _instance->NPURLNotify( _url, NPRES_DONE, _notifyData );
+            _instance->NPURLNotify( _url.url(), NPRES_DONE, _notifyData );
     } else {
         // close temp file
@@ -1566,5 +1568,5 @@ void NSPluginStreamBase::finish( bool er
         _instance->NPDestroyStream( _stream, NPRES_NETWORK_ERR );
         if ( _notifyData )
-            _instance->NPURLNotify( _url, NPRES_NETWORK_ERR, _notifyData );
+            _instance->NPURLNotify( _url.url(), NPRES_NETWORK_ERR, _notifyData );
     }
 
@@ -1649,5 +1651,5 @@ bool NSPluginStream::get( const QString&
     if ( create( url, mimeType, notify ) ) {
         // start the kio job
-        _job = KIO::get(url, false, false);
+        _job = KIO::get(KURL( url ), false, false);
         _job->addMetaData("errorPage", "false");
         _job->addMetaData("AllowCompressedPage", "false");
@@ -1671,5 +1673,5 @@ bool NSPluginStream::post( const QString
     if ( create( url, mimeType, notify ) ) {
         // start the kio job
-        _job = KIO::http_post(url, data, false);
+        _job = KIO::http_post(KURL( url ), data, false);
         _job->addMetaData("content-type", args.contentType());
         _job->addMetaData("errorPage", "false");

--- kdebase/nsplugins/viewer/nsplugin.h  #1.40:1.41
@@ -90,5 +90,5 @@ protected:
   NPStream *_stream;
   void *_notifyData;
-  QString _url;
+  KURL _url;
   QString _fileURL;
   QString _mimeType;


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