Skip to content

V
vlc
Commit 0b5c3c57 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt4 - Typos/Code conventions/spaces/Cleaning. 

Patch by Rémi Duraffort.
parent c3bcb323
Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 270 deletions
modules/gui/qt4/dialogs_provider.cpp
View file @ 0b5c3c57
...@@ -88,48 +88,48 @@ void DialogsProvider::customEvent( QEvent *event ) ...@@ -88,48 +88,48 @@ void DialogsProvider::customEvent( QEvent *event )
DialogEvent *de = static_cast<DialogEvent*>(event); DialogEvent *de = static_cast<DialogEvent*>(event);
switch( de->i_dialog ) switch( de->i_dialog )
{ {
case INTF_DIALOG_FILE_SIMPLE: case INTF_DIALOG_FILE_SIMPLE:
case INTF_DIALOG_FILE: case INTF_DIALOG_FILE:
openDialog(); break; openDialog(); break;
case INTF_DIALOG_DISC: case INTF_DIALOG_DISC:
openDiscDialog(); break; openDiscDialog(); break;
case INTF_DIALOG_NET: case INTF_DIALOG_NET:
openNetDialog(); break; openNetDialog(); break;
case INTF_DIALOG_SAT: case INTF_DIALOG_SAT:
case INTF_DIALOG_CAPTURE: case INTF_DIALOG_CAPTURE:
openCaptureDialog(); break; openCaptureDialog(); break;
case INTF_DIALOG_DIRECTORY: case INTF_DIALOG_DIRECTORY:
PLAppendDir(); break; PLAppendDir(); break;
case INTF_DIALOG_PLAYLIST: case INTF_DIALOG_PLAYLIST:
playlistDialog(); break; playlistDialog(); break;
case INTF_DIALOG_MESSAGES: case INTF_DIALOG_MESSAGES:
messagesDialog(); break; messagesDialog(); break;
case INTF_DIALOG_FILEINFO: case INTF_DIALOG_FILEINFO:
mediaInfoDialog(); break; mediaInfoDialog(); break;
case INTF_DIALOG_PREFS: case INTF_DIALOG_PREFS:
prefsDialog(); break; prefsDialog(); break;
case INTF_DIALOG_BOOKMARKS: case INTF_DIALOG_BOOKMARKS:
bookmarksDialog(); break; bookmarksDialog(); break;
case INTF_DIALOG_EXTENDED: case INTF_DIALOG_EXTENDED:
extendedDialog(); break; extendedDialog(); break;
case INTF_DIALOG_VLM: case INTF_DIALOG_VLM:
vlmDialog(); break; vlmDialog(); break;
case INTF_DIALOG_INTERACTION: case INTF_DIALOG_INTERACTION:
doInteraction( de->p_arg ); break; doInteraction( de->p_arg ); break;
case INTF_DIALOG_POPUPMENU: case INTF_DIALOG_POPUPMENU:
QVLCMenu::PopupMenu( p_intf, (de->i_arg != 0) ); break; QVLCMenu::PopupMenu( p_intf, (de->i_arg != 0) ); break;
case INTF_DIALOG_AUDIOPOPUPMENU: case INTF_DIALOG_AUDIOPOPUPMENU:
QVLCMenu::AudioPopupMenu( p_intf ); break; QVLCMenu::AudioPopupMenu( p_intf ); break;
case INTF_DIALOG_VIDEOPOPUPMENU: case INTF_DIALOG_VIDEOPOPUPMENU:
QVLCMenu::VideoPopupMenu( p_intf ); break; QVLCMenu::VideoPopupMenu( p_intf ); break;
case INTF_DIALOG_MISCPOPUPMENU: case INTF_DIALOG_MISCPOPUPMENU:
QVLCMenu::MiscPopupMenu( p_intf ); break; QVLCMenu::MiscPopupMenu( p_intf ); break;
case INTF_DIALOG_WIZARD: case INTF_DIALOG_WIZARD:
case INTF_DIALOG_STREAMWIZARD: case INTF_DIALOG_STREAMWIZARD:
case INTF_DIALOG_UPDATEVLC: case INTF_DIALOG_UPDATEVLC:
case INTF_DIALOG_EXIT: case INTF_DIALOG_EXIT:
default: default:
msg_Warn( p_intf, "unimplemented dialog\n" ); msg_Warn( p_intf, "unimplemented dialog" );
} }
} }
} }
...@@ -362,10 +362,10 @@ void DialogsProvider::openAPlaylist() ...@@ -362,10 +362,10 @@ void DialogsProvider::openAPlaylist()
void DialogsProvider::saveAPlaylist() void DialogsProvider::saveAPlaylist()
{ {
QFileDialog *qfd = new QFileDialog( NULL, QFileDialog *qfd = new QFileDialog( NULL,
qtr("Choose a filename to save playlist"), qtr( "Choose a filename to save playlist" ),
qfu( p_intf->p_libvlc->psz_homedir ), qfu( p_intf->p_libvlc->psz_homedir ),
qtr("XSPF playlist (*.xspf);; ") + qtr( "XSPF playlist (*.xspf);; " ) +
qtr("M3U playlist (*.m3u);; Any (*.*) ") ); qtr( "M3U playlist (*.m3u);; Any (*.*) " ) );
qfd->setFileMode( QFileDialog::AnyFile ); qfd->setFileMode( QFileDialog::AnyFile );
qfd->setAcceptMode( QFileDialog::AcceptSave ); qfd->setAcceptMode( QFileDialog::AcceptSave );
qfd->setConfirmOverwrite( true ); qfd->setConfirmOverwrite( true );
...@@ -381,8 +381,8 @@ void DialogsProvider::saveAPlaylist() ...@@ -381,8 +381,8 @@ void DialogsProvider::saveAPlaylist()
QString file = qfd->selectedFiles().first(); QString file = qfd->selectedFiles().first();
QString filter = qfd->selectedFilter(); QString filter = qfd->selectedFilter();
if( file.contains(".xsp") || if( file.contains( ".xsp" ) ||
( filter.contains(".xspf") && !file.contains(".m3u") ) ) ( filter.contains( ".xspf" ) && !file.contains( ".m3u" ) ) )
{ {
psz_module = psz_xspf; psz_module = psz_xspf;
if( !file.contains( ".xsp" ) ) if( !file.contains( ".xsp" ) )
...@@ -395,7 +395,7 @@ void DialogsProvider::saveAPlaylist() ...@@ -395,7 +395,7 @@ void DialogsProvider::saveAPlaylist()
file.append( ".m3u" ); file.append( ".m3u" );
} }
playlist_Export( THEPL, qtu(file), THEPL->p_local_category, playlist_Export( THEPL, qtu( file ), THEPL->p_local_category,
psz_module); psz_module);
} }
} }
...@@ -414,10 +414,10 @@ void DialogsProvider::streamingDialog( QString mrl, bool b_transcode_only ) ...@@ -414,10 +414,10 @@ void DialogsProvider::streamingDialog( QString mrl, bool b_transcode_only )
b_transcode_only ); b_transcode_only );
if( s->exec() == QDialog::Accepted ) if( s->exec() == QDialog::Accepted )
{ {
msg_Err( p_intf, "mrl %s\n", qta( s->getMrl() ) ); msg_Err( p_intf, "mrl %s", qta( s->getMrl() ) );
/* Just do it */ /* Just do it */
int i_len = strlen( qtu( s->getMrl() ) ) + 10; int i_len = strlen( qtu( s->getMrl() ) ) + 10;
char *psz_option = (char*)malloc(i_len); char *psz_option = (char*)malloc( i_len );
snprintf( psz_option, i_len - 1, "%s", qtu( s->getMrl() ) ); snprintf( psz_option, i_len - 1, "%s", qtu( s->getMrl() ) );
playlist_AddExt( THEPL, qtu( mrl ), "Streaming", playlist_AddExt( THEPL, qtu( mrl ), "Streaming",
......
modules/gui/qt4/dialogs_provider.hpp
View file @ 0b5c3c57
...@@ -35,33 +35,33 @@ ...@@ -35,33 +35,33 @@
#include <QTimer> #include <QTimer>
#include <QApplication> #include <QApplication>
#define ADD_FILTER_MEDIA( string ) \ #define ADD_FILTER_MEDIA( string ) \
string += qtr("Media Files"); \ string += qtr( "Media Files" ); \
string += " ( "; \ string += " ( "; \
string += EXTENSIONS_MEDIA; \ string += EXTENSIONS_MEDIA; \
string += ");;"; string += ");;";
#define ADD_FILTER_VIDEO( string ) \ #define ADD_FILTER_VIDEO( string ) \
string += qtr("Video Files"); \ string += qtr( "Video Files" ); \
string += " ( "; \ string += " ( "; \
string += EXTENSIONS_VIDEO; \ string += EXTENSIONS_VIDEO; \
string += ");;"; string += ");;";
#define ADD_FILTER_AUDIO( string ) \ #define ADD_FILTER_AUDIO( string ) \
string += qtr("Audio Files"); \ string += qtr( "Audio Files" ); \
string += " ( "; \ string += " ( "; \
string += EXTENSIONS_AUDIO; \ string += EXTENSIONS_AUDIO; \
string += ");;"; string += ");;";
#define ADD_FILTER_PLAYLIST( string )\ #define ADD_FILTER_PLAYLIST( string ) \
string += qtr("Playlist Files"); \ string += qtr( "Playlist Files" ); \
string += " ( "; \ string += " ( "; \
string += EXTENSIONS_PLAYLIST; \ string += EXTENSIONS_PLAYLIST; \
string += ");;"; string += ");;";
#define ADD_FILTER_SUBTITLE( string )\ #define ADD_FILTER_SUBTITLE( string ) \
string += qtr("Subtitles Files"); \ string += qtr( "Subtitles Files" );\
string += " ( "; \ string += " ( "; \
string += EXTENSIONS_SUBTITLE; \ string += EXTENSIONS_SUBTITLE; \
string += ");;"; string += ");;";
#define ADD_FILTER_ALL( string ) \ #define ADD_FILTER_ALL( string ) \
string += qtr("All Files"); \ string += qtr( "All Files" ); \
string += " (*.*)"; string += " (*.*)";
#define EXT_FILTER_MEDIA 0x01 #define EXT_FILTER_MEDIA 0x01
...@@ -132,7 +132,7 @@ private: ...@@ -132,7 +132,7 @@ private:
public slots: public slots:
void doInteraction( intf_dialog_args_t * ); void doInteraction( intf_dialog_args_t * );
void menuAction( QObject *); void menuAction( QObject *);
void menuUpdateAction( QObject *); void menuUpdateAction( QObject * );
void SDMenuAction( QString ); void SDMenuAction( QString );
void playlistDialog(); void playlistDialog();
......
modules/gui/qt4/input_manager.cpp
View file @ 0b5c3c57
...@@ -38,7 +38,7 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) : ...@@ -38,7 +38,7 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) :
QObject( parent ), p_intf( _p_intf ) QObject( parent ), p_intf( _p_intf )
{ {
i_old_playing_status = END_S; i_old_playing_status = END_S;
old_name=""; old_name = "";
p_input = NULL; p_input = NULL;
i_rate = 0; i_rate = 0;
ON_TIMEOUT( update() ); ON_TIMEOUT( update() );
...@@ -176,7 +176,7 @@ void InputManager::update() ...@@ -176,7 +176,7 @@ void InputManager::update()
if( i_old_playing_status != val.i_int ) if( i_old_playing_status != val.i_int )
{ {
i_old_playing_status = val.i_int; i_old_playing_status = val.i_int;
emit statusChanged( val.i_int == PAUSE_S ? PAUSE_S : PLAYING_S ); emit statusChanged( val.i_int == PAUSE_S ? PAUSE_S : PLAYING_S );
} }
} }
......
modules/gui/qt4/input_manager.hpp
View file @ 0b5c3c57
...@@ -33,7 +33,7 @@ class InputManager : public QObject ...@@ -33,7 +33,7 @@ class InputManager : public QObject
{ {
Q_OBJECT; Q_OBJECT;
public: public:
InputManager( QObject *, intf_thread_t *); InputManager( QObject *, intf_thread_t * );
virtual ~InputManager(); virtual ~InputManager();
void delInput(); void delInput();
...@@ -89,7 +89,7 @@ public: ...@@ -89,7 +89,7 @@ public:
InputManager *getIM() { return im; }; InputManager *getIM() { return im; };
private: private:
MainInputManager( intf_thread_t *); MainInputManager( intf_thread_t * );
InputManager *im; InputManager *im;
intf_thread_t *p_intf; intf_thread_t *p_intf;
...@@ -103,7 +103,7 @@ public slots: ...@@ -103,7 +103,7 @@ public slots:
private slots: private slots:
void updateInput(); void updateInput();
signals: signals:
void inputChanged( input_thread_t *); void inputChanged( input_thread_t * );
}; };
#endif #endif
modules/gui/qt4/main_interface.cpp
View file @ 0b5c3c57
...@@ -143,7 +143,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -143,7 +143,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
handleMainUi( settings ); handleMainUi( settings );
/* Create a Dock to get the playlist */ /* Create a Dock to get the playlist */
dockPL = new QDockWidget( qtr("Playlist"), this ); dockPL = new QDockWidget( qtr( "Playlist" ), this );
dockPL->setSizePolicy( QSizePolicy::Preferred, dockPL->setSizePolicy( QSizePolicy::Preferred,
QSizePolicy::MinimumExpanding ); QSizePolicy::MinimumExpanding );
dockPL->setFeatures( QDockWidget::AllDockWidgetFeatures ); dockPL->setFeatures( QDockWidget::AllDockWidgetFeatures );
...@@ -789,7 +789,7 @@ void MainInterface::setStatus( int status ) ...@@ -789,7 +789,7 @@ void MainInterface::setStatus( int status )
void MainInterface::setRate( int rate ) void MainInterface::setRate( int rate )
{ {
QString str; QString str;
str.setNum( ( 1000 / (double)rate), 'f', 2 ); str.setNum( ( 1000 / (double)rate ), 'f', 2 );
str.append( "x" ); str.append( "x" );
speedLabel->setText( str ); speedLabel->setText( str );
speedControl->updateControls( rate ); speedControl->updateControls( rate );
......
modules/gui/qt4/playlist_model.cpp
View file @ 0b5c3c57
...@@ -58,7 +58,7 @@ static int ItemDeleted( vlc_object_t *p_this, const char *psz_variable, ...@@ -58,7 +58,7 @@ static int ItemDeleted( vlc_object_t *p_this, const char *psz_variable,
* Duration * Duration
*/ */
void PLItem::init( int _i_id, int _i_input_id, PLItem *parent, PLModel *m) void PLItem::init( int _i_id, int _i_input_id, PLItem *parent, PLModel *m )
{ {
parentItem = parent; parentItem = parent;
i_id = _i_id; i_input_id = _i_input_id; i_id = _i_id; i_input_id = _i_input_id;
...@@ -91,39 +91,39 @@ void PLItem::updateview( void ) ...@@ -91,39 +91,39 @@ void PLItem::updateview( void )
{ {
switch( i_index ) switch( i_index )
{ {
case VLC_META_ENGINE_ARTIST: case VLC_META_ENGINE_ARTIST:
strings.append( qtr( VLC_META_ARTIST ) ); strings.append( qtr( VLC_META_ARTIST ) );
break; break;
case VLC_META_ENGINE_TITLE: case VLC_META_ENGINE_TITLE:
strings.append( qtr( VLC_META_TITLE ) ); strings.append( qtr( VLC_META_TITLE ) );
break; break;
case VLC_META_ENGINE_DESCRIPTION: case VLC_META_ENGINE_DESCRIPTION:
strings.append( qtr( VLC_META_DESCRIPTION ) ); strings.append( qtr( VLC_META_DESCRIPTION ) );
break; break;
case VLC_META_ENGINE_DURATION: case VLC_META_ENGINE_DURATION:
strings.append( qtr( "Duration" ) ); strings.append( qtr( "Duration" ) );
break; break;
case VLC_META_ENGINE_GENRE: case VLC_META_ENGINE_GENRE:
strings.append( qtr( VLC_META_GENRE ) ); strings.append( qtr( VLC_META_GENRE ) );
break; break;
case VLC_META_ENGINE_COLLECTION: case VLC_META_ENGINE_COLLECTION:
strings.append( qtr( VLC_META_COLLECTION ) ); strings.append( qtr( VLC_META_COLLECTION ) );
break; break;
case VLC_META_ENGINE_SEQ_NUM: case VLC_META_ENGINE_SEQ_NUM:
strings.append( qtr( VLC_META_SEQ_NUM ) ); strings.append( qtr( VLC_META_SEQ_NUM ) );
break; break;
case VLC_META_ENGINE_RATING: case VLC_META_ENGINE_RATING:
strings.append( qtr( VLC_META_RATING ) ); strings.append( qtr( VLC_META_RATING ) );
break; break;
default: default:
break; break;
} }
} }
} }
} }
PLItem::PLItem( int _i_id, int _i_input_id, PLItem *parent, PLModel *m) PLItem::PLItem( int _i_id, int _i_input_id, PLItem *parent, PLModel *m )
{ {
init( _i_id, _i_input_id, parent, m ); init( _i_id, _i_input_id, parent, m );
} }
...@@ -135,7 +135,7 @@ PLItem::PLItem( playlist_item_t * p_item, PLItem *parent, PLModel *m ) ...@@ -135,7 +135,7 @@ PLItem::PLItem( playlist_item_t * p_item, PLItem *parent, PLModel *m )
PLItem::~PLItem() PLItem::~PLItem()
{ {
qDeleteAll(children); qDeleteAll( children );
children.clear(); children.clear();
} }
...@@ -161,7 +161,7 @@ void PLItem::remove( PLItem *removed ) ...@@ -161,7 +161,7 @@ void PLItem::remove( PLItem *removed )
int PLItem::row() const int PLItem::row() const
{ {
if( parentItem ) if( parentItem )
return parentItem->children.indexOf(const_cast<PLItem*>(this)); return parentItem->children.indexOf( const_cast<PLItem*>(this) );
return 0; return 0;
} }
...@@ -201,43 +201,43 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent ) ...@@ -201,43 +201,43 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent )
{ {
switch( i_index ) switch( i_index )
{ {
case VLC_META_ENGINE_ARTIST: case VLC_META_ENGINE_ARTIST:
ADD_META( p_item, Artist ); ADD_META( p_item, Artist );
break; break;
case VLC_META_ENGINE_TITLE: case VLC_META_ENGINE_TITLE:
char *psz_title, *psz_name; char *psz_title, *psz_name;
psz_title = input_item_GetTitle( p_item->p_input ); psz_title = input_item_GetTitle( p_item->p_input );
psz_name = input_item_GetName( p_item->p_input ); psz_name = input_item_GetName( p_item->p_input );
if( psz_title ) if( psz_title )
{ {
ADD_META( p_item, Title ); ADD_META( p_item, Title );
} else { } else {
strings.append( qfu( psz_name ) ); strings.append( qfu( psz_name ) );
} }
free( psz_title ); free( psz_title );
free( psz_name ); free( psz_name );
break; break;
case VLC_META_ENGINE_DESCRIPTION: case VLC_META_ENGINE_DESCRIPTION:
ADD_META( p_item, Description ); ADD_META( p_item, Description );
break; break;
case VLC_META_ENGINE_DURATION: case VLC_META_ENGINE_DURATION:
secstotimestr( psz_duration, secstotimestr( psz_duration,
input_item_GetDuration( p_item->p_input ) / 1000000 ); input_item_GetDuration( p_item->p_input ) / 1000000 );
strings.append( QString( psz_duration ) ); strings.append( QString( psz_duration ) );
break; break;
case VLC_META_ENGINE_GENRE: case VLC_META_ENGINE_GENRE:
ADD_META( p_item, Genre ); ADD_META( p_item, Genre );
break; break;
case VLC_META_ENGINE_COLLECTION: case VLC_META_ENGINE_COLLECTION:
ADD_META( p_item, Album ); ADD_META( p_item, Album );
break; break;
case VLC_META_ENGINE_SEQ_NUM: case VLC_META_ENGINE_SEQ_NUM:
ADD_META( p_item, TrackNum ); ADD_META( p_item, TrackNum );
break; break;
case VLC_META_ENGINE_RATING: case VLC_META_ENGINE_RATING:
ADD_META( p_item, Rating ); ADD_META( p_item, Rating );
default: default:
break; break;
} }
} }
...@@ -250,8 +250,8 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent ) ...@@ -250,8 +250,8 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent )
*************************************************************************/ *************************************************************************/
PLModel::PLModel( playlist_t *_p_playlist, intf_thread_t *_p_intf, PLModel::PLModel( playlist_t *_p_playlist, intf_thread_t *_p_intf,
playlist_item_t * p_root, int _i_depth, QObject *parent) playlist_item_t * p_root, int _i_depth, QObject *parent )
: QAbstractItemModel(parent) : QAbstractItemModel( parent )
{ {
i_depth = _i_depth; i_depth = _i_depth;
assert( i_depth == 1 || i_depth == -1 ); assert( i_depth == 1 || i_depth == -1 );
...@@ -290,9 +290,9 @@ Qt::DropActions PLModel::supportedDropActions() const ...@@ -290,9 +290,9 @@ Qt::DropActions PLModel::supportedDropActions() const
return Qt::CopyAction; return Qt::CopyAction;
} }
Qt::ItemFlags PLModel::flags(const QModelIndex &index) const Qt::ItemFlags PLModel::flags( const QModelIndex &index ) const
{ {
Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index); Qt::ItemFlags defaultFlags = QAbstractItemModel::flags( index );
if( index.isValid() ) if( index.isValid() )
return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags; return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
else else
...@@ -306,26 +306,26 @@ QStringList PLModel::mimeTypes() const ...@@ -306,26 +306,26 @@ QStringList PLModel::mimeTypes() const
return types; return types;
} }
QMimeData *PLModel::mimeData(const QModelIndexList &indexes) const QMimeData *PLModel::mimeData( const QModelIndexList &indexes ) const
{ {
QMimeData *mimeData = new QMimeData(); QMimeData *mimeData = new QMimeData();
QByteArray encodedData; QByteArray encodedData;
QDataStream stream(&encodedData, QIODevice::WriteOnly); QDataStream stream( &encodedData, QIODevice::WriteOnly );
foreach (QModelIndex index, indexes) { foreach( QModelIndex index, indexes ) {
if (index.isValid() && index.column() == 0 ) if( index.isValid() && index.column() == 0 )
stream << itemId(index); stream << itemId( index );
} }
mimeData->setData("vlc/playlist-item-id", encodedData); mimeData->setData( "vlc/playlist-item-id", encodedData );
return mimeData; return mimeData;
} }
bool PLModel::dropMimeData(const QMimeData *data, Qt::DropAction action, bool PLModel::dropMimeData( const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &target) int row, int column, const QModelIndex &target )
{ {
if ( data->hasFormat("vlc/playlist-item-id") ) if( data->hasFormat( "vlc/playlist-item-id" ) )
{ {
if (action == Qt::IgnoreAction) if( action == Qt::IgnoreAction )
return true; return true;
PLItem *targetItem; PLItem *targetItem;
...@@ -334,11 +334,11 @@ bool PLModel::dropMimeData(const QMimeData *data, Qt::DropAction action, ...@@ -334,11 +334,11 @@ bool PLModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
else else
targetItem = rootItem; targetItem = rootItem;
QByteArray encodedData = data->data("vlc/playlist-item-id"); QByteArray encodedData = data->data( "vlc/playlist-item-id" );
QDataStream stream(&encodedData, QIODevice::ReadOnly); QDataStream stream( &encodedData, QIODevice::ReadOnly );
PLItem *newParentItem; PLItem *newParentItem;
while (!stream.atEnd()) while( !stream.atEnd() )
{ {
int i; int i;
int srcId; int srcId;
...@@ -456,9 +456,9 @@ void PLModel::activateItem( playlist_item_t *p_item ) ...@@ -456,9 +456,9 @@ void PLModel::activateItem( playlist_item_t *p_item )
} }
/****************** Base model mandatory implementations *****************/ /****************** Base model mandatory implementations *****************/
QVariant PLModel::data(const QModelIndex &index, int role) const QVariant PLModel::data( const QModelIndex &index, int role ) const
{ {
if(!index.isValid() ) return QVariant(); if( !index.isValid() ) return QVariant();
PLItem *item = static_cast<PLItem*>(index.internalPointer()); PLItem *item = static_cast<PLItem*>(index.internalPointer());
if( role == Qt::DisplayRole ) if( role == Qt::DisplayRole )
{ {
...@@ -492,25 +492,25 @@ int PLModel::itemId( const QModelIndex &index ) const ...@@ -492,25 +492,25 @@ int PLModel::itemId( const QModelIndex &index ) const
} }
QVariant PLModel::headerData( int section, Qt::Orientation orientation, QVariant PLModel::headerData( int section, Qt::Orientation orientation,
int role) const int role ) const
{ {
if (orientation == Qt::Horizontal && role == Qt::DisplayRole) if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
return QVariant( rootItem->columnString( section ) ); return QVariant( rootItem->columnString( section ) );
return QVariant(); return QVariant();
} }
QModelIndex PLModel::index(int row, int column, const QModelIndex &parent) QModelIndex PLModel::index( int row, int column, const QModelIndex &parent )
const const
{ {
PLItem *parentItem; PLItem *parentItem;
if (!parent.isValid()) if( !parent.isValid() )
parentItem = rootItem; parentItem = rootItem;
else else
parentItem = static_cast<PLItem*>(parent.internalPointer()); parentItem = static_cast<PLItem*>(parent.internalPointer());
PLItem *childItem = parentItem->child(row); PLItem *childItem = parentItem->child( row );
if (childItem) if( childItem )
return createIndex(row, column, childItem); return createIndex( row, column, childItem );
else else
return QModelIndex(); return QModelIndex();
} }
...@@ -526,12 +526,12 @@ QModelIndex PLModel::index( PLItem *item, int column ) const ...@@ -526,12 +526,12 @@ QModelIndex PLModel::index( PLItem *item, int column ) const
return QModelIndex(); return QModelIndex();
} }
QModelIndex PLModel::parent(const QModelIndex &index) const QModelIndex PLModel::parent( const QModelIndex &index ) const
{ {
if( !index.isValid() ) return QModelIndex(); if( !index.isValid() ) return QModelIndex();
PLItem *childItem = static_cast<PLItem*>(index.internalPointer()); PLItem *childItem = static_cast<PLItem*>(index.internalPointer());
if( !childItem ) { msg_Err( p_playlist, "NULL CHILD \n" ); return QModelIndex(); } if( !childItem ) { msg_Err( p_playlist, "NULL CHILD" ); return QModelIndex(); }
PLItem *parentItem = childItem->parent(); PLItem *parentItem = childItem->parent();
if( !parentItem || parentItem == rootItem ) return QModelIndex(); if( !parentItem || parentItem == rootItem ) return QModelIndex();
if( ! parentItem->parentItem ) if( ! parentItem->parentItem )
...@@ -549,16 +549,16 @@ int PLModel::columnCount( const QModelIndex &i) const ...@@ -549,16 +549,16 @@ int PLModel::columnCount( const QModelIndex &i) const
return rootItem->strings.count(); return rootItem->strings.count();
} }
int PLModel::childrenCount(const QModelIndex &parent) const int PLModel::childrenCount( const QModelIndex &parent ) const
{ {
return rowCount( parent ); return rowCount( parent );
} }
int PLModel::rowCount(const QModelIndex &parent) const int PLModel::rowCount( const QModelIndex &parent ) const
{ {
PLItem *parentItem; PLItem *parentItem;
if (!parent.isValid()) if( !parent.isValid() )
parentItem = rootItem; parentItem = rootItem;
else else
parentItem = static_cast<PLItem*>(parent.internalPointer()); parentItem = static_cast<PLItem*>(parent.internalPointer());
...@@ -860,7 +860,7 @@ void PLModel::doDelete( QModelIndexList selected ) ...@@ -860,7 +860,7 @@ void PLModel::doDelete( QModelIndexList selected )
} }
} }
void PLModel::recurseDelete( QList<PLItem*> children, QModelIndexList *fullList) void PLModel::recurseDelete( QList<PLItem*> children, QModelIndexList *fullList )
{ {
for( int i = children.size() - 1; i >= 0 ; i-- ) for( int i = children.size() - 1; i >= 0 ; i-- )
{ {
...@@ -978,32 +978,32 @@ void PLModel::viewchanged( int meta ) ...@@ -978,32 +978,32 @@ void PLModel::viewchanged( int meta )
int index=0; int index=0;
switch( meta ) switch( meta )
{ {
case VLC_META_ENGINE_TITLE: case VLC_META_ENGINE_TITLE:
index=0; index=0;
break; break;
case VLC_META_ENGINE_DURATION: case VLC_META_ENGINE_DURATION:
index=1; index=1;
break; break;
case VLC_META_ENGINE_ARTIST: case VLC_META_ENGINE_ARTIST:
index=2; index=2;
break; break;
case VLC_META_ENGINE_GENRE: case VLC_META_ENGINE_GENRE:
index=3; index=3;
break; break;
case VLC_META_ENGINE_COPYRIGHT: case VLC_META_ENGINE_COPYRIGHT:
index=4; index=4;
break; break;
case VLC_META_ENGINE_COLLECTION: case VLC_META_ENGINE_COLLECTION:
index=5; index=5;
break; break;
case VLC_META_ENGINE_SEQ_NUM: case VLC_META_ENGINE_SEQ_NUM:
index=6; index=6;
break; break;
case VLC_META_ENGINE_DESCRIPTION: case VLC_META_ENGINE_DESCRIPTION:
index=7; index=7;
break; break;
default: default:
break; break;
} }
emit layoutAboutToBeChanged(); emit layoutAboutToBeChanged();
index = __MIN( index , rootItem->strings.count() ); index = __MIN( index , rootItem->strings.count() );
......
modules/gui/qt4/playlist_model.hpp
View file @ 0b5c3c57
...@@ -40,8 +40,8 @@ class QSignalMapper; ...@@ -40,8 +40,8 @@ class QSignalMapper;
class PLItem class PLItem
{ {
public: public:
PLItem( int, int, PLItem *parent , PLModel *); PLItem( int, int, PLItem *parent , PLModel * );
PLItem( playlist_item_t *, PLItem *parent, PLModel *); PLItem( playlist_item_t *, PLItem *parent, PLModel * );
~PLItem(); ~PLItem();
int row() const; int row() const;
...@@ -57,7 +57,7 @@ public: ...@@ -57,7 +57,7 @@ public:
QString columnString( int col ) { return strings.value( col ); }; QString columnString( int col ) { return strings.value( col ); };
PLItem *parent() { return parentItem; }; PLItem *parent() { return parentItem; };
void update( playlist_item_t *, bool); void update( playlist_item_t *, bool );
protected: protected:
QList<PLItem*> children; QList<PLItem*> children;
QList<QString> strings; QList<QString> strings;
...@@ -102,19 +102,19 @@ class PLModel : public QAbstractItemModel ...@@ -102,19 +102,19 @@ class PLModel : public QAbstractItemModel
public: public:
PLModel( playlist_t *, intf_thread_t *, PLModel( playlist_t *, intf_thread_t *,
playlist_item_t *, int, QObject *parent = 0); playlist_item_t *, int, QObject *parent = 0 );
~PLModel(); ~PLModel();
/* All types of lookups / QModel stuff */ /* All types of lookups / QModel stuff */
QVariant data( const QModelIndex &index, int role) const; QVariant data( const QModelIndex &index, int role ) const;
Qt::ItemFlags flags( const QModelIndex &index) const; Qt::ItemFlags flags( const QModelIndex &index ) const;
QVariant headerData( int section, Qt::Orientation orientation, QVariant headerData( int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const; int role = Qt::DisplayRole ) const;
QModelIndex index( int r, int c, const QModelIndex &parent ) const; QModelIndex index( int r, int c, const QModelIndex &parent ) const;
QModelIndex index( PLItem *, int c ) const; QModelIndex index( PLItem *, int c ) const;
int itemId( const QModelIndex &index ) const; int itemId( const QModelIndex &index ) const;
bool isCurrent( const QModelIndex &index ); bool isCurrent( const QModelIndex &index );
QModelIndex parent( const QModelIndex &index) const; QModelIndex parent( const QModelIndex &index ) const;
int childrenCount( const QModelIndex &parent = QModelIndex() ) const; int childrenCount( const QModelIndex &parent = QModelIndex() ) const;
int rowCount( const QModelIndex &parent = QModelIndex() ) const; int rowCount( const QModelIndex &parent = QModelIndex() ) const;
int columnCount( const QModelIndex &parent = QModelIndex() ) const; int columnCount( const QModelIndex &parent = QModelIndex() ) const;
...@@ -122,7 +122,7 @@ public: ...@@ -122,7 +122,7 @@ public:
bool b_need_update; bool b_need_update;
int i_items_to_append; int i_items_to_append;
void rebuild(); void rebuild( playlist_item_t *); void rebuild(); void rebuild( playlist_item_t * );
bool hasRandom(); bool hasLoop(); bool hasRepeat(); bool hasRandom(); bool hasLoop(); bool hasRepeat();
/* Actions made by the views */ /* Actions made by the views */
...@@ -134,9 +134,9 @@ public: ...@@ -134,9 +134,9 @@ public:
/* DnD handling */ /* DnD handling */
Qt::DropActions supportedDropActions() const; Qt::DropActions supportedDropActions() const;
QMimeData* mimeData(const QModelIndexList &indexes) const; QMimeData* mimeData( const QModelIndexList &indexes ) const;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, bool dropMimeData( const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &target); int row, int column, const QModelIndex &target );
QStringList mimeTypes() const; QStringList mimeTypes() const;
void sendArt( QString url ); void sendArt( QString url );
...@@ -167,7 +167,7 @@ private: ...@@ -167,7 +167,7 @@ private:
void UpdateNodeChildren( playlist_item_t *, PLItem * ); void UpdateNodeChildren( playlist_item_t *, PLItem * );
/* Actions */ /* Actions */
void recurseDelete( QList<PLItem*> children, QModelIndexList *fullList); void recurseDelete( QList<PLItem*> children, QModelIndexList *fullList );
void doDeleteItem( PLItem *item, QModelIndexList *fullList ); void doDeleteItem( PLItem *item, QModelIndexList *fullList );
/* Popup */ /* Popup */
......
modules/gui/qt4/qt4.cpp
View file @ 0b5c3c57
...@@ -47,67 +47,67 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); ...@@ -47,67 +47,67 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
#define ALWAYS_VIDEO_TEXT N_("Always show video area") #define ALWAYS_VIDEO_TEXT N_( "Always show video area" )
#define ALWAYS_VIDEO_LONGTEXT N_("Start VLC with a cone image, and display it" \ #define ALWAYS_VIDEO_LONGTEXT N_( "Start VLC with a cone image, and display it" \
" when there is no video track." ) " when there is no video track." )
#define ADVANCED_PREFS_TEXT N_("Show advanced prefs over simple ones") #define ADVANCED_PREFS_TEXT N_( "Show advanced prefs over simple ones" )
#define ADVANCED_PREFS_LONGTEXT N_("Show advanced preferences and not simple " \ #define ADVANCED_PREFS_LONGTEXT N_( "Show advanced preferences and not simple " \
"preferences when opening the preferences " \ "preferences when opening the preferences " \
"dialog.") "dialog." )
#define SYSTRAY_TEXT N_("Systray icon") #define SYSTRAY_TEXT N_( "Systray icon" )
#define SYSTRAY_LONGTEXT N_("Show an icon in the systray " \ #define SYSTRAY_LONGTEXT N_( "Show an icon in the systray " \
"allowing you to control VLC media player " \ "allowing you to control VLC media player " \
"for basic actions") "for basic actions" )
#define MINIMIZED_TEXT N_("Start VLC with only a systray icon") #define MINIMIZED_TEXT N_( "Start VLC with only a systray icon" )
#define MINIMIZED_LONGTEXT N_("When you launch VLC with that option, " \ #define MINIMIZED_LONGTEXT N_( "When you launch VLC with that option, " \
"VLC will start with just an icon in" \ "VLC will start with just an icon in" \
"your taskbar") "your taskbar" )
#define TITLE_TEXT N_("Show playing item name in window title") #define TITLE_TEXT N_( "Show playing item name in window title" )
#define TITLE_LONGTEXT N_("Show the name of the song or video in the " \ #define TITLE_LONGTEXT N_( "Show the name of the song or video in the " \
"controler window title") "controler window title" )
#define FILEDIALOG_PATH_TEXT N_("Path to use in openfile dialog") #define FILEDIALOG_PATH_TEXT N_( "Path to use in openfile dialog" )
#define NOTIFICATION_TEXT N_("Show notification popup on track change") #define NOTIFICATION_TEXT N_( "Show notification popup on track change" )
#define NOTIFICATION_LONGTEXT N_( \ #define NOTIFICATION_LONGTEXT N_( \
"Show a notification popup with the artist and track name when " \ "Show a notification popup with the artist and track name when " \
"the current playlist item changes, when VLC is minimized or hidden." ) "the current playlist item changes, when VLC is minimized or hidden." )
#define ADVANCED_OPTIONS_TEXT N_("Advanced options") #define ADVANCED_OPTIONS_TEXT N_( "Advanced options" )
#define ADVANCED_OPTIONS_LONGTEXT N_("Show all the advanced options " \ #define ADVANCED_OPTIONS_LONGTEXT N_( "Show all the advanced options " \
"in the dialogs") "in the dialogs" )
#define OPACITY_TEXT N_("Windows opacity between 0.1 and 1.") #define OPACITY_TEXT N_( "Windows opacity between 0.1 and 1." )
#define OPACITY_LONGTEXT N_("Sets the windows opacity between 0.1 and 1 " \ #define OPACITY_LONGTEXT N_( "Sets the windows opacity between 0.1 and 1 " \
"for main interface, playlist and extended panel." \ "for main interface, playlist and extended panel." \
" This option only works with Windows and " \ " This option only works with Windows and " \
"X11 with composite extensions.") "X11 with composite extensions." )
#define SHOWFLAGS_TEXT N_("Define what columns to show in playlist window") #define SHOWFLAGS_TEXT N_( "Define what columns to show in playlist window" )
#define SHOWFLAGS_LONGTEXT N_("Enter the sum of the options that you want: \n" \ #define SHOWFLAGS_LONGTEXT N_( "Enter the sum of the options that you want: \n" \
"Title: 1; Duration: 2; Artist: 4; Genre: 8; " \ "Title: 1; Duration: 2; Artist: 4; Genre: 8; " \
"Copyright: 16; Collection/album: 32; Rating: 256." ) "Copyright: 16; Collection/album: 32; Rating: 256." )
#define ERROR_TEXT N_("Show unimportant error and warnings dialogs" ) #define ERROR_TEXT N_( "Show unimportant error and warnings dialogs" )
#define MINIMAL_TEXT N_("Start in minimal view (menus hidden)." ) #define MINIMAL_TEXT N_( "Start in minimal view (menus hidden)." )
#define UPDATER_TEXT N_("Activate the new updates notification") #define UPDATER_TEXT N_( "Activate the new updates notification" )
#define UPDATER_LONGTEXT N_("Activate the automatic notification of new " \ #define UPDATER_LONGTEXT N_( "Activate the automatic notification of new " \
"versions of the software. It runs once a week." ) "versions of the software. It runs once a week." )
#define COMPLETEVOL_TEXT N_("Allow the volume to be set to 400%" ) #define COMPLETEVOL_TEXT N_( "Allow the volume to be set to 400%" )
#define COMPLETEVOL_LONGTEXT N_("Allow the volume to have range from 0% to " \ #define COMPLETEVOL_LONGTEXT N_( "Allow the volume to have range from 0% to " \
"400%, instead of 0% to 200%. This option " \ "400%, instead of 0% to 200%. This option " \
"can distort the audio, since it uses " \ "can distort the audio, since it uses " \
"software amplification.") "software amplification." )
#define BLING_TEXT N_("Use non native buttons and volume slider") #define BLING_TEXT N_( "Use non native buttons and volume slider" )
#define PRIVACY_TEXT N_("Ask for network policy at start") #define PRIVACY_TEXT N_( "Ask for network policy at start" )
vlc_module_begin(); vlc_module_begin();
set_shortname( (char *)"Qt" ); set_shortname( (char *)"Qt" );
...@@ -144,9 +144,9 @@ vlc_module_begin(); ...@@ -144,9 +144,9 @@ vlc_module_begin();
BLING_TEXT, VLC_FALSE ); BLING_TEXT, VLC_FALSE );
add_bool( "qt-volume-complete", VLC_FALSE, NULL, COMPLETEVOL_TEXT, add_bool( "qt-volume-complete", VLC_FALSE, NULL, COMPLETEVOL_TEXT,
COMPLETEVOL_LONGTEXT, VLC_TRUE); COMPLETEVOL_LONGTEXT, VLC_TRUE );
add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT, add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT,
FILEDIALOG_PATH_TEXT, VLC_TRUE); FILEDIALOG_PATH_TEXT, VLC_TRUE );
change_autosave(); change_autosave();
change_internal(); change_internal();
...@@ -183,10 +183,10 @@ static int Open( vlc_object_t *p_this ) ...@@ -183,10 +183,10 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
#endif #endif
p_intf->p_sys = (intf_sys_t *)malloc(sizeof( intf_sys_t ) ); p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
if( !p_intf->p_sys ) if( !p_intf->p_sys )
{ {
msg_Err(p_intf, "Out of memory"); msg_Err( p_intf, "Out of memory" );
return VLC_ENOMEM; return VLC_ENOMEM;
} }
memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) ); memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) );
...@@ -250,7 +250,7 @@ static void Init( intf_thread_t *p_intf ) ...@@ -250,7 +250,7 @@ static void Init( intf_thread_t *p_intf )
* disables icon theme use because that makes Cleanlooks style bug * disables icon theme use because that makes Cleanlooks style bug
* because it asks gconf for some settings that timeout because of threads * because it asks gconf for some settings that timeout because of threads
* see commits 21610 21622 21654 for reference */ * see commits 21610 21622 21654 for reference */
QApplication::setDesktopSettingsAware(false); QApplication::setDesktopSettingsAware( false );
#endif #endif
/* Start the QApplication here */ /* Start the QApplication here */
...@@ -272,12 +272,12 @@ static void Init( intf_thread_t *p_intf ) ...@@ -272,12 +272,12 @@ static void Init( intf_thread_t *p_intf )
/*if( p_intf->pf_show_dialog )*/ /*if( p_intf->pf_show_dialog )*/
vlc_thread_ready( p_intf ); vlc_thread_ready( p_intf );
// Translation - get locale // Translation - get locale
QLocale ql = QLocale::system (); QLocale ql = QLocale::system();
// Translations for qt's own dialogs // Translations for qt's own dialogs
QTranslator qtTranslator( 0 ); QTranslator qtTranslator( 0 );
// Let's find the right path for the translation file // Let's find the right path for the translation file
#if !defined( WIN32 ) #if !defined( WIN32 )
QString path = QString(QT4LOCALEDIR); QString path = QString( QT4LOCALEDIR );
#else #else
QString path = QString( QString(system_VLCPath()) + DIR_SEP + QString path = QString( QString(system_VLCPath()) + DIR_SEP +
"locale" + DIR_SEP ); "locale" + DIR_SEP );
...@@ -285,8 +285,8 @@ static void Init( intf_thread_t *p_intf ) ...@@ -285,8 +285,8 @@ static void Init( intf_thread_t *p_intf )
// files depending on locale // files depending on locale
bool b_loaded = qtTranslator.load( path + "qt_" + ql.name()); bool b_loaded = qtTranslator.load( path + "qt_" + ql.name());
if (!b_loaded) if (!b_loaded)
msg_Dbg(p_intf, "Error while initializing qt-specific localization"); msg_Dbg( p_intf, "Error while initializing qt-specific localization" );
app->installTranslator(&qtTranslator); app->installTranslator( &qtTranslator );
/* Start playing if needed */ /* Start playing if needed */
if( !p_intf->pf_show_dialog && p_intf->b_play ) if( !p_intf->pf_show_dialog && p_intf->b_play )
......
modules/gui/qt4/qt4.hpp
View file @ 0b5c3c57
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
/* Add define for duration, VLC_META_ENGINE doesn't include it */ /* Add define for duration, VLC_META_ENGINE doesn't include it */
#define VLC_META_ENGINE_DURATION 0x00000002 #define VLC_META_ENGINE_DURATION 0x00000002
#define VLC_META_DURATION N_("Duration") #define VLC_META_DURATION N_( "Duration" )
class QApplication; class QApplication;
class QMenu; class QMenu;
......
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