summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--filesystemwidget.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/filesystemwidget.cpp b/filesystemwidget.cpp
index 33491bb..970fd33 100644
--- a/filesystemwidget.cpp
+++ b/filesystemwidget.cpp
@@ -46,7 +46,7 @@ FilesystemWidget::FilesystemWidget(QWidget *parent) : QWidget(parent), mClipboar
QStringList fHeaders = QStringList() << tr("Name") << tr("Size") << tr("Type") << tr("Created") << tr("Md5Sum") << tr("Dur./Size") << tr("Bitrate") << tr("Full Path") << tr("Present");
mFileModel = new SmDirModel(fHeaders, this);
- connect(mFileModel, SIGNAL(needResize()), this, SLOT(resizeFileView()));
+ connect(mFileModel, &SmDirModel::needResize, this, &FilesystemWidget::resizeFileView);
mDirProxy = new FilesystemDirProxy;
mDirProxy->setSourceModel(mModel);
@@ -76,13 +76,13 @@ FilesystemWidget::FilesystemWidget(QWidget *parent) : QWidget(parent), mClipboar
mFileView->setItemDelegateForColumn(SmDirModel::Bitrate, new BitrateDelegate(this));
mFileProxy->setDynamicSortFilter(true);
- connect(mFileView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), mFileView, SLOT(selectedFilesChanged()));
- connect(mFileModel, SIGNAL(modelAboutToBeReset()), mFileView, SLOT(saveSelection()));
- connect(mFileModel, SIGNAL(modelReset()), mFileView, SLOT(restoreSelection()));
+ connect(mFileView->selectionModel(), &QItemSelectionModel::selectionChanged, mFileView, &FileView::selectedFilesChanged);
+ connect(mFileModel, &SmDirModel::modelAboutToBeReset, mFileView, &FileView::saveSelection);
+ connect(mFileModel, &SmDirModel::modelReset, mFileView, &FileView::restoreSelection);
mPicViewer = SmGlobals::instance()->pictureViewer();
mUnpackDlg = new UnpackDialog(this);
- connect(mUnpackDlg, SIGNAL(workFinished()), this, SLOT(selectUnpackDir()));
+ connect(mUnpackDlg, &UnpackDialog::workFinished, this, &FilesystemWidget::selectUnpackDir);
QWidget *fileWidget = new QWidget;
mIconDirSplitter = new QSplitter(this);
@@ -109,16 +109,16 @@ FilesystemWidget::FilesystemWidget(QWidget *parent) : QWidget(parent), mClipboar
fwLayout->addWidget(mFileView);
fileWidget->setLayout(fwLayout);
- connect(mDirView->selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(directoryChanged(const QModelIndex &, const QModelIndex &)));
- connect(mDirView, SIGNAL(expanded(QModelIndex)), this, SLOT(dirExpanded(QModelIndex)));
- connect(mDirView, SIGNAL(collapsed(QModelIndex)), this, SLOT(dirCollapsed(QModelIndex)));
- connect(mFileView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(fileViewActivated(const QModelIndex &)));
- connect(mFileView, SIGNAL(enterPressed(const QModelIndex &)), this, SLOT(fileViewActivated(const QModelIndex &)));
- connect(mFileView, SIGNAL(upDir()), this, SLOT(parentDir()));
- connect(mDirEdit, SIGNAL(returnPressed()), this, SLOT(directoryEdited()));
- connect(mFileView, SIGNAL(delFiles()), this, SLOT(deleteFiles()));
- connect(mFileView, SIGNAL(editorClosed(QModelIndex)), this, SLOT(fileEditorClosed(QModelIndex)));
- connect(this, SIGNAL(upSelected(QString)), mFileView, SLOT(selectItem(QString)));
+ connect(mDirView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FilesystemWidget::directoryChanged);
+ connect(mDirView, &SmTreeView::expanded, this, &FilesystemWidget::dirExpanded);
+ connect(mDirView, &SmTreeView::collapsed, this, &FilesystemWidget::dirCollapsed);
+ connect(mFileView, &FileView::doubleClicked, this, &FilesystemWidget::fileViewActivated);
+ connect(mFileView, &FileView::enterPressed, this, &FilesystemWidget::fileViewActivated);
+ connect(mFileView, &FileView::upDir, this, &FilesystemWidget::parentDir);
+ connect(mDirEdit, &QLineEdit::returnPressed, this, &FilesystemWidget::directoryEdited);
+ connect(mFileView, &FileView::delFiles, this, &FilesystemWidget::deleteFiles);
+ connect(mFileView, &FileView::editorClosed, this, &FilesystemWidget::fileEditorClosed);
+ connect(this, &FilesystemWidget::upSelected, mFileView, &FileView::selectItem);
QVBoxLayout *mainLayout = new QVBoxLayout;
QSplitter *splitter = new QSplitter;
@@ -261,7 +261,7 @@ void FilesystemWidget::goBack(){
mDirView->selectionModel()->setCurrentIndex(mDirProxy->mapFromSource(lastIdx), QItemSelectionModel::ClearAndSelect);
if(lastIdx.isValid()){
if(!mLastFiles[Previous].isEmpty()){
- foreach(QString lf, mLastFiles[Previous]){
+ for(const QString &lf : mLastFiles[Previous]){
mFileView->selectItem(lf);
}
}
@@ -281,7 +281,7 @@ void FilesystemWidget::deleteFiles(){
QString message = QString(tr("Really delete %1 files?")).arg(QString::number(selected.count()));
int retval = QMessageBox::question(this, tr("Question"), message, QMessageBox::Yes | QMessageBox::No);
if(retval == QMessageBox::Yes){
- foreach(QModelIndex idx, selected){
+ for(const QModelIndex &idx : selected){
QModelIndex real = mFileProxy->mapToSource(idx);
if(real.isValid()){
QFileInfo fi(real.data(SmDirModel::FullPathRole).toString());
@@ -302,7 +302,7 @@ void FilesystemWidget::toClipboard(int clipmode){
return;
}
QList<QUrl> files;
- foreach(QModelIndex idx, selected){
+ for(const QModelIndex &idx : selected){
if(idx.data(SmDirModel::NameRole).toString() == ".."){
continue;
}
@@ -321,7 +321,7 @@ void FilesystemWidget::fromClipboard(){
return;
}
QStringList files;
- foreach(QUrl url, mimeData->urls()){
+ for(const QUrl &url : mimeData->urls()){
files << url.toLocalFile();
}
const QString destDir = selectedDir();
@@ -408,7 +408,7 @@ void FilesystemWidget::readSettings(){
if(expandedDirs.isEmpty()){
expandedDirs << QDir::homePath();
}
- foreach(QString p, expandedDirs){
+ for(const QString &p : expandedDirs){
QModelIndex idx = mModel->index(p);
if(idx.isValid()){
QModelIndex pidx = mDirProxy->mapFromSource(idx);
@@ -497,7 +497,7 @@ void FilesystemWidget::dvdMount(){
void FilesystemWidget::moveToArchive(){
QStringList selected = selectedFiles();
QFileInfoList files;
- foreach(QString f, selected){
+ for(const QString &f : selected){
QFileInfo fi(f);
if(fi.isDir()){
files.append(getRecursive(fi));
@@ -506,7 +506,7 @@ void FilesystemWidget::moveToArchive(){
}
}
QMap<QString, QString> res;
- foreach(QFileInfo fi, files){
+ for(const QFileInfo &fi : files){
if(!fi.exists()){
res.insert(fi.fileName(), tr("File not found"));
continue;
@@ -580,7 +580,7 @@ void FilesystemWidget::unpack(){
mUnpackDlg->setCloseEnabled(false);
mUnpackDlg->clearCommandQueue();
mUnpackDlg->show();
- foreach(QModelIndex idx, selectedIdxs){
+ for(const QModelIndex &idx : selectedIdxs){
QString mimeType = idx.data(SmDirModel::TypeRole).toString();
if(mimeType == "application/zip" || mimeType == "application/x-rar"){
QSettings s;
@@ -646,7 +646,7 @@ QFileInfoList FilesystemWidget::getRecursive(const QFileInfo &start) const{
}
void FilesystemWidget::copyFiles(const QStringList &files, const QString &dest){
- foreach(const QString file, files){
+ for(const QString &file : files){
QFileInfo fi(file);
if(fi.isDir()){
copyRecursive(fi, dest);
@@ -658,7 +658,7 @@ void FilesystemWidget::copyFiles(const QStringList &files, const QString &dest){
}
void FilesystemWidget::moveFiles(const QStringList &files, const QString &dest){
- foreach(const QString file, files){
+ for(const QString &file : files){
QFileInfo fi(file);
const QString destFile = QString("%1/%2").arg(dest).arg(fi.fileName());
QFile::rename(file, destFile);
@@ -769,7 +769,7 @@ QStringList FilesystemWidget::selectedFiles(){
if(selected.isEmpty()){
return QStringList();
}
- foreach(QModelIndex idx, selected){
+ for(const QModelIndex &idx : selected){
retval << idx.data(SmDirModel::FullPathRole).toString();
}
return retval;
@@ -790,14 +790,14 @@ void FileSystemModel::markForClipboard(const QPersistentModelIndex &idx){
void FileSystemModel::clearClipboardList(){
QList<QPersistentModelIndex> tmp(mClipEntries);
mClipEntries.clear();
- foreach(QPersistentModelIndex ent, tmp){
+ for(const QPersistentModelIndex &ent : tmp){
emit dataChanged(ent, ent);
}
}
void FileSystemModel::cleanup(){
QStringList toRemove;
- foreach(QString p, mSeen.keys()){
+ for(const QString &p : mSeen.keys()){
QFileInfo fi(p);
if(!fi.exists()){
mDeleteFromSeenQuery->bindValue(":path", p);
@@ -805,7 +805,7 @@ void FileSystemModel::cleanup(){
toRemove << p;
}
}
- foreach(QString r, toRemove){
+ for(const QString &r : toRemove){
mSeen.remove(r);
}
}
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-05-10 06:42:59 +0000