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

List:       kde-commits
Subject:    branches/KDE/3.5
From:       Stephan Kulow <coolo () kde ! org>
Date:       2007-01-15 8:56:20
Message-ID: 1168851380.922426.722.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 623679 by coolo:

revert 623425, which isn't a bug fix


 M  +1 -1      kdebase/konqueror/konq_mainwindow.cc  
 M  +2 -5      kdebase/konqueror/konq_view.cc  
 M  +1 -1      kdebase/konqueror/konq_view.h  
 M  +0 -19     kdelibs/khtml/khtml_part.cpp  
 M  +0 -2      kdelibs/kparts/browserextension.cpp  
 M  +0 -7      kdelibs/kparts/browserextension.h  


--- branches/KDE/3.5/kdebase/konqueror/konq_mainwindow.cc #623678:623679
@@ -1766,7 +1766,7 @@
 
   KonqOpenURLRequest req( reloadView->typedURL() );
   req.userRequestedReload = true;
-  if ( reloadView->prepareReload( req.args, true /* softReload */ ) )
+  if ( reloadView->prepareReload( req.args ) )
   {
       reloadView->lockHistory();
       // Reuse current servicetype for local files, but not for remote files (it \
                could have changed, e.g. over HTTP)
--- branches/KDE/3.5/kdebase/konqueror/konq_view.cc #623678:623679
@@ -170,7 +170,7 @@
   // Typing "Enter" again after the URL of an aborted view, triggers a reload.
   if ( m_bAborted && m_pPart && m_pPart->url() == url && !args.doPost())
   {
-    if ( !prepareReload( args, false /* not softReload */ ) )
+    if ( !prepareReload( args ) )
       return;
     if ( ext )
       ext->setURLArgs( args );
@@ -1347,12 +1347,9 @@
       KGlobal::_activeInstance = m_pPart->instance();
 }
 
-bool KonqView::prepareReload( KParts::URLArgs& args, bool softReload )
+bool KonqView::prepareReload( KParts::URLArgs& args )
 {
     args.reload = true;
-    if ( softReload )
-        args.softReload = true;
-
     // Repost form data if this URL is the result of a POST HTML form.
     if ( m_doPost && !args.redirectedRequest() )
     {
--- branches/KDE/3.5/kdebase/konqueror/konq_view.h #623678:623679
@@ -314,7 +314,7 @@
 
   // Called before reloading this view. Sets args.reload to true, and offers to \
repost form data.  // Returns false in case the reload must be cancelled.
-  bool prepareReload( KParts::URLArgs& args, bool softReload );
+  bool prepareReload( KParts::URLArgs& args );
 
   // overload for the QString version
   void setLocationBarURL( const KURL& locationBarURL );
--- branches/KDE/3.5/kdelibs/khtml/khtml_part.cpp #623678:623679
@@ -639,25 +639,6 @@
       isFrameSet = htmlDoc->body() && (htmlDoc->body()->id() == ID_FRAMESET);
   }
 
-  if (isFrameSet && urlcmp( url.url(), m_url.url(), true, true ) && args.softReload)
-  {
-    QValueList<khtml::ChildFrame*>::Iterator it = d->m_frames.begin();
-    const QValueList<khtml::ChildFrame*>::Iterator end = d->m_frames.end();
-    for (; it != end; ++it) {
-      KHTMLPart* const part = static_cast<KHTMLPart *>((KParts::ReadOnlyPart \
                *)(*it)->m_part);
-      if (part->inherits("KHTMLPart"))
-      {
-        // We are reloading frames to make them jump into offsets.
-        KParts::URLArgs partargs( part->d->m_extension->urlArgs() );
-        partargs.reload = true;
-        part->d->m_extension->setURLArgs(partargs);
-
-        part->openURL( part->url() );
-      }
-    }/*next it*/
-    return true;
-  }
-
   if ( url.hasRef() && !isFrameSet )
   {
     bool noReloadForced = !args.reload && !args.redirectedRequest() && \
                !args.doPost();
--- branches/KDE/3.5/kdelibs/kparts/browserextension.cpp #623678:623679
@@ -87,7 +87,6 @@
 URLArgs::URLArgs()
 {
   reload = false;
-  softReload = false;
   xOffset = 0;
   yOffset = 0;
   trustedSource = false;
@@ -117,7 +116,6 @@
   delete d; d= 0;
 
   reload = args.reload;
-  softReload = args.softReload;
   xOffset = args.xOffset;
   yOffset = args.yOffset;
   serviceType = args.serviceType;
--- branches/KDE/3.5/kdelibs/kparts/browserextension.h #623678:623679
@@ -74,13 +74,6 @@
    */
   bool reload;
   /**
-   * @p softReload is set when user just hits reload button. It's used
-   * currently for two different frameset reload strategies. In case of
-   * soft reload individual frames are reloaded instead of reloading whole
-   * frameset.
-   */
-  bool softReload;
-  /**
    * @p xOffset is the horizontal scrolling of the part's widget
    * (in case it's a scrollview). This is saved into the history
    * and restored when going back in the history.


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