From 40c71d5ce0f6978ce48eb67fd73ed211bab4e887 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 11 Apr 2012 21:52:15 +0200 Subject: KFileItemModel: interface cleanups Fix some naming inconsistencies regarding the usage of 'dir' vs. 'directory' vs. 'folder'. --- src/panels/folders/folderspanel.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/panels/folders/folderspanel.cpp') diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp index 2f9e1d323..5f1b4a7e0 100644 --- a/src/panels/folders/folderspanel.cpp +++ b/src/panels/folders/folderspanel.cpp @@ -148,11 +148,11 @@ void FoldersPanel::showEvent(QShowEvent* event) view->setOpacity(0); KFileItemModel* model = new KFileItemModel(this); - model->setShowFoldersOnly(true); + model->setShowDirectoriesOnly(true); model->setShowHiddenFiles(FoldersPanelSettings::hiddenFilesShown()); // Use a QueuedConnection to give the view the possibility to react first on the // finished loading. - connect(model, SIGNAL(dirLoadingCompleted()), this, SLOT(slotLoadingCompleted()), Qt::QueuedConnection); + connect(model, SIGNAL(directoryLoadingCompleted()), this, SLOT(slotLoadingCompleted()), Qt::QueuedConnection); KItemListContainer* container = new KItemListContainer(this); m_controller = container->controller(); @@ -309,9 +309,9 @@ void FoldersPanel::loadTree(const KUrl& url) } KFileItemModel* model = fileItemModel(); - if (model->dir() != baseUrl) { + if (model->directory() != baseUrl) { m_updateCurrentItem = true; - model->refreshDir(baseUrl); + model->refreshDirectory(baseUrl); } const int index = model->index(url); @@ -319,7 +319,7 @@ void FoldersPanel::loadTree(const KUrl& url) updateCurrentItem(index); } else { m_updateCurrentItem = true; - model->expandParentItems(url); + model->expandParentDirectories(url); // slotLoadingCompleted() will be invoked after the model has // expanded the url } -- cgit v1.3