summaryrefslogtreecommitdiffstats
path: root/filesystemwidget.cpp
diff options
context:
space:
mode:
authorArno <am@disconnect.de>2013-07-29 15:43:41 +0200
committerArno <am@disconnect.de>2013-07-29 15:43:41 +0200
commit463b159343f04bbd220d8d409b45bd368841b90f (patch)
tree4df594aef3f176edb42bef345b39a796f8c3d2a1 /filesystemwidget.cpp
parent06cfadc8386aec27b9c7c43486fc0b057e9fb022 (diff)
downloadSheMov-463b159343f04bbd220d8d409b45bd368841b90f.tar.gz
SheMov-463b159343f04bbd220d8d409b45bd368841b90f.tar.bz2
SheMov-463b159343f04bbd220d8d409b45bd368841b90f.zip
Revert "Prevent datacollector from running when operating on files"
This reverts commit 06cfadc8386aec27b9c7c43486fc0b057e9fb022. Turns out that this was not the root cause for the crashes. Still stumped.
Diffstat (limited to 'filesystemwidget.cpp')
-rw-r--r--filesystemwidget.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/filesystemwidget.cpp b/filesystemwidget.cpp
index 79ef2ab..4c05640 100644
--- a/filesystemwidget.cpp
+++ b/filesystemwidget.cpp
@@ -163,7 +163,6 @@ void FilesystemWidget::directoryEdited(){
}
void FilesystemWidget::fileViewActivated(const QModelIndex &idx){
- QMutexLocker l(&mFileModel->collector()->hold());
QModelIndex real = mFileProxy->mapToSource(idx);
if(mFileModel->isDir(real)){
if(idx.data().toString() == ".."){
@@ -217,7 +216,6 @@ void FilesystemWidget::goBack(){
}
void FilesystemWidget::deleteFiles(){
- QMutexLocker l(&mFileModel->collector()->hold());
QSortFilterProxyModel *proxy = qobject_cast<QSortFilterProxyModel*>(mFileView->model());
QModelIndexList selected = mFileView->selectionModel()->selectedRows();
if(selected.isEmpty()){
@@ -235,7 +233,6 @@ void FilesystemWidget::deleteFiles(){
}
void FilesystemWidget::toClipboard(int clipmode){
- QMutexLocker l(&mFileModel->collector()->hold());
mClipboardMode = clipmode;
QClipboard *clip = qApp->clipboard();
QModelIndexList selected = mFileView->selectionModel()->selectedRows();
@@ -312,7 +309,6 @@ void FilesystemWidget::playSelected(const QString &player){
}
void FilesystemWidget::readSettings(){
- QMutexLocker l(&mFileModel->collector()->hold());
QSettings s;
QStringList expandedDirs = s.value("paths/expandeddirs").toStringList();
if(expandedDirs.isEmpty()){
@@ -341,7 +337,6 @@ void FilesystemWidget::readSettings(){
}
void FilesystemWidget::writeSettings(){
- QMutexLocker l(&mFileModel->collector()->hold());
QSettings s;
s.setValue("paths/expandeddirs", mExpandedDirs);
QModelIndex currentDir = mDirView->selectionModel()->currentIndex();
@@ -361,7 +356,6 @@ void FilesystemWidget::configChanged(){
}
void FilesystemWidget::dvdMount(){
- QMutexLocker l(&mFileModel->collector()->hold());
QSettings s;
QString mountDir = s.value("paths/dvdmount").toString();
if(isMounted()){
@@ -420,7 +414,6 @@ void FilesystemWidget::selectAllPV(){
}
void FilesystemWidget::setWindowTitle(){
- QMutexLocker l(&mFileModel->collector()->hold());
QModelIndex curIdx = mDirView->selectionModel()->currentIndex();
QString dir = curIdx.data(QFileSystemModel::FilePathRole).toString();
mWindowTitle = QString(tr("Filemanager - [%1]")).arg(dir);
@@ -508,7 +501,6 @@ void FilesystemWidget::copyRecursive(const QFileInfo &start, const QString &dest
}
const QString FilesystemWidget::selectedDir(){
- QMutexLocker l(&mFileModel->collector()->hold());
const QModelIndexList selected = mDirView->selectionModel()->selectedRows();
if(!selected.isEmpty()){
return selected.at(0).data(QFileSystemModel::FilePathRole).toString();