[vlmc-devel] commit: Fixing another batch of warnings. ( Hugo Beauzée-Luyssen )
git at videolan.org
git at videolan.org
Fri May 14 18:51:28 CEST 2010
vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Fri May 14 16:05:54 2010 +0200| [8c75cc25521b7efe3d11de6eb92368951115f081] | committer: Hugo Beauzée-Luyssen
Fixing another batch of warnings.
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=8c75cc25521b7efe3d11de6eb92368951115f081
---
src/Gui/MainWindow.cpp | 6 +++---
src/Gui/UndoStack.cpp | 4 ++--
src/Gui/export/RendererSettings.cpp | 1 -
src/Gui/settings/PreferenceWidget.cpp | 2 ++
src/Gui/timeline/AbstractGraphicsMediaItem.cpp | 23 +++++++++++++++++------
src/Gui/wizard/GeneralPage.cpp | 2 +-
src/Gui/wizard/VideoPage.cpp | 3 ---
src/Renderer/WorkflowRenderer.cpp | 4 ++--
src/Workflow/ImageClipWorkflow.cpp | 2 +-
9 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 315ea9d..055fb4f 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -164,9 +164,9 @@ void MainWindow::changeEvent( QEvent *e )
}
//use this helper when the shortcut is binded to a menu action
-#define CREATE_MENU_SHORTCUT( key, defaultValue, name, desc, actionInstance ) \
- VLMC_CREATE_PREFERENCE_KEYBOARD( key, defaultValue, name, desc ); \
- KeyboardShortcutHelper *helper##actionInstance = new KeyboardShortcutHelper( key, m_ui.actionInstance, this );
+#define CREATE_MENU_SHORTCUT( key, defaultValue, name, desc, actionInstance ) \
+ VLMC_CREATE_PREFERENCE_KEYBOARD( key, defaultValue, name, desc ); \
+ new KeyboardShortcutHelper( key, m_ui.actionInstance, this );
void
MainWindow::initVlmcPreferences()
diff --git a/src/Gui/UndoStack.cpp b/src/Gui/UndoStack.cpp
index a83b787..7a6ea88 100644
--- a/src/Gui/UndoStack.cpp
+++ b/src/Gui/UndoStack.cpp
@@ -63,12 +63,12 @@ void UndoStack::endMacro()
bool UndoStack::canUndo()
{
- m_undoStack->canUndo();
+ return m_undoStack->canUndo();
}
bool UndoStack::canRedo()
{
- m_undoStack->canRedo();
+ return m_undoStack->canRedo();
}
void UndoStack::clear()
diff --git a/src/Gui/export/RendererSettings.cpp b/src/Gui/export/RendererSettings.cpp
index 79a83d9..03b71c3 100644
--- a/src/Gui/export/RendererSettings.cpp
+++ b/src/Gui/export/RendererSettings.cpp
@@ -33,7 +33,6 @@
RendererSettings::RendererSettings()
{
- SettingsManager::Type xml = SettingsManager::Project;
m_ui.setupUi( this );
connect( m_ui.outputFileNameButton, SIGNAL(clicked() ),
this, SLOT(selectOutputFileName() ) );
diff --git a/src/Gui/settings/PreferenceWidget.cpp b/src/Gui/settings/PreferenceWidget.cpp
index 5d50103..9a42b52 100644
--- a/src/Gui/settings/PreferenceWidget.cpp
+++ b/src/Gui/settings/PreferenceWidget.cpp
@@ -85,6 +85,8 @@ PreferenceWidget::widgetFactory( SettingValue *s )
return new DoubleWidget( s, this );
case SettingValue::Bool:
return new BoolWidget( s, this );
+ default:
+ return NULL;
}
}
diff --git a/src/Gui/timeline/AbstractGraphicsMediaItem.cpp b/src/Gui/timeline/AbstractGraphicsMediaItem.cpp
index 22ab475..64f7764 100644
--- a/src/Gui/timeline/AbstractGraphicsMediaItem.cpp
+++ b/src/Gui/timeline/AbstractGraphicsMediaItem.cpp
@@ -33,9 +33,14 @@
#include "Media.h"
AbstractGraphicsMediaItem::AbstractGraphicsMediaItem( Clip* clip ) :
- oldTrackNumber( -1 ), oldPosition( -1 ), m_tracksView( NULL ),
- m_group( NULL ), m_width( 0 ), m_height( 0 ), m_resizeExpected( false ),
- m_muted( false )
+ oldTrackNumber( -1 ),
+ oldPosition( -1 ),
+ m_tracksView( NULL ),
+ m_group( NULL ),
+ m_width( 0 ),
+ m_height( 0 ),
+ m_muted( false ),
+ m_resizeExpected( false )
{
m_clipHelper = new ClipHelper( clip );
// Adjust the width
@@ -47,9 +52,15 @@ AbstractGraphicsMediaItem::AbstractGraphicsMediaItem( Clip* clip ) :
}
AbstractGraphicsMediaItem::AbstractGraphicsMediaItem( ClipHelper* ch ) :
- oldTrackNumber( -1 ), oldPosition( -1 ), m_tracksView( NULL ),
- m_group( NULL ), m_width( 0 ), m_height( 0 ), m_resizeExpected( false ),
- m_muted( false ), m_clipHelper( ch )
+ oldTrackNumber( -1 ),
+ oldPosition( -1 ),
+ m_clipHelper( ch ),
+ m_tracksView( NULL ),
+ m_group( NULL ),
+ m_width( 0 ),
+ m_height( 0 ),
+ m_muted( false ),
+ m_resizeExpected( false )
{
// Adjust the width
setWidth( ch->length() );
diff --git a/src/Gui/wizard/GeneralPage.cpp b/src/Gui/wizard/GeneralPage.cpp
index b041aca..3ab7d0b 100644
--- a/src/Gui/wizard/GeneralPage.cpp
+++ b/src/Gui/wizard/GeneralPage.cpp
@@ -136,7 +136,7 @@ void GeneralPage::updateProjectLocation()
}
}
-void GeneralPage::setWorkspaceStatus( bool valid )
+void GeneralPage::setWorkspaceStatus( bool /*valid*/ )
{
}
diff --git a/src/Gui/wizard/VideoPage.cpp b/src/Gui/wizard/VideoPage.cpp
index 4e55515..b829644 100644
--- a/src/Gui/wizard/VideoPage.cpp
+++ b/src/Gui/wizard/VideoPage.cpp
@@ -59,8 +59,6 @@ int VideoPage::nextId() const
void VideoPage::initializePage()
{
- SettingsManager* sManager = SettingsManager::getInstance();
-
int projectFps = 30;
int projectHeight = 300;
int projectWidth = 480;
@@ -88,7 +86,6 @@ void VideoPage::initializePage()
ui.comboBoxAudioSamplerate->setCurrentIndex( HZ_44100 );
break;
}
-
}
bool VideoPage::validatePage()
diff --git a/src/Renderer/WorkflowRenderer.cpp b/src/Renderer/WorkflowRenderer.cpp
index e6c6de5..7febc78 100644
--- a/src/Renderer/WorkflowRenderer.cpp
+++ b/src/Renderer/WorkflowRenderer.cpp
@@ -42,8 +42,8 @@ WorkflowRenderer::WorkflowRenderer() :
m_mainWorkflow( MainWorkflow::getInstance() ),
m_stopping( false ),
m_outputFps( 0.0f ),
- m_esHandler( NULL ),
m_media( NULL ),
+ m_esHandler( NULL ),
m_width( 0 ),
m_height( 0 ),
m_silencedAudioBuffer( NULL ),
@@ -391,7 +391,7 @@ void WorkflowRenderer::__endReached()
}
void
-WorkflowRenderer::mainWorkflowLenghtChanged( qint64 newLength )
+WorkflowRenderer::mainWorkflowLenghtChanged( qint64 /*newLength*/ )
{
// if ( newLength > 0 )
// {
diff --git a/src/Workflow/ImageClipWorkflow.cpp b/src/Workflow/ImageClipWorkflow.cpp
index ae90ce2..2bc40c5 100644
--- a/src/Workflow/ImageClipWorkflow.cpp
+++ b/src/Workflow/ImageClipWorkflow.cpp
@@ -103,7 +103,7 @@ ImageClipWorkflow::lock(ImageClipWorkflow *cw, void **pp_ret, int size )
}
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->emit computedFinished();
More information about the Vlmc-devel
mailing list