summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-21 03:21:01 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-21 05:30:24 (GMT)
commit671256d72267b88790fef1ecf94a8cf8cd6f6cca (patch)
tree23b0b1c7fee694b0b080006320150284e629eea0
parent50972f43c6fcca5d46a359ae971261d317b108c2 (diff)
QList<MovieFormat> -> QVector<MovieFormat>
-rw-r--r--src/lib/marble/MovieCapture.cpp4
-rw-r--r--src/lib/marble/MovieCapture.h8
-rw-r--r--src/lib/marble/MovieCaptureDialog.cpp2
-rw-r--r--src/lib/marble/TourCaptureDialog.cpp2
4 files changed, 10 insertions, 6 deletions
diff --git a/src/lib/marble/MovieCapture.cpp b/src/lib/marble/MovieCapture.cpp
index ee77eac..de852ed 100644
--- a/src/lib/marble/MovieCapture.cpp
+++ b/src/lib/marble/MovieCapture.cpp
@@ -109,10 +109,10 @@ QString MovieCapture::destination() const
return d->destinationFile;
}
-QList<MovieFormat> MovieCapture::availableFormats()
+QVector<MovieFormat> MovieCapture::availableFormats()
{
Q_D(MovieCapture);
- static QList<MovieFormat> availableFormats;
+ static QVector<MovieFormat> availableFormats;
if ( availableFormats.isEmpty() && checkToolsAvailability() ) {
QProcess encoder(this);
foreach ( const MovieFormat &format, m_supportedFormats ) {
diff --git a/src/lib/marble/MovieCapture.h b/src/lib/marble/MovieCapture.h
index 3e4dde6..0c29e07 100644
--- a/src/lib/marble/MovieCapture.h
+++ b/src/lib/marble/MovieCapture.h
@@ -12,6 +12,7 @@
#define MOVIECAPTURE_H
#include <QObject>
+#include <QVector>
#include "marble_export.h"
@@ -25,6 +26,7 @@ class MovieCapturePrivate;
class MovieFormat
{
public:
+ MovieFormat() {}
explicit MovieFormat( const QString &type, const QString &name, const QString &extension) :
m_type( type ),
m_name( name ),
@@ -50,7 +52,7 @@ public:
int fps() const;
QString destination() const;
- QList<MovieFormat> availableFormats();
+ QVector<MovieFormat> availableFormats();
MovieCapture::SnapshotMethod snapshotMethod() const;
bool checkToolsAvailability();
@@ -75,10 +77,12 @@ protected:
private:
Q_DECLARE_PRIVATE(MovieCapture)
- QList<MovieFormat> m_supportedFormats;
+ QVector<MovieFormat> m_supportedFormats;
};
} // namespace Marble
+Q_DECLARE_TYPEINFO(Marble::MovieFormat, Q_MOVABLE_TYPE);
+
#endif // MOVIECAPTURE_H
diff --git a/src/lib/marble/MovieCaptureDialog.cpp b/src/lib/marble/MovieCaptureDialog.cpp
index c25d173..dd99047 100644
--- a/src/lib/marble/MovieCaptureDialog.cpp
+++ b/src/lib/marble/MovieCaptureDialog.cpp
@@ -53,7 +53,7 @@ MovieCaptureDialog::~MovieCaptureDialog()
void MovieCaptureDialog::loadDestinationFile()
{
- QList<MovieFormat> formats = m_recorder->availableFormats();
+ const QVector<MovieFormat> formats = m_recorder->availableFormats();
if( formats.isEmpty() ) {
QMessageBox::warning( this, tr( "Codecs are unavailable" ), tr( "Supported codecs are not found." ) );
return;
diff --git a/src/lib/marble/TourCaptureDialog.cpp b/src/lib/marble/TourCaptureDialog.cpp
index e137193..e0087bc 100644
--- a/src/lib/marble/TourCaptureDialog.cpp
+++ b/src/lib/marble/TourCaptureDialog.cpp
@@ -65,7 +65,7 @@ TourCaptureDialog::~TourCaptureDialog()
void TourCaptureDialog::loadDestinationFile()
{
- QList<MovieFormat> formats = m_recorder->availableFormats();
+ const QVector<MovieFormat> formats = m_recorder->availableFormats();
if( formats.isEmpty() ) {
QMessageBox::warning( this, tr( "Codecs are unavailable" ), tr( "Supported codecs are not found." ) );
return;