mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-11-07 03:22:33 +01:00
Cleanup and add nullptr defaults
This commit is contained in:
parent
ce544e63aa
commit
a4287d2346
@ -43,6 +43,7 @@ public:
|
||||
QObject* parent = nullptr);
|
||||
Create();
|
||||
|
||||
|
||||
float progress() const
|
||||
{
|
||||
return m_progress;
|
||||
@ -84,8 +85,8 @@ public slots:
|
||||
}
|
||||
|
||||
private:
|
||||
CreateImportVideo* m_createImportVideo;
|
||||
QThread* m_createImportVideoThread;
|
||||
CreateImportVideo* m_createImportVideo {nullptr};
|
||||
QThread* m_createImportVideoThread {nullptr};
|
||||
|
||||
const shared_ptr<GlobalVariables>& m_globalVariables;
|
||||
|
||||
|
@ -24,17 +24,24 @@ class CreateImportVideo : public QObject {
|
||||
|
||||
public:
|
||||
CreateImportVideo() {}
|
||||
~CreateImportVideo()
|
||||
{
|
||||
qDebug() << "CreateImportVideo";
|
||||
}
|
||||
CreateImportVideo(QObject* parent = nullptr);
|
||||
explicit CreateImportVideo(const QString& videoPath, const QString& exportPath, QObject* parent = nullptr);
|
||||
~CreateImportVideo() {}
|
||||
|
||||
bool m_skipAudio { false };
|
||||
|
||||
float m_progress { 0.0F };
|
||||
|
||||
QString m_videoPath;
|
||||
QString m_exportPath;
|
||||
QString m_format;
|
||||
|
||||
int m_numberOfFrames {0};
|
||||
int m_length {0};
|
||||
int m_framerate {0};
|
||||
int m_numberOfFrames { 0 };
|
||||
int m_length { 0 };
|
||||
int m_framerate { 0 };
|
||||
|
||||
enum class ImportVideoState {
|
||||
Idle,
|
||||
@ -96,7 +103,7 @@ public slots:
|
||||
|
||||
void setProgress(float progress)
|
||||
{
|
||||
if(progress < 0 || progress > 1)
|
||||
if (progress < 0 || progress > 1)
|
||||
return;
|
||||
|
||||
if (qFuzzyCompare(m_progress, progress))
|
||||
@ -105,11 +112,6 @@ public slots:
|
||||
m_progress = progress;
|
||||
emit progressChanged(m_progress);
|
||||
}
|
||||
|
||||
private:
|
||||
bool m_skipAudio {false};
|
||||
|
||||
float m_progress;
|
||||
};
|
||||
}
|
||||
Q_DECLARE_METATYPE(ScreenPlay::CreateImportVideo::ImportVideoState)
|
||||
|
@ -5,7 +5,6 @@
|
||||
#include <memory>
|
||||
#include "installedlistmodel.h"
|
||||
namespace ScreenPlay {
|
||||
using std::shared_ptr;
|
||||
|
||||
class InstalledListFilter : public QSortFilterProxyModel {
|
||||
Q_OBJECT
|
||||
|
@ -23,7 +23,8 @@ class ProjectSettingsListModel : public QAbstractListModel {
|
||||
|
||||
public:
|
||||
explicit ProjectSettingsListModel(QString file, QObject* parent = nullptr);
|
||||
ProjectSettingsListModel() {}
|
||||
|
||||
|
||||
int rowCount(const QModelIndex& parent = QModelIndex()) const override;
|
||||
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
|
||||
QHash<int, QByteArray> roleNames() const override;
|
||||
|
@ -31,8 +31,8 @@ void SDKConnector::closeAllConnections()
|
||||
|
||||
void SDKConnector::closeAllWallpapers()
|
||||
{
|
||||
QStringList types{
|
||||
"videoWallpaper",
|
||||
QStringList types {
|
||||
"videoWallpaper",
|
||||
"qmlWallpaper",
|
||||
"htmlWallpaper",
|
||||
"godotWallpaper"
|
||||
|
@ -154,7 +154,7 @@ public slots:
|
||||
}
|
||||
|
||||
private:
|
||||
QLocalSocket* m_socket;
|
||||
QLocalSocket* m_socket { nullptr };
|
||||
QString m_appID;
|
||||
QVector<int> m_monitor;
|
||||
QString m_type;
|
||||
|
Loading…
Reference in New Issue
Block a user