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

List:       kde-commits
Subject:    Re: [kdelibs/KDE/4.8] kio/kio: These are local files, use toLocalFile()
From:       Sebastian_Trüg <trueg () kde ! org>
Date:       2012-01-28 13:16:57
Message-ID: 4F23F549.5000408 () kde ! org
[Download RAW message or body]

I am really sorry. I merged KDE/4.8 into my branch here locally to be
able to test with the lates updates and then merged that branch into
KDE/4.8. :(

Cheers,
Sebastian

On 01/28/2012 12:18 PM, David Faure wrote:
> Hi Sebastian,
> 
> What did you do, exactly? I got 80 commit emails from you in kdelibs (branch 
> KDE/4.8) for things that had been committed to this branch already...
> 
> Hmm, in git log I only see this:
> commit 5bc7491f520bb995b54169f94b58f48fc914a827
> Merge: 5682224 bbd9a75
> Author: Sebastian Trueg <trueg@kde.org>
> Date:   Fri Jan 27 14:19:44 2012 +0100
> 
>     Merge branch 'nepomuk/DmsPort-resourceWatcher' into tmp
> 
> Strange that this generated so many commit email... Maybe a bug in the git 
> commit hook...
> 
> 
> On Friday 27 January 2012 14:20:44 Sebastian Trueg wrote:
>> Git commit 1aca8a65ce59f873d433d423bbf434898d84eaab by Sebastian Trueg, on
>> behalf of David Faure. Committed on 25/01/2012 at 00:33.
>> Pushed by trueg into branch 'KDE/4.8'.
>>
>> These are local files, use toLocalFile()
>>
>> (should make no difference on unix, but should be better on Windows)
>>
>> M  +2    -2    kio/kio/kdirlister.cpp
>>
>> http://commits.kde.org/kdelibs/1aca8a65ce59f873d433d423bbf434898d84eaab
>>
>> diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp
>> index ec3d622..8cf5901 100644
>> --- a/kio/kio/kdirlister.cpp
>> +++ b/kio/kio/kdirlister.cpp
>> @@ -842,7 +842,7 @@ void KDirListerCache::slotFilesAdded( const QString &dir
>> /*url*/ ) // from KDirN KUrl urlDir(dir);
>>      kDebug(7004) << urlDir; // output urls, not qstrings, since they might
>> contain a password if (urlDir.isLocalFile()) {
>> -        Q_FOREACH(const QString& u,
>> directoriesForCanonicalPath(urlDir.path())) { +        Q_FOREACH(const
>> QString& u, directoriesForCanonicalPath(urlDir.toLocalFile())) {
>> updateDirectory(KUrl(u));
>>          }
>>      } else {
>> @@ -1074,7 +1074,7 @@ void KDirListerCache::slotFileDirty( const QString&
>> path ) KUrl url(path);
>>      url.adjustPath(KUrl::RemoveTrailingSlash);
>>      if (isDir) {
>> -        Q_FOREACH(const QString& dir,
>> directoriesForCanonicalPath(url.path())) { +        Q_FOREACH(const
>> QString& dir, directoriesForCanonicalPath(url.toLocalFile())) {
>> handleDirDirty(dir);
>>          }
>>      } else {
[prev in list] [next in list] [prev in thread] [next in thread]