Attachment #1981 for bug #1902

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1902
Collapse All | Expand All

Lines 1891-1897 Link Here

(-)tdelibs/tdeio/tdeio/jobclasses.h.ORI (-1 / +1 lines)
1891	* @param url the local url	1891	* @param url the local url
1892	* @param isLocal true if the returned URL is local, false if not	1892	* @param isLocal true if the returned URL is local, false if not
1893	*/	1893	*/
1894	void localURL( TDEIO::Job *job, const KURL &url, bool isLocal );	1894	void localURL( TDEIO::LocalURLJob *job, const KURL &url, bool isLocal );
1895		1895
1896	protected slots:	1896	protected slots:
1897	void slotLocalURL( const KURL &url, bool isLocal );	1897	void slotLocalURL( const KURL &url, bool isLocal );

Lines 29-35 Link Here

(-)tdelibs/tdeio/tdeio/kdirlister.h.ORI (-2 / +2 lines)
29		29
30	#include <kurl.h>	30	#include <kurl.h>
31		31
32	namespace TDEIO { class Job; class ListJob; }	32	namespace TDEIO { class Job; class LocalURLJob; class ListJob; }
33		33
34	/**	34	/**
35	* The dir lister deals with the kiojob used to list and update a directory	35	* The dir lister deals with the kiojob used to list and update a directory
Lines 609-615 Link Here
609	void slotTotalSize( TDEIO::Job *, TDEIO::filesize_t );	609	void slotTotalSize( TDEIO::Job *, TDEIO::filesize_t );
610	void slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t );	610	void slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t );
611	void slotSpeed( TDEIO::Job *, unsigned long );	611	void slotSpeed( TDEIO::Job *, unsigned long );
612	void slotOpenURLGotLocalURL( TDEIO::Job *, const KURL&, bool );	612	void slotOpenURLGotLocalURL( TDEIO::LocalURLJob*, const KURL&, bool );
613	void slotLocalURLKIODestroyed( );	613	void slotLocalURLKIODestroyed( );
614		614
615	private:	615	private:




          d->openURL_url[localURLJob] = _url;
          d->openURL_keep[localURLJob] = _keep;
          d->openURL_reload[localURLJob] = _reload;
          connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQT_SLOT(slotOpenURLGotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool)));
          connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed()));
      }
      return true;

  }
}

void KDirLister::slotOpenURLGotLocalURL(TDEIO::LocalURLJob *job, const KURL& url, bool isLocal) {
  KURL realURL = d->openURL_url[job];
  if (isLocal) {
      realURL = url;
      realURL.setInternalReferenceURL(d->openURL_url[job].url());
      d->m_referenceURLMap[d->openURL_url[job].url()] = url.path();
  }
  job->slaveDone();
  s_pCache->listDir( this, realURL, d->openURL_keep[job], d->openURL_reload[job] );
  d->openURL_url.remove(job);
  d->openURL_keep.remove(job);

Lines 196-202 Link Here

(-)tdelibs/tdeio/tdeio/forwardingslavebase.h.ORI (-1 / +1 lines)
196	void slotCanResume (TDEIO::Job *job, TDEIO::filesize_t offset);	196	void slotCanResume (TDEIO::Job *job, TDEIO::filesize_t offset);
197		197
198	// TDEIO::LocalURLJob	198	// TDEIO::LocalURLJob
199	void slotLocalURL(TDEIO::Job *, const KURL&, bool);	199	void slotLocalURL(TDEIO::LocalURLJob *, const KURL&, bool);
200	};	200	};
201		201
202	}	202	}

Lines 364-371 Link Here

(-)tdelibs/tdeio/tdeio/forwardingslavebase.cpp.ORI (-3 / +3 lines)
364	void ForwardingSlaveBase::connectLocalURLJob(TDEIO::LocalURLJob *job)	364	void ForwardingSlaveBase::connectLocalURLJob(TDEIO::LocalURLJob *job)
365	{	365	{
366	connectJob(job);	366	connectJob(job);
367	connect( job, TQT_SIGNAL( localURL(TDEIO::Job *, const KURL&, bool) ),	367	connect( job, TQT_SIGNAL( localURL(TDEIO::LocalURLJob *, const KURL&, bool) ),
368	this, TQT_SLOT( slotLocalURL(TDEIO::Job *, const KURL&, bool) ) );	368	this, TQT_SLOT( slotLocalURL(TDEIO::LocalURLJob *, const KURL&, bool) ) );
369	}	369	}
370		370
371	//////////////////////////////////////////////////////////////////////////////	371	//////////////////////////////////////////////////////////////////////////////
Lines 464-470 Link Here
464	canResume(offset);	464	canResume(offset);
465	}	465	}
466		466
467	void ForwardingSlaveBase::slotLocalURL(TDEIO::Job *, const KURL& url, bool)	467	void ForwardingSlaveBase::slotLocalURL(TDEIO::LocalURLJob *, const KURL& url, bool)
468	{	468	{
469	SlaveBase::localURL(url);	469	SlaveBase::localURL(url);
470	}	470	}

Return to bug 1902

Lines 1953-1959 Link Here

(-)tdelibs/tdeio/tdeio/kdirlister.cpp.ORI (-2 / +3 lines)
1953	d->openURL_url[localURLJob] = _url;	1953	d->openURL_url[localURLJob] = _url;
1954	d->openURL_keep[localURLJob] = _keep;	1954	d->openURL_keep[localURLJob] = _keep;
1955	d->openURL_reload[localURLJob] = _reload;	1955	d->openURL_reload[localURLJob] = _reload;
1956	connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::Job, const KURL&, bool)), this, TQT_SLOT(slotOpenURLGotLocalURL(TDEIO::Job, const KURL&, bool)));	1956	connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::LocalURLJob, const KURL&, bool)), this, TQT_SLOT(slotOpenURLGotLocalURL(TDEIO::LocalURLJob, const KURL&, bool)));
1957	connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed()));	1957	connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed()));
1958	}	1958	}
1959	return true;	1959	return true;
Lines 1963-1975 Link Here
1963	}	1963	}
1964	}	1964	}
1965		1965
1966	void KDirLister::slotOpenURLGotLocalURL(TDEIO::Job *job, const KURL& url, bool isLocal) {	1966	void KDirLister::slotOpenURLGotLocalURL(TDEIO::LocalURLJob *job, const KURL& url, bool isLocal) {
1967	KURL realURL = d->openURL_url[job];	1967	KURL realURL = d->openURL_url[job];
1968	if (isLocal) {	1968	if (isLocal) {
1969	realURL = url;	1969	realURL = url;
1970	realURL.setInternalReferenceURL(d->openURL_url[job].url());	1970	realURL.setInternalReferenceURL(d->openURL_url[job].url());
1971	d->m_referenceURLMap[d->openURL_url[job].url()] = url.path();	1971	d->m_referenceURLMap[d->openURL_url[job].url()] = url.path();
1972	}	1972	}
		1973	job->slaveDone();
1973	s_pCache->listDir( this, realURL, d->openURL_keep[job], d->openURL_reload[job] );	1974	s_pCache->listDir( this, realURL, d->openURL_keep[job], d->openURL_reload[job] );
1974	d->openURL_url.remove(job);	1975	d->openURL_url.remove(job);
1975	d->openURL_keep.remove(job);	1976	d->openURL_keep.remove(job);