Commit 855cf8bf authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - Long lines, cosmetics and trailing spaces fixes.

parent 86e63937
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include "components/simple_preferences.hpp" #include "components/simple_preferences.hpp"
#include "components/preferences_widgets.hpp" #include "components/preferences_widgets.hpp"
#include <vlc_config_cat.h> #include <vlc_config_cat.h>
#include <vlc_configuration.h> #include <vlc_configuration.h>
...@@ -343,7 +341,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -343,7 +341,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
b_cache_equal = b_cache_equal && ( i_cache == config_GetInt( p_intf, name ) ); b_cache_equal = b_cache_equal && ( i_cache == config_GetInt( p_intf, name ) );
#define TestCaCi( name, int ) \ #define TestCaCi( name, int ) \
b_cache_equal = b_cache_equal && ( ( i_cache * int ) == config_GetInt( p_intf, name ) ); b_cache_equal = b_cache_equal && \
( ( i_cache * int ) == config_GetInt( p_intf, name ) );
/* Select the accurate value of the ComboBox */ /* Select the accurate value of the ComboBox */
bool b_cache_equal = true; bool b_cache_equal = true;
int i_cache = config_GetInt( p_intf, "file-caching"); int i_cache = config_GetInt( p_intf, "file-caching");
...@@ -361,8 +360,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -361,8 +360,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
TestCaCi( "rtsp-caching", 4 ) TestCaCi( "ftp-caching", 2 ) TestCaCi( "rtsp-caching", 4 ) TestCaCi( "ftp-caching", 2 )
TestCaCi( "http-caching", 4 ) TestCaCi( "realrtsp-caching", 10 ) TestCaCi( "http-caching", 4 ) TestCaCi( "realrtsp-caching", 10 )
TestCaCi( "mms-caching", 19 ) TestCaCi( "mms-caching", 19 )
if( b_cache_equal ) if( b_cache_equal ) ui.cachingCombo->setCurrentIndex(
ui.cachingCombo->setCurrentIndex( ui.cachingCombo->findData( QVariant( i_cache ) ) ); ui.cachingCombo->findData( QVariant( i_cache ) ) );
END_SPREFS_CAT; END_SPREFS_CAT;
/******************* /*******************
...@@ -512,7 +511,7 @@ void SPrefsPanel::apply() ...@@ -512,7 +511,7 @@ void SPrefsPanel::apply()
int i_comboValue = cachingCombo->itemData( cachingCombo->currentIndex() ).toInt(); int i_comboValue = cachingCombo->itemData( cachingCombo->currentIndex() ).toInt();
if( i_comboValue ) if( i_comboValue )
{ {
msg_Dbg( p_intf, "Adjusting all the cache values at level: %i", i_comboValue ); msg_Dbg( p_intf, "Adjusting all cache values at: %i", i_comboValue );
CaC( "udp-caching" ); CaC( "dvdread-caching" ); CaC( "udp-caching" ); CaC( "dvdread-caching" );
CaC( "dvdnav-caching" ); CaC( "tcp-caching" ); CaC( "vcd-caching" ); CaC( "dvdnav-caching" ); CaC( "tcp-caching" ); CaC( "vcd-caching" );
CaC( "fake-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" ); CaC( "fake-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" );
...@@ -523,8 +522,8 @@ void SPrefsPanel::apply() ...@@ -523,8 +522,8 @@ void SPrefsPanel::apply()
#ifdef WIN32 #ifdef WIN32
CaC( "dshow-caching" ); CaC( "dshow-caching" );
#else #else
CaC( "v4l-caching" ); CaC( "jack-input-caching" ); CaC( "v4l2-caching" ); CaC( "v4l-caching" ); CaC( "jack-input-caching" );
CaC( "pvr-caching" ); CaC( "v4l2-caching" ); CaC( "pvr-caching" );
#endif #endif
//CaCi( "dv-caching" ) too short... //CaCi( "dv-caching" ) too short...
} }
......
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