From 7217eca58605fb57b4dd0ffcd7ca4445681ce619 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 19 Apr 2013 15:47:26 -0500 Subject: Fix KDirLister failure to emit events for all watchers of a given path Fix KURL comparison --- tdecore/kurl.cpp | 6 +++++- tdecore/kurl.h | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'tdecore') diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp index a0e61ad32..7d9c3f5a6 100644 --- a/tdecore/kurl.cpp +++ b/tdecore/kurl.cpp @@ -1140,6 +1140,9 @@ bool KURL::operator<( const KURL& _u) const i = m_strPass.compare(_u.m_strPass); if (i) return (i < 0); + i = d->m_strInternalReferenceURL.compare(_u.d->m_strInternalReferenceURL); + if (i) return (i < 0); + return false; } @@ -1196,7 +1199,8 @@ bool KURL::equals( const KURL &_u, bool ignore_trailing ) const m_strHost == _u.m_strHost && m_strQuery_encoded == _u.m_strQuery_encoded && m_strRef_encoded == _u.m_strRef_encoded && - m_iPort == _u.m_iPort ) + m_iPort == _u.m_iPort && + d->m_strInternalReferenceURL == _u.d->m_strInternalReferenceURL ) return true; return false; diff --git a/tdecore/kurl.h b/tdecore/kurl.h index cb1615cd2..bcb44907e 100644 --- a/tdecore/kurl.h +++ b/tdecore/kurl.h @@ -1797,7 +1797,6 @@ private: TQString m_strPath; TQString m_strRef_encoded; TQString m_strQuery_encoded; - TQString m_strInternalReferenceURL; bool m_bIsMalformed : 1; enum URIMode m_iUriMode : 3; uint freeForUse : 4; -- cgit v1.2.1