Commit c5048c2e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: cleanup debug messages

parent 7e47a1f7
...@@ -126,7 +126,7 @@ void AbstractController::parseAndCreate( const QString& config, ...@@ -126,7 +126,7 @@ void AbstractController::parseAndCreate( const QString& config,
buttonType_e i_type = (buttonType_e)list2.at( 0 ).toInt( &ok ); buttonType_e i_type = (buttonType_e)list2.at( 0 ).toInt( &ok );
if( !ok ) if( !ok )
{ {
msg_Warn( p_intf, "Parsing error 2. Please report this." ); msg_Warn( p_intf, "Parsing error 2. Please, report this." );
continue; continue;
} }
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <QString> #include <QString>
#include <QFont> #include <QFont>
#include <QGridLayout> #include <QGridLayout>
#include <QSignalMapper>
#include <QComboBox> #include <QComboBox>
#include <QTimer> #include <QTimer>
#include <QFileDialog> #include <QFileDialog>
...@@ -445,8 +444,7 @@ void ExtVideo::initComboBoxItems( QObject *widget ) ...@@ -445,8 +444,7 @@ void ExtVideo::initComboBoxItems( QObject *widget )
} }
else else
{ {
msg_Err( p_intf, "Couldn't find option \"%s\".", msg_Err( p_intf, "Couldn't find option \"%s\".", qtu( option ) );
qtu( option ) );
} }
} }
...@@ -516,20 +514,20 @@ void ExtVideo::setWidgetValue( QObject *widget ) ...@@ -516,20 +514,20 @@ void ExtVideo::setWidgetValue( QObject *widget )
} }
else if( combobox ) combobox->setCurrentIndex( else if( combobox ) combobox->setCurrentIndex(
combobox->findData( qlonglong(val.i_int) ) ); combobox->findData( qlonglong(val.i_int) ) );
else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ ); else msg_Warn( p_intf, "Could not find the correct Integer widget" );
} }
else if( i_type == VLC_VAR_FLOAT ) else if( i_type == VLC_VAR_FLOAT )
{ {
if( slider ) slider->setValue( ( int )( val.f_float*( double )slider->tickInterval() ) ); /* hack alert! */ if( slider ) slider->setValue( ( int )( val.f_float*( double )slider->tickInterval() ) ); /* hack alert! */
else if( doublespinbox ) doublespinbox->setValue( val.f_float ); else if( doublespinbox ) doublespinbox->setValue( val.f_float );
else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ ); else msg_Warn( p_intf, "Could not find the correct Float widget" );
} }
else if( i_type == VLC_VAR_STRING ) else if( i_type == VLC_VAR_STRING )
{ {
if( lineedit ) lineedit->setText( qfu( val.psz_string ) ); if( lineedit ) lineedit->setText( qfu( val.psz_string ) );
else if( combobox ) combobox->setCurrentIndex( else if( combobox ) combobox->setCurrentIndex(
combobox->findData( qfu( val.psz_string ) ) ); combobox->findData( qfu( val.psz_string ) ) );
else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ ); else msg_Warn( p_intf, "Could not find the correct String widget" );
free( val.psz_string ); free( val.psz_string );
} }
else else
...@@ -586,7 +584,7 @@ void ExtVideo::updateFilterOptions() ...@@ -586,7 +584,7 @@ void ExtVideo::updateFilterOptions()
else if( dial ) i_int = ( 540-dial->value() )%360; else if( dial ) i_int = ( 540-dial->value() )%360;
else if( lineedit ) i_int = lineedit->text().toInt( NULL,16 ); else if( lineedit ) i_int = lineedit->text().toInt( NULL,16 );
else if( combobox ) i_int = combobox->itemData( combobox->currentIndex() ).toInt(); else if( combobox ) i_int = combobox->itemData( combobox->currentIndex() ).toInt();
else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ ); else msg_Warn( p_intf, "Could not find the correct Integer widget" );
config_PutInt( p_intf, qtu( option ), i_int ); config_PutInt( p_intf, qtu( option ), i_int );
if( b_is_command ) if( b_is_command )
{ {
...@@ -603,7 +601,7 @@ void ExtVideo::updateFilterOptions() ...@@ -603,7 +601,7 @@ void ExtVideo::updateFilterOptions()
/ ( double )slider->tickInterval(); /* hack alert! */ / ( double )slider->tickInterval(); /* hack alert! */
else if( doublespinbox ) f_float = doublespinbox->value(); else if( doublespinbox ) f_float = doublespinbox->value();
else if( lineedit ) f_float = lineedit->text().toDouble(); else if( lineedit ) f_float = lineedit->text().toDouble();
else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ ); else msg_Warn( p_intf, "Could not find the correct Float widget" );
config_PutFloat( p_intf, qtu( option ), f_float ); config_PutFloat( p_intf, qtu( option ), f_float );
if( b_is_command ) if( b_is_command )
var_SetFloat( p_obj, qtu( option ), f_float ); var_SetFloat( p_obj, qtu( option ), f_float );
...@@ -616,7 +614,7 @@ void ExtVideo::updateFilterOptions() ...@@ -616,7 +614,7 @@ void ExtVideo::updateFilterOptions()
else if( combobox ) else if( combobox )
val = combobox->itemData( combobox->currentIndex() ).toString(); val = combobox->itemData( combobox->currentIndex() ).toString();
else else
msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ ); msg_Warn( p_intf, "Could not find the correct String widget" );
config_PutPsz( p_intf, qtu( option ), qtu( val ) ); config_PutPsz( p_intf, qtu( option ), qtu( val ) );
if( b_is_command ) if( b_is_command )
var_SetString( p_obj, qtu( option ), qtu( val ) ); var_SetString( p_obj, qtu( option ), qtu( val ) );
......
...@@ -486,7 +486,7 @@ QModelIndex PLModel::parent( const QModelIndex &index ) const ...@@ -486,7 +486,7 @@ QModelIndex PLModel::parent( const QModelIndex &index ) const
PLItem *childItem = getItem( index ); PLItem *childItem = getItem( index );
if( !childItem ) if( !childItem )
{ {
msg_Err( p_playlist, "NULL CHILD" ); msg_Err( p_playlist, "Item not found" );
return QModelIndex(); return QModelIndex();
} }
...@@ -494,8 +494,7 @@ QModelIndex PLModel::parent( const QModelIndex &index ) const ...@@ -494,8 +494,7 @@ QModelIndex PLModel::parent( const QModelIndex &index ) const
if( !parentItem || parentItem == rootItem ) return QModelIndex(); if( !parentItem || parentItem == rootItem ) return QModelIndex();
if( !parentItem->parent() ) if( !parentItem->parent() )
{ {
msg_Err( p_playlist, "No parent parent, trying row 0 " ); msg_Err( p_playlist, "No parent found, trying row 0. Please report this" );
msg_Err( p_playlist, "----- PLEASE REPORT THIS ------" );
return createIndex( 0, 0, parentItem ); return createIndex( 0, 0, parentItem );
} }
return createIndex(parentItem->row(), 0, parentItem); return createIndex(parentItem->row(), 0, parentItem);
...@@ -699,7 +698,6 @@ void PLModel::insertChildren( PLItem *node, QList<PLItem*>& items, int i_pos ) ...@@ -699,7 +698,6 @@ void PLModel::insertChildren( PLItem *node, QList<PLItem*>& items, int i_pos )
assert( node ); assert( node );
int count = items.count(); int count = items.count();
if( !count ) return; if( !count ) return;
printf( "Here I am\n");
beginInsertRows( index( node, 0 ), i_pos, i_pos + count - 1 ); beginInsertRows( index( node, 0 ), i_pos, i_pos + count - 1 );
for( int i = 0; i < count; i++ ) for( int i = 0; i < count; i++ )
{ {
......
...@@ -174,7 +174,6 @@ void StandardPLPanel::searchDelayed( const QString& searchText ) ...@@ -174,7 +174,6 @@ void StandardPLPanel::searchDelayed( const QString& searchText )
if( type == SD_TYPE && can_search ) if( type == SD_TYPE && can_search )
{ {
msg_Err( p_intf, "SEARCHING DELAYED");
if( !name.isEmpty() && !searchText.isEmpty() ) if( !name.isEmpty() && !searchText.isEmpty() )
playlist_ServicesDiscoveryControl( THEPL, qtu( name ), SD_CMD_SEARCH, playlist_ServicesDiscoveryControl( THEPL, qtu( name ), SD_CMD_SEARCH,
qtu( searchText ) ); qtu( searchText ) );
...@@ -196,7 +195,6 @@ void StandardPLPanel::setRootItem( playlist_item_t *p_item, bool b ) ...@@ -196,7 +195,6 @@ void StandardPLPanel::setRootItem( playlist_item_t *p_item, bool b )
Q_UNUSED( b ); Q_UNUSED( b );
#endif #endif
{ {
msg_Dbg( p_intf, "Normal PL/ML or SD" );
if( currentView->model() != model ) if( currentView->model() != model )
currentView->setModel( model ); currentView->setModel( model );
model->rebuild( p_item ); model->rebuild( p_item );
......
...@@ -146,7 +146,7 @@ void ConvertDialog::close() ...@@ -146,7 +146,7 @@ void ConvertDialog::close()
mrl += "}"; mrl += "}";
} }
msg_Warn( p_intf, "Transcode MRL: %s", qtu( mrl ) ); msg_Dbg( p_intf, "Transcode MRL: %s", qtu( mrl ) );
accept(); accept();
} }
......
...@@ -115,7 +115,7 @@ PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf ) ...@@ -115,7 +115,7 @@ PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf )
main_panel_l->setContentsMargins( 6, 0, 0, 3 ); main_panel_l->setContentsMargins( 6, 0, 0, 3 );
b_small = (p_intf->p_sys->i_screenHeight < 750); b_small = (p_intf->p_sys->i_screenHeight < 750);
if( b_small ) msg_Dbg( p_intf, "Small"); if( b_small ) msg_Dbg( p_intf, "Small Resolution");
setMaximumHeight( p_intf->p_sys->i_screenHeight ); setMaximumHeight( p_intf->p_sys->i_screenHeight );
for( int i = 0; i < SPrefsMax ; i++ ) simple_panels[i] = NULL; for( int i = 0; i < SPrefsMax ; i++ ) simple_panels[i] = NULL;
......
...@@ -260,7 +260,6 @@ void ToolbarEditDialog::changeProfile( int i ) ...@@ -260,7 +260,6 @@ void ToolbarEditDialog::changeProfile( int i )
void ToolbarEditDialog::close() void ToolbarEditDialog::close()
{ {
msg_Dbg( p_intf, "Close and save" );
getSettings()->setValue( "MainWindow/ToolbarPos", getSettings()->setValue( "MainWindow/ToolbarPos",
positionCombo->itemData( positionCombo->currentIndex() ).toInt() ); positionCombo->itemData( positionCombo->currentIndex() ).toInt() );
getSettings()->setValue( "MainWindow/MainToolbar1", controller1->getValue() ); getSettings()->setValue( "MainWindow/MainToolbar1", controller1->getValue() );
......
...@@ -103,13 +103,13 @@ void MainInterface::createTaskBarButtons() ...@@ -103,13 +103,13 @@ void MainInterface::createTaskBarButtons()
QBitmap mask4 = img4.createMaskFromColor(Qt::transparent); QBitmap mask4 = img4.createMaskFromColor(Qt::transparent);
if(-1 == ImageList_Add(himl, img.toWinHBITMAP(QPixmap::PremultipliedAlpha),mask.toWinHBITMAP())) if(-1 == ImageList_Add(himl, img.toWinHBITMAP(QPixmap::PremultipliedAlpha),mask.toWinHBITMAP()))
msg_Err( p_intf, "ImageList_Add failed" ); msg_Err( p_intf, "First ImageList_Add failed" );
if(-1 == ImageList_Add(himl, img2.toWinHBITMAP(QPixmap::PremultipliedAlpha),mask2.toWinHBITMAP())) if(-1 == ImageList_Add(himl, img2.toWinHBITMAP(QPixmap::PremultipliedAlpha),mask2.toWinHBITMAP()))
msg_Err( p_intf, "ImageList_Add failed" ); msg_Err( p_intf, "Second ImageList_Add failed" );
if(-1 == ImageList_Add(himl, img3.toWinHBITMAP(QPixmap::PremultipliedAlpha),mask3.toWinHBITMAP())) if(-1 == ImageList_Add(himl, img3.toWinHBITMAP(QPixmap::PremultipliedAlpha),mask3.toWinHBITMAP()))
msg_Err( p_intf, "ImageList_Add failed" ); msg_Err( p_intf, "Third ImageList_Add failed" );
if(-1 == ImageList_Add(himl, img4.toWinHBITMAP(QPixmap::PremultipliedAlpha),mask4.toWinHBITMAP())) if(-1 == ImageList_Add(himl, img4.toWinHBITMAP(QPixmap::PremultipliedAlpha),mask4.toWinHBITMAP()))
msg_Err( p_intf, "ImageList_Add failed" ); msg_Err( p_intf, "Fourth ImageList_Add failed" );
} }
// Define an array of two buttons. These buttons provide images through an // Define an array of two buttons. These buttons provide images through an
......
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