Discard QDirModel

QDirModel is deprecated by the Nokia guys. Use QFileSystemModel instead.

1 files changed, 4 insertions, 9 deletions

diff --git a/shemov.cpp b/shemov.cpp
index 409245f..43906cc 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -26,6 +26,8 @@
 #include <QLocale>
 #include <QCloseEvent>
 #include <QActionGroup>
+#include <QFileSystemModel>
+
 #include <sys/vfs.h>
 
 #include "shemov.h"
@@ -95,7 +97,6 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
 	connect(mFSWidget, SIGNAL(statusbarMessage(const QString &)), this, SLOT(statusbarMessage(const QString &)));
 	connect(mFSWidget, SIGNAL(newTemplate(const QString &)), this, SLOT(setTemplate(const QString &)));
 	connect(mAVWidget, SIGNAL(statusbarMessage(const QString &)), this, SLOT(statusbarMessage(const QString &)));
-	connect(mAVWidget, SIGNAL(refreshDir(const QString &)), mFSWidget, SLOT(refreshDir(const QString &)));
 	connect(mTab, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
 
 	QWidget *centralWidget = new QWidget;
@@ -278,11 +279,6 @@ void SheMov::createActions(){
 	mDeleteFilesA = new QAction(tr("Delete selected..."), this);
 	mDeleteFilesA->setShortcut(tr("CTRL+d"));
 	connect(mDeleteFilesA, SIGNAL(triggered()), mFSWidget, SLOT(deleteFiles()));
-	mRefreshA = new QAction(tr("Refresh"), this);
-	mRefreshA->setShortcut(Qt::Key_F4);
-	mFSWidget->setRefreshAction(mRefreshA);
-	connect(mRefreshA, SIGNAL(triggered()), mFSWidget->fileView(), SLOT(refresh()));
-	connect(mRefreshA, SIGNAL(triggered()), this, SLOT(setFsFree()));
 	mCopyA = new QAction(tr("Copy file(s)..."), this);
 	mCopyA->setShortcut(tr("CTRL+v"));
 	connect(mCopyA, SIGNAL(triggered()), mFSWidget, SLOT(copyFiles()));
@@ -364,6 +360,8 @@ void SheMov::createActions(){
 	mOpenWithGroup = new QActionGroup(this);
 	mOpenWithMapper = new QSignalMapper(this);
 	connect(mOpenWithMapper, SIGNAL(mapped(QString)), mFSWidget, SLOT(playSelected(QString)));
+	connect(mFSWidget->dirModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(setFsFree()));
+	connect(mFSWidget->dirModel(), SIGNAL(layoutChanged()), this, SLOT(setFsFree()));
 }
 
 void SheMov::createMenus(){
@@ -395,8 +393,6 @@ void SheMov::createMenus(){
 	mEditFSMenu->addSeparator();
 	mEditFSMenu->addMenu(mExtractMenu);
 	mEditFSMenu->addSeparator();
-	mEditFSMenu->addAction(mRefreshA);
-	mEditFSMenu->addSeparator();
 	mEditFSMenu->addAction(mConfigA);
 
 	mEditArchiveMenu = new QMenu(tr("&Edit archive"), this);
@@ -444,7 +440,6 @@ void SheMov::createMenus(){
 	mFSWidget->fileView()->addAction(mCreateFolderA);
 	mFSWidget->fileView()->addAction(mDeleteFilesA);
 	mFSWidget->fileView()->addAction(mRenameA);
-	mFSWidget->fileView()->addAction(mRefreshA);
 	mFSWidget->fileView()->addAction(mCopyA);
 	mFSWidget->fileView()->addAction(mMoveA);
 	mFSWidget->fileView()->addAction(mRenameMenuA);