diff options
| -rw-r--r-- | filewidget.cpp | 6 | ||||
| -rw-r--r-- | filewidget.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/filewidget.cpp b/filewidget.cpp index 6294487..c863556 100644 --- a/filewidget.cpp +++ b/filewidget.cpp @@ -48,7 +48,7 @@ #include "viewer.h" #include "searchdialog.h" -FileWidget::FileWidget(QWidget *parent) : QWidget(parent), mCopyToMenu(0) { +FileWidget::FileWidget(QWidget *parent) : QWidget(parent), mCopyToMenu(nullptr) { mFileCopier = new FileCopier(this); mFileCache.setMaxCost(500); readCache(); @@ -122,7 +122,7 @@ void FileWidget::setupGui(){ mOrignDlg = new OriginDialog(this); connect(mOrignDlg, &OriginDialog::statusMessage, this, &FileWidget::statusMessage); connect(mOrignDlg, &OriginDialog::refreshNeeded, this, &FileWidget::gatherData); - mSearchDlg = new SearchDialog(this, 0); + mSearchDlg = new SearchDialog(this, nullptr); mMenuBar = new QMenuBar; mToolBar = new QToolBar; mToolBar->setIconSize(QSize(16, 16)); @@ -312,7 +312,7 @@ void FileWidget::gatherData(){ QJsonDocument jDoc = Helper::ffpmegData(fi.absoluteFilePath()); QJsonObject jObj = jDoc.object(); QJsonValue durationV = jObj["format"].toObject()["duration"]; - seconds = durationV.toVariant().toDouble(); + seconds = static_cast<qint64>(durationV.toVariant().toDouble()); dur = Helper::Duration(seconds); duration = dur.toString(); }else if(fi.isDir()){ diff --git a/filewidget.h b/filewidget.h index f9b5af3..589283d 100644 --- a/filewidget.h +++ b/filewidget.h @@ -37,7 +37,7 @@ class FileWidget : public QWidget { enum { ColumnCount = 7 }; enum Columns { IconColumn = 0, NameColumn = 1, CopiedColumn = 2, MimeColumn = 3, DurationColumn = 4, SizeColumn = 5, Md5Column = 6 }; enum FileAction { Copy, Cut, Paste }; - explicit FileWidget(QWidget *parent = 0); + explicit FileWidget(QWidget *parent = nullptr); QTreeView *fileView() { return mFileView; } QMenuBar *menuBar() { return mMenuBar; } QToolBar *toolBar() { return mToolBar; } |