[vlc-devel] commit: qt4: missing undefs. ( Rémi Duraffort )
git version control
git at videolan.org
Thu Apr 30 11:00:29 CEST 2009
vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Wed Apr 29 20:59:56 2009 +0200| [43d9cf9de77efd77b5cbc8e1432a4d0a2097f445] | committer: Rémi Duraffort
qt4: missing undefs.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=43d9cf9de77efd77b5cbc8e1432a4d0a2097f445
---
modules/gui/qt4/components/controller.cpp | 1 +
modules/gui/qt4/components/info_panels.cpp | 6 +++++
modules/gui/qt4/components/open_panels.cpp | 5 +++-
modules/gui/qt4/components/simple_preferences.cpp | 22 ++++++++++++++++++++
.../gui/qt4/components/sout/profile_selector.cpp | 9 +++++++-
modules/gui/qt4/components/sout/sout_widgets.cpp | 7 ++++-
modules/gui/qt4/dialogs/sout.cpp | 13 ++++++++---
modules/gui/qt4/menus.cpp | 2 +
8 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index af1da21..f21182b 100644
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -571,6 +571,7 @@ QFrame *AbstractController::telexFrame()
#undef SET_MAPPING
#undef CONNECT_MAP_SET
#undef BUTTON_SET_BAR
+#undef BUTTON_SET_BAR2
#undef ENABLE_ON_VIDEO
#undef ENABLE_ON_INPUT
diff --git a/modules/gui/qt4/components/info_panels.cpp b/modules/gui/qt4/components/info_panels.cpp
index c777637..dcd0417 100644
--- a/modules/gui/qt4/components/info_panels.cpp
+++ b/modules/gui/qt4/components/info_panels.cpp
@@ -550,6 +550,10 @@ InputStatsPanel::InputStatsPanel( QWidget *parent,
"0", audio, "" );
CREATE_AND_ADD_TO_CAT( alost_stat, qtr("Lost buffers"), "0", audio, "" );
+#undef CREATE_AND_ADD_TO_CAT
+#undef CREATE_CATEGORY
+#undef CREATE_TREE_ITEM
+
input->setExpanded( true );
video->setExpanded( true );
streaming->setExpanded( true );
@@ -600,6 +604,8 @@ void InputStatsPanel::update( input_item_t *p_item )
UPDATE( aplayed_stat, "%5i", p_item->p_stats->i_played_abuffers );
UPDATE( alost_stat, "%5i", p_item->p_stats->i_lost_abuffers );
+#undef UPDATE
+
vlc_mutex_unlock(& p_item->p_stats->lock );
}
diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 172fcfd..a01d4b0 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -387,6 +387,8 @@ void DiscOpenPanel::updateButtons()
updateMRL();
}
+#undef setDrive
+
/* Update the current MRL */
void DiscOpenPanel::updateMRL()
{
@@ -1073,7 +1075,8 @@ void CaptureOpenPanel::initialize()
CONNECT( ui.deviceCombo, activated( int ), this, updateMRL() );
CONNECT( ui.deviceCombo, activated( int ), this, updateButtons() );
-#undef addModule
+#undef CuMRL
+#undef addModuleAndLayouts
}
CaptureOpenPanel::~CaptureOpenPanel()
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 6b7bb90..21f63e6 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -84,6 +84,8 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent, bool sma
spref_cone_Input_64.png, 4 );
ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 );
+#undef ADD_CATEGORY
+
SPrefsInterface->setChecked( true );
layout->setMargin( 0 );
layout->setSpacing( 1 );
@@ -279,6 +281,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
optionWidgets.append( NULL );
#endif
+#undef audioControl2
+#undef audioControl
+#undef audioCommon
+
/* Audio Options */
CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
defaultVolume );
@@ -407,6 +413,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
addToCachingBox( N_("Normal"), CachingNormal );
addToCachingBox( N_("High latency"), CachingHigh );
addToCachingBox( N_("Higher latency"), CachingHigher );
+ #undef addToCachingBox
#define TestCaC( name ) \
b_cache_equal = b_cache_equal && \
@@ -446,6 +453,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
TestCaCi( "mms-caching", 19 );
if( b_cache_equal ) ui.cachingCombo->setCurrentIndex(
ui.cachingCombo->findData( QVariant( i_cache ) ) );
+#undef TestCaCi
+#undef TestCaC
END_SPREFS_CAT;
/*******************
@@ -593,6 +602,13 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
}
setLayout( panel_layout );
+
+#undef END_SPREFS_CAT
+#undef START_SPREFS_CAT
+#undef CONFIG_GENERIC_FILE
+#undef CONFIG_GENERIC_NO_BOOL
+#undef CONFIG_GENERIC2
+#undef CONFIG_GENERIC
}
void SPrefsPanel::updateAudioOptions( int number)
@@ -685,6 +701,8 @@ void SPrefsPanel::apply()
//CaCi( "dv-caching" ) too short...
}
break;
+#undef CaC
+#undef CaCi
}
/* Interfaces */
@@ -817,6 +835,10 @@ void SPrefsPanel::assoDialog()
Qt::Checked : Qt::PartiallyChecked )
: Qt::Unchecked );
+#undef aTo
+#undef aTv
+#undef aTa
+
QDialogButtonBox *buttonBox = new QDialogButtonBox( d );
QPushButton *closeButton = new QPushButton( qtr( "&Apply" ) );
QPushButton *clearButton = new QPushButton( qtr( "&Cancel" ) );
diff --git a/modules/gui/qt4/components/sout/profile_selector.cpp b/modules/gui/qt4/components/sout/profile_selector.cpp
index 7b1f416..69adc11 100644
--- a/modules/gui/qt4/components/sout/profile_selector.cpp
+++ b/modules/gui/qt4/components/sout/profile_selector.cpp
@@ -260,6 +260,7 @@ inline void VLCProfileEditor::registerCodecs()
ADD_VCODEC( "M-JPEG", "MJPG" )
ADD_VCODEC( "Theora", "theo" )
ADD_VCODEC( "Dirac", "drac" )
+#undef ADD_VCODEC
#define ADD_ACODEC( name, fourcc ) ui.aCodecBox->addItem( name, QVariant( fourcc ) );
ADD_ACODEC( "MPEG Audio", "mpga" )
@@ -271,6 +272,7 @@ inline void VLCProfileEditor::registerCodecs()
ADD_ACODEC( "Speex", "spx" )
ADD_ACODEC( "WAV", "s16l" )
ADD_ACODEC( "WMA", "wma" )
+#undef ADD_ACODEC
#define ADD_SCALING( factor ) ui.vScaleBox->addItem( factor );
ADD_SCALING( "1" )
@@ -281,16 +283,19 @@ inline void VLCProfileEditor::registerCodecs()
ADD_SCALING( "1.5" )
ADD_SCALING( "1.75" )
ADD_SCALING( "2" )
+#undef ADD_SCALING
#define ADD_SAMPLERATE( sample ) ui.aSampleBox->addItem( sample );
ADD_SAMPLERATE( "11250" )
ADD_SAMPLERATE( "22500" )
ADD_SAMPLERATE( "44100" )
ADD_SAMPLERATE( "48000" )
+#undef ADD_SAMPLERATE
#define ADD_SCODEC( name, fourcc ) ui.subsCodecBox->addItem( name, QVariant( fourcc ) );
ADD_SCODEC( "DVB subtitle", "dvbs" )
ADD_SCODEC( "T.140", "t140" )
+#undef ADD_SCODEC
}
void VLCProfileEditor::fillProfile( const QString& qs )
@@ -385,7 +390,8 @@ QString VLCProfileEditor::transcodeValue()
SMUX( FLVMux, "flv" )
SMUX( MKVMux, "mkv" )
SMUX( AVIMux, "avi" )
- SMUX( MJPEGMux, "mjpg" );
+ SMUX( MJPEGMux, "mjpg" ){}
+#undef SMUX
#define currentData( box ) box->itemData( box->currentIndex() )
QString qs_acodec, qs_vcodec;
@@ -416,6 +422,7 @@ QString VLCProfileEditor::transcodeValue()
<< currentData( ui.subsCodecBox ).toString()
<< QString::number( ui.subsOverlay->isChecked() );
+#undef currentData
return transcodeMRL.join( ";" );
}
diff --git a/modules/gui/qt4/components/sout/sout_widgets.cpp b/modules/gui/qt4/components/sout/sout_widgets.cpp
index 2c77042..7a9144b 100644
--- a/modules/gui/qt4/components/sout/sout_widgets.cpp
+++ b/modules/gui/qt4/components/sout/sout_widgets.cpp
@@ -76,8 +76,8 @@ void SoutInputBox::setMRL( const QString& mrl )
sourceValueLabel->setText( type );
}
- #define CT( x ) connect( x, SIGNAL( textChanged( const QString& ) ), this, SIGNAL( mrlUpdated() ) );
- #define CS( x ) connect( x, SIGNAL( valueChanged( int ) ), this, SIGNAL( mrlUpdated() ) );
+#define CT( x ) connect( x, SIGNAL( textChanged( const QString& ) ), this, SIGNAL( mrlUpdated() ) );
+#define CS( x ) connect( x, SIGNAL( valueChanged( int ) ), this, SIGNAL( mrlUpdated() ) );
/* FileDest Box */
FileDestBox::FileDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
@@ -380,6 +380,9 @@ ICEDestBox::ICEDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
CT( ICEPassEdit );
}
+#undef CS
+#undef CT
+
QString ICEDestBox::getMRL( const QString& mux )
{
if( ICEEdit->text().isEmpty() ) return "";
diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index ae56c2a..9fef443 100644
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -79,10 +79,10 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString&
BUTTONACT( ui.addButton, addDest() );
// /* Connect everything to the updateMRL function */
- #define CB( x ) CONNECT( ui.x, toggled( bool ), this, updateMRL() );
- #define CT( x ) CONNECT( ui.x, textChanged( const QString& ), this, updateMRL() );
- #define CS( x ) CONNECT( ui.x, valueChanged( int ), this, updateMRL() );
- #define CC( x ) CONNECT( ui.x, currentIndexChanged( int ), this, updateMRL() );
+#define CB( x ) CONNECT( ui.x, toggled( bool ), this, updateMRL() );
+#define CT( x ) CONNECT( ui.x, textChanged( const QString& ), this, updateMRL() );
+#define CS( x ) CONNECT( ui.x, valueChanged( int ), this, updateMRL() );
+#define CC( x ) CONNECT( ui.x, currentIndexChanged( int ), this, updateMRL() );
/* Misc */
CB( soutAll ); CB( soutKeep ); CS( ttl ); CT( sapName ); CT( sapGroup );
@@ -103,6 +103,11 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString&
BUTTONACT( ui.nextButton2, next() );
BUTTONACT( ui.prevButton, prev() );
BUTTONACT( ui.prevButton2, prev() );
+
+#undef CC
+#undef CS
+#undef CT
+#undef CB
}
void SoutDialog::next()
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 020bab4..04ba848 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -1253,6 +1253,8 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu,
FREENULL( text.psz_string );
}
+#undef TEXT_OR_VAR
+
int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
vlc_object_t *p_object, bool b_root )
More information about the vlc-devel
mailing list