Skip to content

V
vlc-2-2
Commit c1e1c430 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

qt_vlm: add some const for the QString.

parent 9f84f025
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 50 deletions
modules/gui/qt4/dialogs/vlm.cpp
View file @ c1e1c430
...@@ -186,7 +186,7 @@ void VLMDialog::selectVLMItem( int i ) ...@@ -186,7 +186,7 @@ void VLMDialog::selectVLMItem( int i )
ui.vlmItemScroll->ensureWidgetVisible( vlmItems.at( i ) ); ui.vlmItemScroll->ensureWidgetVisible( vlmItems.at( i ) );
} }
bool VLMDialog::isNameGenuine( QString name ) bool VLMDialog::isNameGenuine( const QString& name )
{ {
for( int i = 0; i < vlmItems.size(); i++ ) for( int i = 0; i < vlmItems.size(); i++ )
{ {
...@@ -480,9 +480,9 @@ void VLMDialog::saveModifications() ...@@ -480,9 +480,9 @@ void VLMDialog::saveModifications()
* VLMAWidget - Abstract class * VLMAWidget - Abstract class
********************************/ ********************************/
VLMAWidget::VLMAWidget( QString _name, VLMAWidget::VLMAWidget( const QString& _name,
QString _input, const QString& _input,
QString _output, const QString& _output,
bool _enabled, bool _enabled,
VLMDialog *_parent, VLMDialog *_parent,
int _type ) int _type )
...@@ -538,8 +538,9 @@ void VLMAWidget::toggleEnabled( bool b_enable ) ...@@ -538,8 +538,9 @@ void VLMAWidget::toggleEnabled( bool b_enable )
/**************** /****************
* VLMBroadcast * VLMBroadcast
****************/ ****************/
VLMBroadcast::VLMBroadcast( QString _name, QString _input, QString _output, VLMBroadcast::VLMBroadcast( const QString& _name, const QString& _input,
bool _enabled, bool _looped, VLMDialog *_parent) const QString& _output, bool _enabled,
bool _looped, VLMDialog *_parent )
: VLMAWidget( _name, _input, _output, : VLMAWidget( _name, _input, _output,
_enabled, _parent, QVLM_Broadcast ) _enabled, _parent, QVLM_Broadcast )
{ {
...@@ -605,10 +606,10 @@ void VLMBroadcast::stop() ...@@ -605,10 +606,10 @@ void VLMBroadcast::stop()
/**************** /****************
* VLMSchedule * VLMSchedule
****************/ ****************/
VLMSchedule::VLMSchedule( QString name, QString input, QString output, VLMSchedule::VLMSchedule( const QString& name, const QString& input,
QDateTime _schetime, QDateTime _schedate, const QString& output, QDateTime _schetime,
int _scherepeatnumber, int _repeatDays, QDateTime _schedate, int _scherepeatnumber,
bool enabled, VLMDialog *parent ) int _repeatDays, bool enabled, VLMDialog *parent )
: VLMAWidget( name, input, output, enabled, parent, QVLM_Schedule ) : VLMAWidget( name, input, output, enabled, parent, QVLM_Schedule )
{ {
nameLabel->setText( qtr("Schedule: ") + name ); nameLabel->setText( qtr("Schedule: ") + name );
...@@ -629,8 +630,8 @@ void VLMSchedule::update() ...@@ -629,8 +630,8 @@ void VLMSchedule::update()
/**************** /****************
* VLMVOD * VLMVOD
****************/ ****************/
VLMVod::VLMVod( QString name, QString input, QString output, VLMVod::VLMVod( const QString& name, const QString& input, const QString& output,
bool enabled, QString _mux, VLMDialog *parent) bool enabled, const QString& _mux, VLMDialog *parent)
: VLMAWidget( name, input, output, enabled, parent, QVLM_VOD ) : VLMAWidget( name, input, output, enabled, parent, QVLM_VOD )
{ {
nameLabel->setText( qtr("VOD: ") + name ); nameLabel->setText( qtr("VOD: ") + name );
...@@ -664,8 +665,8 @@ VLMWrapper::~VLMWrapper() ...@@ -664,8 +665,8 @@ VLMWrapper::~VLMWrapper()
p_vlm = NULL; p_vlm = NULL;
} }
void VLMWrapper::AddBroadcast( const QString name, QString input, void VLMWrapper::AddBroadcast( const QString& name, const QString& input,
QString output, const QString& output,
bool b_enabled, bool b_loop ) bool b_enabled, bool b_loop )
{ {
vlm_message_t *message; vlm_message_t *message;
...@@ -675,8 +676,8 @@ void VLMWrapper::AddBroadcast( const QString name, QString input, ...@@ -675,8 +676,8 @@ void VLMWrapper::AddBroadcast( const QString name, QString input,
EditBroadcast( name, input, output, b_enabled, b_loop ); EditBroadcast( name, input, output, b_enabled, b_loop );
} }
void VLMWrapper::EditBroadcast( const QString name, const QString input, void VLMWrapper::EditBroadcast( const QString& name, const QString& input,
const QString output, const QString& output,
bool b_enabled, bool b_loop ) bool b_enabled, bool b_loop )
{ {
vlm_message_t *message; vlm_message_t *message;
...@@ -708,7 +709,7 @@ void VLMWrapper::EditBroadcast( const QString name, const QString input, ...@@ -708,7 +709,7 @@ void VLMWrapper::EditBroadcast( const QString name, const QString input,
} }
} }
void VLMWrapper::EnableItem( const QString name, bool b_enable ) void VLMWrapper::EnableItem( const QString& name, bool b_enable )
{ {
vlm_message_t *message; vlm_message_t *message;
QString command = "setup \"" + name + ( b_enable ? " enable" : " disable" ); QString command = "setup \"" + name + ( b_enable ? " enable" : " disable" );
...@@ -716,7 +717,7 @@ void VLMWrapper::EnableItem( const QString name, bool b_enable ) ...@@ -716,7 +717,7 @@ void VLMWrapper::EnableItem( const QString name, bool b_enable )
vlm_MessageDelete( message ); vlm_MessageDelete( message );
} }
void VLMWrapper::ControlBroadcast( const QString name, int BroadcastStatus, void VLMWrapper::ControlBroadcast( const QString& name, int BroadcastStatus,
unsigned int seek ) unsigned int seek )
{ {
vlm_message_t *message; vlm_message_t *message;
...@@ -741,9 +742,9 @@ void VLMWrapper::ControlBroadcast( const QString name, int BroadcastStatus, ...@@ -741,9 +742,9 @@ void VLMWrapper::ControlBroadcast( const QString name, int BroadcastStatus,
vlm_MessageDelete( message ); vlm_MessageDelete( message );
} }
void VLMWrapper::AddVod( const QString name, const QString input, void VLMWrapper::AddVod( const QString& name, const QString& input,
const QString output, const QString& output,
bool b_enabled, const QString mux ) bool b_enabled, const QString& mux )
{ {
vlm_message_t *message; vlm_message_t *message;
QString command = "new \"" + name + "\" vod"; QString command = "new \"" + name + "\" vod";
...@@ -752,10 +753,10 @@ void VLMWrapper::AddVod( const QString name, const QString input, ...@@ -752,10 +753,10 @@ void VLMWrapper::AddVod( const QString name, const QString input,
EditVod( name, input, output, b_enabled, mux ); EditVod( name, input, output, b_enabled, mux );
} }
void VLMWrapper::EditVod( const QString name, const QString input, void VLMWrapper::EditVod( const QString& name, const QString& input,
const QString output, const QString& output,
bool b_enabled, bool b_enabled,
const QString mux ) const QString& mux )
{ {
vlm_message_t *message; vlm_message_t *message;
QString command = "setup \"" + name + "\" input \"" + input + "\""; QString command = "setup \"" + name + "\" input \"" + input + "\"";
...@@ -783,11 +784,11 @@ void VLMWrapper::EditVod( const QString name, const QString input, ...@@ -783,11 +784,11 @@ void VLMWrapper::EditVod( const QString name, const QString input,
} }
} }
void VLMWrapper::AddSchedule( const QString name, const QString input, void VLMWrapper::AddSchedule( const QString& name, const QString& input,
const QString output, QDateTime _schetime, const QString& output, QDateTime _schetime,
QDateTime _schedate, QDateTime _schedate,
int _scherepeatnumber, int _repeatDays, int _scherepeatnumber, int _repeatDays,
bool b_enabled, const QString mux ) bool b_enabled, const QString& mux )
{ {
vlm_message_t *message; vlm_message_t *message;
QString command = "new \"" + name + "\" schedule"; QString command = "new \"" + name + "\" schedule";
...@@ -797,11 +798,11 @@ void VLMWrapper::AddSchedule( const QString name, const QString input, ...@@ -797,11 +798,11 @@ void VLMWrapper::AddSchedule( const QString name, const QString input,
_scherepeatnumber, _repeatDays, b_enabled, mux ); _scherepeatnumber, _repeatDays, b_enabled, mux );
} }
void VLMWrapper::EditSchedule( const QString name, const QString input, void VLMWrapper::EditSchedule( const QString& name, const QString& input,
const QString output, QDateTime _schetime, const QString& output, QDateTime _schetime,
QDateTime _schedate, int _scherepeatnumber, QDateTime _schedate, int _scherepeatnumber,
int _repeatDays, bool b_enabled, int _repeatDays, bool b_enabled,
const QString mux ) const QString& mux )
{ {
vlm_message_t *message; vlm_message_t *message;
QString command = "setup \"" + name + "\" input \"" + input + "\""; QString command = "setup \"" + name + "\" input \"" + input + "\"";
......
modules/gui/qt4/dialogs/vlm.hpp
View file @ c1e1c430
...@@ -96,7 +96,7 @@ private: ...@@ -96,7 +96,7 @@ private:
QComboBox *mediatype; QComboBox *mediatype;
QDateTimeEdit *time, *date, *repeatTime; QDateTimeEdit *time, *date, *repeatTime;
QSpinBox *scherepeatnumber, *repeatDays; QSpinBox *scherepeatnumber, *repeatDays;
bool isNameGenuine( QString ); bool isNameGenuine( const QString& );
void mediasPopulator(); void mediasPopulator();
public slots: public slots:
void removeVLMItem( VLMAWidget * ); void removeVLMItem( VLMAWidget * );
...@@ -119,27 +119,27 @@ public: ...@@ -119,27 +119,27 @@ public:
VLMWrapper( vlm_t * ); VLMWrapper( vlm_t * );
virtual ~VLMWrapper(); virtual ~VLMWrapper();
static void AddBroadcast( const QString, const QString, const QString, static void AddBroadcast( const QString&, const QString&, const QString&,
bool b_enabled = true, bool b_enabled = true,
bool b_loop = false ); bool b_loop = false );
static void EditBroadcast( const QString, const QString, const QString, static void EditBroadcast( const QString&, const QString&, const QString&,
bool b_enabled = true, bool b_enabled = true,
bool b_loop = false ); bool b_loop = false );
static void EditSchedule( const QString, const QString, const QString, static void EditSchedule( const QString&, const QString&, const QString&,
QDateTime _schetime, QDateTime _schedate, QDateTime _schetime, QDateTime _schedate,
int _scherepeatnumber, int _repeatDays, int _scherepeatnumber, int _repeatDays,
bool b_enabled = true, QString mux = "" ); bool b_enabled = true, const QString& mux = "" );
static void AddVod( const QString, const QString, const QString, static void AddVod( const QString&, const QString&, const QString&,
bool b_enabled = true, QString mux = "" ); bool b_enabled = true, const QString& mux = "" );
static void EditVod( const QString, const QString, const QString, static void EditVod( const QString&, const QString&, const QString&,
bool b_enabled = true, QString mux = "" ); bool b_enabled = true, const QString& mux = "" );
static void AddSchedule( const QString, const QString, const QString, static void AddSchedule( const QString&, const QString&, const QString&,
QDateTime _schetime, QDateTime _schedate, QDateTime _schetime, QDateTime _schedate,
int _scherepeatnumber, int _repeatDays, int _scherepeatnumber, int _repeatDays,
bool b_enabled = true, QString mux = "" ); bool b_enabled = true, const QString& mux = "" );
static void ControlBroadcast( const QString, int, unsigned int seek = 0 ); static void ControlBroadcast( const QString&, int, unsigned int seek = 0 );
static void EnableItem( const QString, bool ); static void EnableItem( const QString&, bool );
/* We don't have yet the accessors in the core, so the following is commented */ /* We don't have yet the accessors in the core, so the following is commented */
//unsigned int NbMedia() { if( p_vlm ) return p_vlm->i_media; return 0; } //unsigned int NbMedia() { if( p_vlm ) return p_vlm->i_media; return 0; }
...@@ -155,7 +155,7 @@ class VLMAWidget : public QGroupBox ...@@ -155,7 +155,7 @@ class VLMAWidget : public QGroupBox
Q_OBJECT Q_OBJECT
friend class VLMDialog; friend class VLMDialog;
public: public:
VLMAWidget( QString name, QString input, QString output, VLMAWidget( const QString& name, const QString& input, const QString& output,
bool _enable, VLMDialog *parent, int _type = QVLM_Broadcast ); bool _enable, VLMDialog *parent, int _type = QVLM_Broadcast );
virtual void update() = 0; virtual void update() = 0;
protected: protected:
...@@ -178,7 +178,7 @@ class VLMBroadcast : public VLMAWidget ...@@ -178,7 +178,7 @@ class VLMBroadcast : public VLMAWidget
Q_OBJECT Q_OBJECT
friend class VLMDialog; friend class VLMDialog;
public: public:
VLMBroadcast( QString name, QString input, QString output, VLMBroadcast( const QString& name, const QString& input, const QString& output,
bool _enable, bool _loop, VLMDialog *parent ); bool _enable, bool _loop, VLMDialog *parent );
void update(); void update();
private: private:
...@@ -196,8 +196,8 @@ class VLMVod : public VLMAWidget ...@@ -196,8 +196,8 @@ class VLMVod : public VLMAWidget
Q_OBJECT Q_OBJECT
friend class VLMDialog; friend class VLMDialog;
public: public:
VLMVod( QString name, QString input, QString output, VLMVod( const QString& name, const QString& input, const QString& output,
bool _enable, QString _mux, VLMDialog *parent ); bool _enable, const QString& _mux, VLMDialog *parent );
void update(); void update();
private: private:
QString mux; QString mux;
...@@ -209,7 +209,7 @@ class VLMSchedule : public VLMAWidget ...@@ -209,7 +209,7 @@ class VLMSchedule : public VLMAWidget
Q_OBJECT Q_OBJECT
friend class VLMDialog; friend class VLMDialog;
public: public:
VLMSchedule( QString name, QString input, QString output, VLMSchedule( const QString& name, const QString& input, const QString& output,
QDateTime schetime, QDateTime schedate, int repeatnumber, QDateTime schetime, QDateTime schedate, int repeatnumber,
int repeatdays, bool enabled, VLMDialog *parent ); int repeatdays, bool enabled, VLMDialog *parent );
void update(); void update();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment