← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kde4libs/oneiric-proposed

« back to all changes in this revision

Viewing changes to kio/kio/kdirmodel.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2011-07-08 00:08:34 UTC
  • mto: This revision was merged to the branch mainline in revision 247.
  • Revision ID: package-import@ubuntu.com-20110708000834-dr9a8my4iml90qe5
Tags: upstream-4.6.90
Import upstream version 4.6.90

Show diffs side-by-side

added added

removed removed

Lines of Context:
kio/kio/kdirmodel.cpp
489
489
                kWarning(7008) << "No node found for item that was just removed:" << url;
490
490
                continue;
491
491
            }
 
492
            if (!node->parent()) {
 
493
                // The root node has been deleted, but it was not first in the list 'items'.
 
494
                // see https://bugs.kde.org/show_bug.cgi?id=196695
 
495
                return;
 
496
            }
492
497
        }
493
498
        rowNumbers.setBit(node->rowNumber(), 1); // O(n)
494
499
        removeFromNodeHash(node, url);
776
781
            KDirModelNode* node = static_cast<KDirModelNode*>(index.internalPointer());
777
782
            const KFileItem& item = node->item();
778
783
            const QString newName = value.toString();
779
 
            if (newName.isEmpty() || newName == item.text())
 
784
            if (newName.isEmpty() || newName == item.text() || (newName == QLatin1String(".")) || (newName == QLatin1String("..")))
780
785
                return true;
781
786
            KUrl newurl(item.url());
782
 
            newurl.setPath(newurl.directory(KUrl::AppendTrailingSlash) + newName);
 
787
            newurl.setPath(newurl.directory(KUrl::AppendTrailingSlash) + KIO::encodeFileName(newName));
783
788
            KIO::Job * job = KIO::moveAs(item.url(), newurl, newurl.isLocalFile() ? KIO::HideProgressInfo : KIO::DefaultFlags);
784
789
            job->ui()->setAutoErrorHandlingEnabled(true);
785
790
            // undo handling