[vlmc-devel] Don't insert extra spaces for QDebug functions
Yikai Lu
git at videolan.org
Sat Jun 10 04:23:25 CEST 2017
vlmc | branch: master | Yikai Lu <luyikei.qmltu at gmail.com> | Sat Jun 10 11:19:40 2017 +0900| [63718973674e3f7dc7a26c9265e1ed6a9595c1d3] | committer: Yikai Lu
Don't insert extra spaces for QDebug functions
Because spaces will be automatically inserted
> https://code.videolan.org/videolan/vlmc/commit/63718973674e3f7dc7a26c9265e1ed6a9595c1d3
---
src/Gui/library/ClipLibraryView.cpp | 2 +-
src/Library/Library.cpp | 6 +++---
src/Main/main.cpp | 2 +-
src/Renderer/ConsoleRenderer.cpp | 2 +-
src/Services/YouTube/YouTubeAuthenticator.cpp | 2 +-
src/Services/YouTube/YouTubeService.cpp | 4 ++--
src/Services/YouTube/YouTubeUploader.cpp | 2 +-
src/Settings/Settings.cpp | 4 ++--
src/Workflow/MainWorkflow.cpp | 2 +-
src/Workflow/SequenceWorkflow.cpp | 10 +++++-----
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/Gui/library/ClipLibraryView.cpp b/src/Gui/library/ClipLibraryView.cpp
index d8703f99..1c6d5bea 100644
--- a/src/Gui/library/ClipLibraryView.cpp
+++ b/src/Gui/library/ClipLibraryView.cpp
@@ -74,7 +74,7 @@ ClipLibraryView::startDrag( const QString& uuid )
auto clip = Core::instance()->library()->clip( uuid );
if ( !clip )
{
- vlmcCritical() << "Couldn't find a clip " << uuid;
+ vlmcCritical() << "Couldn't find a clip:" << uuid;
return;
}
diff --git a/src/Library/Library.cpp b/src/Library/Library.cpp
index 481f017c..5b50220d 100644
--- a/src/Library/Library.cpp
+++ b/src/Library/Library.cpp
@@ -105,17 +105,17 @@ Library::addMedia( QSharedPointer<Media> media )
m_media[media->id()] = media;
m_clips[media->baseClip()->uuid()] = media->baseClip();
emit clipAdded( media->baseClip()->uuid().toString() );
- vlmcDebug() << "Clip " << media->baseClip()->uuid().toString() << " is added to Library";
+ vlmcDebug() << "Clip" << media->baseClip()->uuid().toString() << "is added to Library";
connect( media.data(), &Media::subclipAdded, [this]( QSharedPointer<Clip> c ) {
m_clips[c->uuid()] = c;
emit clipAdded( c->uuid().toString() );
- vlmcDebug() << "Clip " << c->uuid().toString() << " is added to Library";
+ vlmcDebug() << "Clip" << c->uuid().toString() << "is added to Library";
setCleanState( false );
});
connect( media.data(), &Media::subclipRemoved, [this]( const QUuid& uuid ) {
m_clips.remove( uuid );
emit clipRemoved( uuid.toString() );
- vlmcDebug() << "Clip " << uuid.toString() << " is removed in Library";
+ vlmcDebug() << "Clip" << uuid.toString() << "is removed in Library";
// This seems wrong, for instance if we undo a clip splitting
setCleanState( false );
} );
diff --git a/src/Main/main.cpp b/src/Main/main.cpp
index 0c9aeeb5..568f3909 100644
--- a/src/Main/main.cpp
+++ b/src/Main/main.cpp
@@ -217,7 +217,7 @@ VLMCCoremain( int argc, char **argv )
{
vlmcCritical() << "Usage:" << argv[0]
#ifdef HAVE_GUI
- << "--no-gui "
+ << "--no-gui"
#endif
<< "project.vlmc output_file";
return 1;
diff --git a/src/Renderer/ConsoleRenderer.cpp b/src/Renderer/ConsoleRenderer.cpp
index ee4e48cf..b9f428b7 100644
--- a/src/Renderer/ConsoleRenderer.cpp
+++ b/src/Renderer/ConsoleRenderer.cpp
@@ -48,7 +48,7 @@ ConsoleRenderer::frameChanged( qint64 frame, qint64 length ) const
if ( newPercent != percent )
{
percent = newPercent;
- vlmcDebug() << "ConsoleRenderer: " << percent << "%";
+ vlmcDebug() << "ConsoleRenderer:" << percent << "%";
}
}
diff --git a/src/Services/YouTube/YouTubeAuthenticator.cpp b/src/Services/YouTube/YouTubeAuthenticator.cpp
index 26869c19..eece8082 100644
--- a/src/Services/YouTube/YouTubeAuthenticator.cpp
+++ b/src/Services/YouTube/YouTubeAuthenticator.cpp
@@ -108,7 +108,7 @@ YouTubeAuthenticator::authFinished()
void
YouTubeAuthenticator::error( QString& e )
{
- vlmcDebug() << "[YouTube AUTH ERROR]: " << e;
+ vlmcDebug() << "[YouTube AUTH ERROR]:" << e;
emit authError( e );
}
diff --git a/src/Services/YouTube/YouTubeService.cpp b/src/Services/YouTube/YouTubeService.cpp
index 085a91c6..4b286ab7 100644
--- a/src/Services/YouTube/YouTubeService.cpp
+++ b/src/Services/YouTube/YouTubeService.cpp
@@ -151,7 +151,7 @@ YouTubeService::setVideoParameters( const QString& fileName, const VideoData& da
void
YouTubeService::authError( QString e )
{
- vlmcDebug() << "[YT SERVICE]: AUTH ERROR " << e;
+ vlmcDebug() << "[YT SERVICE]: AUTH ERROR" << e;
if( e == "BadAuthentication" )
m_error = BadAuthentication;
@@ -216,7 +216,7 @@ YouTubeService::networkError( QNetworkReply::NetworkError e )
m_error = UnknownError;
}
- vlmcDebug() << "[NETWORK ERROR]: " << e << ": " << errString;
+ vlmcDebug() << "[NETWORK ERROR]:" << e << ":" << errString;
emit error( errString );
/* Ignore Content and Abort errors */
diff --git a/src/Services/YouTube/YouTubeUploader.cpp b/src/Services/YouTube/YouTubeUploader.cpp
index 5953ea44..754eb27b 100644
--- a/src/Services/YouTube/YouTubeUploader.cpp
+++ b/src/Services/YouTube/YouTubeUploader.cpp
@@ -139,7 +139,7 @@ YouTubeUploader::uploadFinished()
QNetworkReply *reply = static_cast<QNetworkReply *>( sender() );
const QByteArray data = reply->readAll();
- vlmcDebug() << "In YouTubeUploader::uploadFinished: data received = " << data;
+ vlmcDebug() << "In YouTubeUploader::uploadFinished: data received =" << data;
m_service->m_state = UploadFinish;
/* Feed parser called to parse the XML data received */
diff --git a/src/Settings/Settings.cpp b/src/Settings/Settings.cpp
index 710ce0fd..2bc8f927 100644
--- a/src/Settings/Settings.cpp
+++ b/src/Settings/Settings.cpp
@@ -212,7 +212,7 @@ Settings::setValue( const QString &key, const QVariant &value )
(*it)->set( value );
return true;
}
- vlmcCritical() << "setting value without a created variable: " << key;
+ vlmcCritical() << "setting value without a created variable:" << key;
return false;
}
void
@@ -235,7 +235,7 @@ Settings::value( const QString &key )
SettingMap::iterator it = m_settings.find( key );
if ( it != m_settings.end() )
return *it;
- vlmcCritical() << "fetching value without a created variable" << key;
+ vlmcCritical() << "fetching value without a created variable:" << key;
return nullptr;
}
diff --git a/src/Workflow/MainWorkflow.cpp b/src/Workflow/MainWorkflow.cpp
index 14202a4a..5c7fdd89 100644
--- a/src/Workflow/MainWorkflow.cpp
+++ b/src/Workflow/MainWorkflow.cpp
@@ -209,7 +209,7 @@ MainWorkflow::clipInfo( const QString& uuid )
auto clip = c->clip;
auto h = clip->toVariant().toHash();
h["uuid"] = uuid;
- vlmcWarning() << "library UUID: " << h["libraryUuid"];
+ vlmcWarning() << "library UUID:" << h["libraryUuid"];
h["length"] = (qint64)( clip->input()->length() );
h["name"] = clip->media()->title();
h["audio"] = c->isAudio;
diff --git a/src/Workflow/SequenceWorkflow.cpp b/src/Workflow/SequenceWorkflow.cpp
index f0d24aa5..5c80dd1b 100644
--- a/src/Workflow/SequenceWorkflow.cpp
+++ b/src/Workflow/SequenceWorkflow.cpp
@@ -87,7 +87,7 @@ SequenceWorkflow::moveClip( const QUuid& uuid, quint32 trackId, qint64 pos )
auto it = m_clips.find( uuid );
if ( it == m_clips.end() )
{
- vlmcCritical() << "Couldn't find a clip " << uuid;
+ vlmcCritical() << "Couldn't find a clip:" << uuid;
return false;
}
auto& c = it.value();
@@ -126,7 +126,7 @@ SequenceWorkflow::resizeClip( const QUuid& uuid, qint64 newBegin, qint64 newEnd,
auto it = m_clips.find( uuid );
if ( it == m_clips.end() )
{
- vlmcCritical() << "Couldn't find a clip " << uuid;
+ vlmcCritical() << "Couldn't find a clip:" << uuid;
return false;
}
auto& c = it.value();
@@ -156,7 +156,7 @@ SequenceWorkflow::removeClip( const QUuid& uuid )
auto it = m_clips.find( uuid );
if ( it == m_clips.end() )
{
- vlmcCritical() << "Couldn't find a sequence workflow clip " << uuid;
+ vlmcCritical() << "Couldn't find a sequence workflow clip:" << uuid;
return {};
}
auto c = it.value();
@@ -184,7 +184,7 @@ SequenceWorkflow::linkClips( const QUuid& uuidA, const QUuid& uuidB )
auto clipB = clip( uuidB );
if ( !clipA || !clipB )
{
- vlmcCritical() << "Couldn't find clips: " << uuidA << " and " << uuidB;
+ vlmcCritical() << "Couldn't find clips:" << uuidA << "and" << uuidB;
return false;
}
clipA->linkedClips.append( uuidB );
@@ -201,7 +201,7 @@ SequenceWorkflow::unlinkClips( const QUuid& uuidA, const QUuid& uuidB )
auto clipB = clip( uuidB );
if ( !clipA || !clipB )
{
- vlmcCritical() << "Couldn't find clips: " << uuidA << " and " << uuidB;
+ vlmcCritical() << "Couldn't find clips:" << uuidA << "and" << uuidB;
return false;
}
bool ret = true;
More information about the Vlmc-devel
mailing list