Commit 8c75cc25 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Fixing another batch of warnings.

parent 23eda6eb
...@@ -164,9 +164,9 @@ void MainWindow::changeEvent( QEvent *e ) ...@@ -164,9 +164,9 @@ void MainWindow::changeEvent( QEvent *e )
} }
//use this helper when the shortcut is binded to a menu action //use this helper when the shortcut is binded to a menu action
#define CREATE_MENU_SHORTCUT( key, defaultValue, name, desc, actionInstance ) \ #define CREATE_MENU_SHORTCUT( key, defaultValue, name, desc, actionInstance ) \
VLMC_CREATE_PREFERENCE_KEYBOARD( key, defaultValue, name, desc ); \ VLMC_CREATE_PREFERENCE_KEYBOARD( key, defaultValue, name, desc ); \
KeyboardShortcutHelper *helper##actionInstance = new KeyboardShortcutHelper( key, m_ui.actionInstance, this ); new KeyboardShortcutHelper( key, m_ui.actionInstance, this );
void void
MainWindow::initVlmcPreferences() MainWindow::initVlmcPreferences()
......
...@@ -63,12 +63,12 @@ void UndoStack::endMacro() ...@@ -63,12 +63,12 @@ void UndoStack::endMacro()
bool UndoStack::canUndo() bool UndoStack::canUndo()
{ {
m_undoStack->canUndo(); return m_undoStack->canUndo();
} }
bool UndoStack::canRedo() bool UndoStack::canRedo()
{ {
m_undoStack->canRedo(); return m_undoStack->canRedo();
} }
void UndoStack::clear() void UndoStack::clear()
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
RendererSettings::RendererSettings() RendererSettings::RendererSettings()
{ {
SettingsManager::Type xml = SettingsManager::Project;
m_ui.setupUi( this ); m_ui.setupUi( this );
connect( m_ui.outputFileNameButton, SIGNAL(clicked() ), connect( m_ui.outputFileNameButton, SIGNAL(clicked() ),
this, SLOT(selectOutputFileName() ) ); this, SLOT(selectOutputFileName() ) );
......
...@@ -85,6 +85,8 @@ PreferenceWidget::widgetFactory( SettingValue *s ) ...@@ -85,6 +85,8 @@ PreferenceWidget::widgetFactory( SettingValue *s )
return new DoubleWidget( s, this ); return new DoubleWidget( s, this );
case SettingValue::Bool: case SettingValue::Bool:
return new BoolWidget( s, this ); return new BoolWidget( s, this );
default:
return NULL;
} }
} }
......
...@@ -33,9 +33,14 @@ ...@@ -33,9 +33,14 @@
#include "Media.h" #include "Media.h"
AbstractGraphicsMediaItem::AbstractGraphicsMediaItem( Clip* clip ) : AbstractGraphicsMediaItem::AbstractGraphicsMediaItem( Clip* clip ) :
oldTrackNumber( -1 ), oldPosition( -1 ), m_tracksView( NULL ), oldTrackNumber( -1 ),
m_group( NULL ), m_width( 0 ), m_height( 0 ), m_resizeExpected( false ), oldPosition( -1 ),
m_muted( false ) m_tracksView( NULL ),
m_group( NULL ),
m_width( 0 ),
m_height( 0 ),
m_muted( false ),
m_resizeExpected( false )
{ {
m_clipHelper = new ClipHelper( clip ); m_clipHelper = new ClipHelper( clip );
// Adjust the width // Adjust the width
...@@ -47,9 +52,15 @@ AbstractGraphicsMediaItem::AbstractGraphicsMediaItem( Clip* clip ) : ...@@ -47,9 +52,15 @@ AbstractGraphicsMediaItem::AbstractGraphicsMediaItem( Clip* clip ) :
} }
AbstractGraphicsMediaItem::AbstractGraphicsMediaItem( ClipHelper* ch ) : AbstractGraphicsMediaItem::AbstractGraphicsMediaItem( ClipHelper* ch ) :
oldTrackNumber( -1 ), oldPosition( -1 ), m_tracksView( NULL ), oldTrackNumber( -1 ),
m_group( NULL ), m_width( 0 ), m_height( 0 ), m_resizeExpected( false ), oldPosition( -1 ),
m_muted( false ), m_clipHelper( ch ) m_clipHelper( ch ),
m_tracksView( NULL ),
m_group( NULL ),
m_width( 0 ),
m_height( 0 ),
m_muted( false ),
m_resizeExpected( false )
{ {
// Adjust the width // Adjust the width
setWidth( ch->length() ); setWidth( ch->length() );
......
...@@ -136,7 +136,7 @@ void GeneralPage::updateProjectLocation() ...@@ -136,7 +136,7 @@ void GeneralPage::updateProjectLocation()
} }
} }
void GeneralPage::setWorkspaceStatus( bool valid ) void GeneralPage::setWorkspaceStatus( bool /*valid*/ )
{ {
} }
...@@ -59,8 +59,6 @@ int VideoPage::nextId() const ...@@ -59,8 +59,6 @@ int VideoPage::nextId() const
void VideoPage::initializePage() void VideoPage::initializePage()
{ {
SettingsManager* sManager = SettingsManager::getInstance();
int projectFps = 30; int projectFps = 30;
int projectHeight = 300; int projectHeight = 300;
int projectWidth = 480; int projectWidth = 480;
...@@ -88,7 +86,6 @@ void VideoPage::initializePage() ...@@ -88,7 +86,6 @@ void VideoPage::initializePage()
ui.comboBoxAudioSamplerate->setCurrentIndex( HZ_44100 ); ui.comboBoxAudioSamplerate->setCurrentIndex( HZ_44100 );
break; break;
} }
} }
bool VideoPage::validatePage() bool VideoPage::validatePage()
......
...@@ -42,8 +42,8 @@ WorkflowRenderer::WorkflowRenderer() : ...@@ -42,8 +42,8 @@ WorkflowRenderer::WorkflowRenderer() :
m_mainWorkflow( MainWorkflow::getInstance() ), m_mainWorkflow( MainWorkflow::getInstance() ),
m_stopping( false ), m_stopping( false ),
m_outputFps( 0.0f ), m_outputFps( 0.0f ),
m_esHandler( NULL ),
m_media( NULL ), m_media( NULL ),
m_esHandler( NULL ),
m_width( 0 ), m_width( 0 ),
m_height( 0 ), m_height( 0 ),
m_silencedAudioBuffer( NULL ), m_silencedAudioBuffer( NULL ),
...@@ -391,7 +391,7 @@ void WorkflowRenderer::__endReached() ...@@ -391,7 +391,7 @@ void WorkflowRenderer::__endReached()
} }
void void
WorkflowRenderer::mainWorkflowLenghtChanged( qint64 newLength ) WorkflowRenderer::mainWorkflowLenghtChanged( qint64 /*newLength*/ )
{ {
// if ( newLength > 0 ) // if ( newLength > 0 )
// { // {
......
...@@ -103,7 +103,7 @@ ImageClipWorkflow::lock(ImageClipWorkflow *cw, void **pp_ret, int size ) ...@@ -103,7 +103,7 @@ ImageClipWorkflow::lock(ImageClipWorkflow *cw, void **pp_ret, int size )
} }
void void
ImageClipWorkflow::unlock(ImageClipWorkflow *cw, void *buffer, int width, int height, int bpp, int size, qint64 pts) ImageClipWorkflow::unlock(ImageClipWorkflow *cw, void*, int, int, int, int, qint64 )
{ {
cw->m_renderLock->unlock(); cw->m_renderLock->unlock();
cw->emit computedFinished(); cw->emit computedFinished();
......
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