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

Replace qDebug & friends with a vlmc wrapper.

Loglines now contain thread ID, time, and a severity level marker
parent d037215a
...@@ -41,6 +41,7 @@ SET(VLMC_SRCS ...@@ -41,6 +41,7 @@ SET(VLMC_SRCS
Tools/QSingleton.hpp Tools/QSingleton.hpp
Tools/Singleton.hpp Tools/Singleton.hpp
Tools/Toggleable.hpp Tools/Toggleable.hpp
Tools/VlmcDebug.h
Tools/VlmcLogger.cpp Tools/VlmcLogger.cpp
Workflow/AudioClipWorkflow.cpp Workflow/AudioClipWorkflow.cpp
Workflow/ClipWorkflow.cpp Workflow/ClipWorkflow.cpp
......
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
#ifdef WITH_GUI #ifdef WITH_GUI
# include "UndoStack.h" # include "UndoStack.h"
#include <QtDebug>
void void
Commands::trigger( QUndoCommand* command ) Commands::trigger( QUndoCommand* command )
{ {
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#include <QtDebug>
#include <QAction> #include <QAction>
#include "SettingValue.h" #include "SettingValue.h"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "Effect.h" #include "Effect.h"
#include "EffectInstance.h" #include "EffectInstance.h"
#include <QtDebug> #include "VlmcDebug.h"
Effect::Effect( const QString &fileName ) : Effect::Effect( const QString &fileName ) :
QLibrary( fileName ), QLibrary( fileName ),
...@@ -53,7 +53,7 @@ dest = reinterpret_cast<typeof( dest )>( resolve( symbolName ) ) ...@@ -53,7 +53,7 @@ dest = reinterpret_cast<typeof( dest )>( resolve( symbolName ) )
#define LOAD_FREI0R_SYMBOL_CHECKED( dest, symbolName ) \ #define LOAD_FREI0R_SYMBOL_CHECKED( dest, symbolName ) \
if ( ( LOAD_FREI0R_SYMBOL( dest, symbolName ) ) == NULL ) \ if ( ( LOAD_FREI0R_SYMBOL( dest, symbolName ) ) == NULL ) \
{ \ { \
qCritical() << "Failed to load symbol:" << symbolName; \ vlmcCritical() << "Failed to load symbol:" << symbolName; \
return false; \ return false; \
} }
...@@ -87,12 +87,12 @@ Effect::load() ...@@ -87,12 +87,12 @@ Effect::load()
m_author = infos.author; m_author = infos.author;
if ( m_type == Filter && m_f0r_update == NULL ) if ( m_type == Filter && m_f0r_update == NULL )
{ {
qCritical() << "Failed to load symbol f0r_update. Dropping module" << fileName(); vlmcCritical() << "Failed to load symbol f0r_update. Dropping module" << fileName();
return false; return false;
} }
if ( ( m_type == Mixer2 || m_type == Mixer3 ) && m_f0r_update2 == NULL ) if ( ( m_type == Mixer2 || m_type == Mixer3 ) && m_f0r_update2 == NULL )
{ {
qCritical() << "Failed to load symbol f0r_update2. Dropping module" << fileName(); vlmcCritical() << "Failed to load symbol f0r_update2. Dropping module" << fileName();
return false; return false;
} }
for ( qint32 i = 0; i < m_nbParams; ++i ) for ( qint32 i = 0; i < m_nbParams; ++i )
......
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
#include "Effect.h" #include "Effect.h"
#include <QtDebug>
EffectInstance::EffectInstance( Effect *effect ) : EffectInstance::EffectInstance( Effect *effect ) :
m_effect( effect ), m_effect( effect ),
m_width( 0 ), m_width( 0 ),
......
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
#include "Effect.h" #include "Effect.h"
#include "EffectSettingValue.h" #include "EffectSettingValue.h"
#include "EffectInstance.h" #include "EffectInstance.h"
#include "VlmcDebug.h"
#include <QColor> #include <QColor>
#include <QPoint> #include <QPoint>
#include <QtDebug>
EffectSettingValue::EffectSettingValue( Type type, EffectInstance* instance, quint32 index, EffectSettingValue::EffectSettingValue( Type type, EffectInstance* instance, quint32 index,
const char *name, const char *desc, Flags flags ) : const char *name, const char *desc, Flags flags ) :
...@@ -91,7 +91,7 @@ EffectSettingValue::set( const QVariant &val ) ...@@ -91,7 +91,7 @@ EffectSettingValue::set( const QVariant &val )
break ; break ;
} }
default: default:
qCritical() << "Setting type" << m_type << "is not handled by the effects engine"; vlmcCritical() << "Setting type" << m_type << "is not handled by the effects engine";
break; break;
} }
apply(); apply();
...@@ -151,7 +151,7 @@ EffectSettingValue::get() ...@@ -151,7 +151,7 @@ EffectSettingValue::get()
break ; break ;
} }
default: default:
qCritical() << "Setting type" << m_type << "is not handled by the effects engine"; vlmcCritical() << "Setting type" << m_type << "is not handled by the effects engine";
m_val = QVariant(); m_val = QVariant();
} }
return m_val; return m_val;
...@@ -179,7 +179,7 @@ EffectSettingValue::frei0rToVlmc( int type ) ...@@ -179,7 +179,7 @@ EffectSettingValue::frei0rToVlmc( int type )
case F0R_PARAM_STRING: case F0R_PARAM_STRING:
return String; return String;
default: default:
qCritical() << "Invalid effect setting type ! Undefined behaviour"; vlmcCritical() << "Invalid effect setting type ! Undefined behaviour";
} }
//Keeping compiler happy. //Keeping compiler happy.
return Double; return Double;
......
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
#include "EffectHelper.h" #include "EffectHelper.h"
#include "EffectInstance.h" #include "EffectInstance.h"
#include "Types.h" #include "Types.h"
#include "VlmcDebug.h"
#include <QDomElement> #include <QDomElement>
#include <QReadWriteLock> #include <QReadWriteLock>
#include <QtDebug>
EffectUser::EffectUser() : EffectUser::EffectUser() :
m_isRendering( false ), m_isRendering( false ),
...@@ -192,10 +192,10 @@ EffectUser::loadEffects( const QDomElement &parent ) ...@@ -192,10 +192,10 @@ EffectUser::loadEffects( const QDomElement &parent )
EffectHelper *helper = addEffect( e, effect.attribute( "start" ).toLongLong(), EffectHelper *helper = addEffect( e, effect.attribute( "start" ).toLongLong(),
effect.attribute( "end" ).toLongLong() ); effect.attribute( "end" ).toLongLong() );
if ( helper == NULL ) if ( helper == NULL )
qCritical() << "Can't load effect" << effect.attribute( "name" ); vlmcCritical() << "Can't load effect" << effect.attribute( "name" );
} }
else else
qCritical() << "Can't load effect" << effect.attribute( "name" ); vlmcCritical() << "Can't load effect" << effect.attribute( "name" );
} }
effect = effect.nextSiblingElement(); effect = effect.nextSiblingElement();
} }
...@@ -229,7 +229,7 @@ EffectUser::effects( Effect::Type type ) const ...@@ -229,7 +229,7 @@ EffectUser::effects( Effect::Type type ) const
if ( type == Effect::Filter ) if ( type == Effect::Filter )
return m_filters; return m_filters;
if ( type != Effect::Mixer2 ) if ( type != Effect::Mixer2 )
qCritical() << "Only Filters and Mixer2 are handled. This is going to be nasty !"; vlmcCritical() << "Only Filters and Mixer2 are handled. This is going to be nasty !";
return m_mixers; return m_mixers;
} }
...@@ -259,7 +259,7 @@ EffectUser::removeEffect( Effect::Type type, qint32 idx ) ...@@ -259,7 +259,7 @@ EffectUser::removeEffect( Effect::Type type, qint32 idx )
} }
} }
else else
qCritical() << "Unhandled effect type"; vlmcCritical() << "Unhandled effect type";
} }
void void
...@@ -281,7 +281,7 @@ EffectUser::removeEffect(EffectHelper *helper) ...@@ -281,7 +281,7 @@ EffectUser::removeEffect(EffectHelper *helper)
} }
++it; ++it;
} }
qWarning() << "Can't find EffectHelper" << helper->uuid() << "for removal."; vlmcWarning() << "Can't find EffectHelper" << helper->uuid() << "for removal.";
} }
void void
...@@ -305,7 +305,7 @@ EffectUser::count( Effect::Type type ) const ...@@ -305,7 +305,7 @@ EffectUser::count( Effect::Type type ) const
return m_filters.count(); return m_filters.count();
if ( type == Effect::Mixer2 ) if ( type == Effect::Mixer2 )
return m_mixers.count(); return m_mixers.count();
qCritical() << "Unhandled effect type"; vlmcCritical() << "Unhandled effect type";
return 0; return 0;
} }
...@@ -324,7 +324,7 @@ EffectUser::moveEffect( EffectHelper *helper, qint64 newPos ) ...@@ -324,7 +324,7 @@ EffectUser::moveEffect( EffectHelper *helper, qint64 newPos )
return ; return ;
} }
} }
qWarning() << this << "Can't find effect" << helper->uuid(); vlmcWarning() << this << "Can't find effect" << helper->uuid();
} }
void void
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include "EffectInstance.h" #include "EffectInstance.h"
#include "Types.h" #include "Types.h"
#include "VlmcDebug.h"
#include <QApplication> #include <QApplication>
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
...@@ -39,8 +41,6 @@ ...@@ -39,8 +41,6 @@
#include <QSettings> #include <QSettings>
#include <QXmlStreamWriter> #include <QXmlStreamWriter>
#include <QtDebug>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <windows.h> #include <windows.h>
#endif #endif
...@@ -89,7 +89,7 @@ EffectsEngine::loadEffect( const QString &fileName ) ...@@ -89,7 +89,7 @@ EffectsEngine::loadEffect( const QString &fileName )
name = m_cache->value( fileName + "/name" ).toString(); name = m_cache->value( fileName + "/name" ).toString();
int typeInt = m_cache->value( fileName + "/type" ).toInt(); int typeInt = m_cache->value( fileName + "/type" ).toInt();
if ( typeInt < Effect::Unknown || typeInt > Effect::Mixer3 ) if ( typeInt < Effect::Unknown || typeInt > Effect::Mixer3 )
qWarning() << "Invalid plugin type."; vlmcWarning() << "Invalid plugin type.";
else else
{ {
type = static_cast<Effect::Type>( typeInt ); type = static_cast<Effect::Type>( typeInt );
...@@ -158,7 +158,7 @@ EffectsEngine::loadEffects() ...@@ -158,7 +158,7 @@ EffectsEngine::loadEffects()
TCHAR *pos = strrchr( appDir, '\\' ); TCHAR *pos = strrchr( appDir, '\\' );
if ( pos == NULL ) if ( pos == NULL )
{ {
qWarning() << "Can't use ModuleFileName:" << appDir; vlmcWarning() << "Can't use ModuleFileName:" << appDir;
return ; return ;
} }
*pos = 0; *pos = 0;
...@@ -166,16 +166,16 @@ EffectsEngine::loadEffects() ...@@ -166,16 +166,16 @@ EffectsEngine::loadEffects()
} }
else else
{ {
qWarning() << "Failed to get application directory. Using current path."; vlmcWarning() << "Failed to get application directory. Using current path.";
pathList << QDir::currentPath() + "/effects/"; pathList << QDir::currentPath() + "/effects/";
} }
#endif #endif
qDebug() << "Loading effects from:" << pathList; vlmcDebug() << "Loading effects from:" << pathList;
foreach ( const QString &path, pathList ) foreach ( const QString &path, pathList )
{ {
if ( QFile::exists( path ) == true ) if ( QFile::exists( path ) == true )
{ {
qDebug() << "\tScanning" << path << "for effects"; vlmcDebug() << "\tScanning" << path << "for effects";
browseDirectory( path ); browseDirectory( path );
} }
} }
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#include <QtDebug>
#include <QApplication> #include <QApplication>
#include <QMap> #include <QMap>
#include <QMapIterator> #include <QMapIterator>
......
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
#include <QUrl> #include <QUrl>
#include <QNetworkProxy> #include <QNetworkProxy>
#include <QSettings> #include <QSettings>
#include <QDebug>
#include "MainWindow.h" #include "MainWindow.h"
#include "config.h" #include "config.h"
#include "Library.h" #include "Library.h"
#include "About.h" #include "About.h"
#include "VlmcDebug.h"
#include "VlmcLogger.h" #include "VlmcLogger.h"
#include "EffectsEngine/EffectsEngine.h" #include "EffectsEngine/EffectsEngine.h"
...@@ -755,7 +755,7 @@ MainWindow::toolButtonClicked( QAction *action ) ...@@ -755,7 +755,7 @@ MainWindow::toolButtonClicked( QAction *action )
else if ( action == m_ui.actionCut_mode ) else if ( action == m_ui.actionCut_mode )
emit toolChanged( TOOL_CUT ); emit toolChanged( TOOL_CUT );
else else
qCritical() << "Unknown tool. This should not happen !"; vlmcCritical() << "Unknown tool. This should not happen !";
} }
void void
......
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
#include <QApplication> #include <QApplication>
#include <QFontMetrics> #include <QFontMetrics>
#include <QtDebug>
EffectInstanceListModel::EffectInstanceListModel( EffectUser *user ) : EffectInstanceListModel::EffectInstanceListModel( EffectUser *user ) :
m_user( user ) m_user( user )
{ {
......
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
#include <QLabel> #include <QLabel>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QtDebug>
EffectInstanceWidget::EffectInstanceWidget( QWidget *parent ) : EffectInstanceWidget::EffectInstanceWidget( QWidget *parent ) :
QWidget( parent ), QWidget( parent ),
m_ui( new Ui::EffectSettingWidget ) m_ui( new Ui::EffectSettingWidget )
......
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
#include <QMimeData> #include <QMimeData>
#include <QDrag> #include <QDrag>
#include <QtDebug>
EffectsListView::EffectsListView( QWidget *parent ) : EffectsListView::EffectsListView( QWidget *parent ) :
QListView(parent) QListView(parent)
{ {
......
...@@ -23,14 +23,13 @@ ...@@ -23,14 +23,13 @@
#include "AbstractSharingService.h" #include "AbstractSharingService.h"
#include "SettingsManager.h" #include "SettingsManager.h"
#include "ShareOnInternet.h" #include "ShareOnInternet.h"
#include "VlmcDebug.h"
#include "YouTube/YouTubeService.h" #include "YouTube/YouTubeService.h"
#include <QDesktopServices> #include <QDesktopServices>
#include <QClipboard> #include <QClipboard>
#include <QMessageBox> #include <QMessageBox>
#include <QDebug>
ShareOnInternet::ShareOnInternet( QWidget* parent ) ShareOnInternet::ShareOnInternet( QWidget* parent )
: QDialog( parent, Qt::Sheet | Qt::Dialog ) : QDialog( parent, Qt::Sheet | Qt::Dialog )
{ {
...@@ -94,11 +93,11 @@ ShareOnInternet::publish() ...@@ -94,11 +93,11 @@ ShareOnInternet::publish()
switch( m_serviceProvider ) switch( m_serviceProvider )
{ {
case VIMEO: /* TODO: Implement services for Vimeo */ case VIMEO: /* TODO: Implement services for Vimeo */
qDebug() << "[SHARE ON INTERNET]: VIMEO"; break; vlmcDebug() << "[SHARE ON INTERNET]: VIMEO"; break;
case YOUTUBE: case YOUTUBE:
default: default:
m_service = new YouTubeService( m_devKey, getUsername(), getPassword() ); m_service = new YouTubeService( m_devKey, getUsername(), getPassword() );
qDebug() << "[SHARE ON INTERNET]: YOUTUBE"; break; vlmcDebug() << "[SHARE ON INTERNET]: YOUTUBE"; break;
} }
} }
else else
...@@ -114,7 +113,7 @@ ShareOnInternet::publish() ...@@ -114,7 +113,7 @@ ShareOnInternet::publish()
void void
ShareOnInternet::authFinished() ShareOnInternet::authFinished()
{ {
qDebug() << "[SHARE ON INTERNET]: AUTH FINISHED"; vlmcDebug() << "[SHARE ON INTERNET]: AUTH FINISHED";
/*On Finish, extract out the auth token and upload a test video */ /*On Finish, extract out the auth token and upload a test video */
disconnect( m_service, SIGNAL(authOver()), this, SLOT(authFinished()) ); disconnect( m_service, SIGNAL(authOver()), this, SLOT(authFinished()) );
...@@ -136,7 +135,7 @@ ShareOnInternet::authFinished() ...@@ -136,7 +135,7 @@ ShareOnInternet::authFinished()
this, SLOT(uploadProgress(qint64,qint64)) ); this, SLOT(uploadProgress(qint64,qint64)) );
disconnect( m_service, SIGNAL(error(QString)), this, SLOT(serviceError(QString)) ); disconnect( m_service, SIGNAL(error(QString)), this, SLOT(serviceError(QString)) );
qDebug() << "[SHARE ON INTERNET]: AUTH Failed"; vlmcDebug() << "[SHARE ON INTERNET]: AUTH Failed";
return; return;
} }
...@@ -145,13 +144,13 @@ ShareOnInternet::authFinished() ...@@ -145,13 +144,13 @@ ShareOnInternet::authFinished()
m_ui.progressBar->setVisible( true ); m_ui.progressBar->setVisible( true );
m_ui.mainPanel->setEnabled( false ); m_ui.mainPanel->setEnabled( false );
qDebug() << "[SHARE ON INTERNET]: UPLOAD STARTED"; vlmcDebug() << "[SHARE ON INTERNET]: UPLOAD STARTED";
} }
void void
ShareOnInternet::uploadFinished( QString result ) ShareOnInternet::uploadFinished( QString result )
{ {
qDebug() << "[SHARE ON INTERNET]: UPLOAD FINISHED"; vlmcDebug() << "[SHARE ON INTERNET]: UPLOAD FINISHED";
/* Add code here to abort stuff */ /* Add code here to abort stuff */
m_ui.progressBar->setEnabled( false ); m_ui.progressBar->setEnabled( false );
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include "PreviewWidget.h" #include "PreviewWidget.h"
#include "TagWidget.h" #include "TagWidget.h"
#include "Transcoder.h" #include "Transcoder.h"
#include "VlmcDebug.h"
#include <QFileSystemModel> #include <QFileSystemModel>
#include <QHeaderView> #include <QHeaderView>
...@@ -45,8 +46,6 @@ ...@@ -45,8 +46,6 @@
#include <QTime> #include <QTime>
#include <QTimer> #include <QTimer>
#include <QtDebug>
ImportController::ImportController(QWidget *parent) : ImportController::ImportController(QWidget *parent) :
QDialog(parent), QDialog(parent),
m_ui(new Ui::ImportController), m_ui(new Ui::ImportController),
...@@ -152,7 +151,7 @@ ImportController::clipSelection( Clip* clip ) ...@@ -152,7 +151,7 @@ ImportController::clipSelection( Clip* clip )
void void
ImportController::importMedia( const QString &filePath ) ImportController::importMedia( const QString &filePath )
{ {
qDebug() << "Importing" << filePath; vlmcDebug() << "Importing" << filePath;
if ( Library::getInstance()->mediaAlreadyLoaded( filePath ) == true || if ( Library::getInstance()->mediaAlreadyLoaded( filePath ) == true ||
m_temporaryMedias->mediaAlreadyLoaded( filePath ) == true ) m_temporaryMedias->mediaAlreadyLoaded( filePath ) == true )
return ; return ;
...@@ -162,7 +161,7 @@ ImportController::importMedia( const QString &filePath ) ...@@ -162,7 +161,7 @@ ImportController::importMedia( const QString &filePath )
media->computeMetadata(); media->computeMetadata();
if ( media == NULL ) if ( media == NULL )
{ {
qCritical() << "An error occurred while loading media:" << filePath; vlmcCritical() << "An error occurred while loading media:" << filePath;
return ; return ;
} }
Clip* clip = new Clip( media ); Clip* clip = new Clip( media );
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include "MediaListView.h" #include "MediaListView.h"
#include "StackViewController.h" #include "StackViewController.h"
#include "ViewController.h" #include "ViewController.h"
#include "VlmcDebug.h"
#include <QDebug>
#include <QUrl> #include <QUrl>
#include <QMimeData> #include <QMimeData>
...@@ -184,7 +184,7 @@ MediaLibrary::dropEvent( QDropEvent *event ) ...@@ -184,7 +184,7 @@ MediaLibrary::dropEvent( QDropEvent *event )
event->accept(); event->accept();
} }
else else
qCritical() << "Clip already present in library or an error occurred while loading media:" << fileName; vlmcCritical() << "Clip already present in library or an error occurred while loading media:" << fileName;
} }
event->accept(); event->accept();
} }
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#include <QDebug>
#include <QPainter> #include <QPainter>
#include <QPolygon> #include <QPolygon>
#include <QBrush> #include <QBrush>
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "Clip.h" #include "Clip.h"
#include <QMessageBox> #include <QMessageBox>
#include <QDebug>
PreviewWidget::PreviewWidget( QWidget *parent ) : PreviewWidget::PreviewWidget( QWidget *parent ) :
QWidget( parent ), QWidget( parent ),
......
...@@ -33,8 +33,6 @@ ...@@ -33,8 +33,6 @@
#include <QMessageBox> #include <QMessageBox>
#include <QTimer> #include <QTimer>
#include <QtDebug>
GUIProjectManager::GUIProjectManager() GUIProjectManager::GUIProjectManager()
{ {
connect( this, SIGNAL( projectClosed() ), Library::getInstance(), SLOT( clear() ) ); connect( this, SIGNAL( projectClosed() ), Library::getInstance(), SLOT( clear() ) );
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <QKeyEvent> #include <QKeyEvent>
#include <QKeySequence> #include <QKeySequence>
#include <QTimer> #include <QTimer>
#include <QtDebug>
#include "SettingsManager.h" #include "SettingsManager.h"
#include "KeyboardShortcutInput.h" #include "KeyboardShortcutInput.h"
......
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
#include "LanguageWidget.h" #include "LanguageWidget.h"
#include "SettingsManager.h" #include "SettingsManager.h"
#include "SettingValue.h" #include "SettingValue.h"
#include "VlmcDebug.h"
#include <QApplication> #include <QApplication>
#include <QComboBox> #include <QComboBox>
#include <QDir> #include <QDir>
#include <QTranslator> #include <QTranslator>
#include <QtDebug>
#define TS_PREFIX "vlmc_" #define TS_PREFIX "vlmc_"
...@@ -47,7 +47,7 @@ LanguageWidget::LanguageWidget( SettingValue *s, QWidget *parent /*= NULL*/ ) : ...@@ -47,7 +47,7 @@ LanguageWidget::LanguageWidget( SettingValue *s, QWidget *parent /*= NULL*/ ) :
if ( localePos < 0 || extPos < 0 || localePos > extPos ) if ( localePos < 0 || extPos < 0 || localePos > extPos )
{ {
qWarning() << "Invalid translation file:" << tsFileName; vlmcWarning() << "Invalid translation file:" << tsFileName;
continue ; continue ;
} }
...@@ -58,7 +58,7 @@ LanguageWidget::LanguageWidget( SettingValue *s, QWidget *parent /*= NULL*/ ) : ...@@ -58,7 +58,7 @@ LanguageWidget::LanguageWidget( SettingValue *s, QWidget *parent /*= NULL*/ ) :
// Check if the country code is valid ISO 639 // Check if the country code is valid ISO 639
if ( locale.language() == QLocale::C ) if ( locale.language() == QLocale::C )
{ {
qWarning() << "Invalid locale for file:" << tsFileName; vlmcWarning() << "Invalid locale for file:" << tsFileName;
continue;