Qt4 - FIXME and comments fix. If you want to help, just grep -r FIXME *

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 73bac4c022a2abc524c3c735fbabd2cf251628a9..608e22785080a0915bfba8949f8149418f274d2d 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -256,14 +256,12 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
     CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
              this, AtoBLoop( float, int, int ) );
 
-    //FIXME Frame by frame function
     frameButton = new QPushButton( "Fr" );
     frameButton->setMaximumSize( QSize( 26, 26 ) );
     frameButton->setIconSize( QSize( 20, 20 ) );
     advLayout->addWidget( frameButton );
     BUTTON_SET_ACT( frameButton, "Fr", qtr( "Frame by Frame" ), frame() );
 
-    /* FIXME Record function */
     recordButton = new QPushButton( "R" );
     recordButton->setMaximumSize( QSize( 26, 26 ) );
     recordButton->setIconSize( QSize( 20, 20 ) );
@@ -332,7 +330,10 @@ void AdvControlsWidget::AtoBLoop( float f_pos, int i_time, int i_length )
     }
 }
 
+/* FIXME Record function */
 void AdvControlsWidget::record(){}
+
+//FIXME Frame by frame function
 void AdvControlsWidget::frame(){}
 
 /*****************************
@@ -478,8 +479,6 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
 
     /*
      * Other first Line buttons
-     * Might need to be inside a frame to avoid a few resizing pb
-     * FIXME
      */
     /** Fullscreen/Visualisation **/
     fullscreenButton = new QPushButton( "F" );
@@ -708,8 +707,7 @@ void ControlsWidget::toggleAdvanced()
         advControls->hide();
         b_advancedVisible = false;
     }
-    //FIXME connect this one :D
-    emit advancedControlsToggled( b_advancedVisible );  //  doComponentsUpdate();
+    emit advancedControlsToggled( b_advancedVisible );
 }
 
 

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index cff5e85f2254988042a780ba0ca2d61dd7ca80ae..447b67b753e7c23f19144667616ead13bd145ac9 100644 (file)
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -143,7 +143,7 @@ FileOpenPanel::~FileOpenPanel(){}
 /* Show a fileBrowser to select a subtitle */
 void FileOpenPanel::browseFileSub()
 {
-    // FIXME Handle selection of more than one subtitles file
+    // TODO Handle selection of more than one subtitles file
     QStringList files = THEDP->showSimpleOpen( qtr("Open subtitles file"),
                             EXT_FILTER_SUBTITLE,
                             dialogBox->directory().absolutePath() );
@@ -340,7 +340,7 @@ void DiscOpenPanel::updateMRL()
 {
     QString mrl = "";
 
-    /* CDDAX and VCDX not implemented. FIXME ? */
+    /* CDDAX and VCDX not implemented. TODO ? */
     /* DVD */
     if( ui.dvdRadioButton->isChecked() ) {
         if( !ui.dvdsimple->isChecked() )

diff --git a/modules/gui/qt4/dialogs/mediainfo.cpp b/modules/gui/qt4/dialogs/mediainfo.cpp
index b843d6b76768ea21ab66d63fecc1e1403bcf0027..6d9affc338edf6348dadebbc0e4883a3986e4bd7 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.cpp
+++ b/modules/gui/qt4/dialogs/mediainfo.cpp
@@ -65,7 +65,7 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf,
 
     QGridLayout *layout = new QGridLayout( this );
 
-    /* FIXME GNOME/KDE ? */
+    /* No need to use a QDialogButtonBox here */
     saveMetaButton = new QPushButton( qtr( "&Save Metadata" ) );
     saveMetaButton->hide();
     QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 3bbf5938e260206439e1c2b52b8794d39da80445..c40665a882310fe8b08e705cfb7c2ef9a3c5b825 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -202,7 +202,6 @@ void OpenDialog::toggleAdvancedPanel()
 /***********
  * Actions *
  ***********/
-
 /* If Cancel is pressed or escaped */
 void OpenDialog::cancel()
 {
@@ -215,15 +214,7 @@ void OpenDialog::cancel()
 /* If EnterKey is pressed */
 void OpenDialog::close()
 {
-    /* FIXME */
-    if ( !i_action_flag )
-    {
-        play();
-    }
-    else
-    {
-        stream();
-    }
+    selectSlots();
 }
 
 /* Play button */

diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp
index cef16ba0bd19eb36fe988579d275b0b4550c5f54..e0076ee7d242aaa8107a1459acd0e89788c54808 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -176,7 +176,8 @@ void PrefsDialog::setSmall()
 
     if( !current_simple_panel )
     {
-        current_simple_panel = new SPrefsPanel( p_intf, main_panel, SPrefsDefaultCat );
+        current_simple_panel =
+            new SPrefsPanel( p_intf, main_panel, SPrefsDefaultCat );
         simple_panels[SPrefsDefaultCat] =  current_simple_panel;
         main_panel_l->addWidget( current_simple_panel );
     }
@@ -320,11 +321,14 @@ void PrefsDialog::cancel()
 /* Reset all the preferences, when you click the button */
 void PrefsDialog::reset()
 {
-    int ret = QMessageBox::question(this, qtr( "Reset Preferences" ),
+    int ret = QMessageBox::question(
+                 this,
+                 qtr( "Reset Preferences" ),
                  qtr( "This will reset your VLC media player preferences.\n"
-                         "Are you sure you want to continue?" ),
-                  QMessageBox::Ok | QMessageBox::Cancel,
-                                                         QMessageBox::Ok);
+                      "Are you sure you want to continue?" ),
+                 QMessageBox::Ok | QMessageBox::Cancel,
+                 QMessageBox::Ok);
+
     if( ret == QMessageBox::Ok )
     {
         config_ResetAll( p_intf );

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 453f060923dbca37843dec8de32ea298f5e81335..bfc619c44019fa2e66901a09b1e1a32d35c420d3 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -207,6 +207,7 @@ void SoutDialog::setOptions()
     }
 
     /* ADD HERE the profiles you want and need */
+    /* FIXME */
     if( profileString == "IPod" ) setProfile( MP4, true, "mp4a", true, "mp4v" )
     else if( profileString == "XBox" ) setProfile( ASF, true, "wma", true, "WMV2" )
 

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 5a9536dc49e5a4ec58e44703e002dc342ce6731b..9e02240bf32a5ac093efab6a04de3e6136cfdb4b 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -194,7 +194,7 @@ void DialogsProvider::mediaCodecDialog()
 
 void DialogsProvider::bookmarksDialog()
 {
-    /* FIXME - Implement me */
+    /* TODO - Implement me */
     /*  BookmarkDialog::getInstance( p_intf )->toggleVisible(); */
 }
 

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 6a5d19e50fb283f1fab16ac84fb746b6fcbf5eda..1c5d51f84f4c3ac5fda69ede7477b34340ed09ed 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -79,7 +79,7 @@ void InputManager::delInput()
     }
 }
 
-//FIXME break that
+//TODO break that
 void InputManager::update()
 {
     /// \todo Emit the signals only if it changed

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 64eaab258b6b4ff4dcdf7581d992b4972b53ce28..73848ba0997b7f055e8ec43aa9954104cf0db221 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -132,7 +132,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
         alwaysVideoFlag = true;
 
     /* Set the other interface settings */
-    //FIXME I don't like that code
+    //TODO: I don't like that code
     visualSelectorEnabled = settings->value( "visual-selector", false ).toBool();
     notificationEnabled = config_GetInt( p_intf, "qt-notification" )
                           ? true : false;
@@ -282,8 +282,8 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     CONNECT( this, askReleaseVideo( void * ), this, releaseVideoSlot( void * ) );
 
     CONNECT( dockPL, topLevelChanged( bool ), this, doComponentsUpdate() );
-    // DEBUG FIXME
-    hide();
+    CONNECT( controls, advancedControlsToggled( bool ), 
+             this, doComponentsUpdate() );
 
     updateGeometry();
     settings->endGroup();
@@ -297,7 +297,8 @@ MainInterface::~MainInterface()
 
     settings->beginGroup( "MainWindow" );
     settings->setValue( "playlist-floats", dockPL->isFloating() );
-    settings->setValue( "adv-controls", getControlsVisibilityStatus() & CONTROLS_ADVANCED );
+    settings->setValue( "adv-controls", 
+                        getControlsVisibilityStatus() & CONTROLS_ADVANCED );
     settings->setValue( "pos", pos() );
 
     settings->endGroup();
@@ -487,7 +488,7 @@ void MainInterface::debug()
    the skins.
    Maybe the other solution is to redefine the sizeHint() of the playlist and
    ask _parent->isFloating()...
-   If you think this would be better, please FIX it...
+   If you think this would be better, please FIXME it...
 */
 QSize MainInterface::sizeHint() const
 {
@@ -519,7 +520,6 @@ void MainInterface::resizeEvent( QResizeEvent *e )
     }
     if( VISIBLE( playlistWidget ) )
     {
-        //FIXME
 //        SET_WH( playlistWidget , e->size().width() - addSize.width(),
               //                   e->size().height() - addSize.height() );
         playlistWidget->updateGeometry();
@@ -533,7 +533,7 @@ void MainInterface::resizeEvent( QResizeEvent *e )
 void MainInterface::showSpeedMenu( QPoint pos )
 {
     speedControlMenu->exec( QCursor::pos() - pos
-            + QPoint( 0, speedLabel->height() ) );
+                          + QPoint( 0, speedLabel->height() ) );
 }
 
 /****************************************************************************
@@ -679,7 +679,7 @@ void MainInterface::togglePlaylist()
     {
     /* toggle the visibility of the playlist */
        TOGGLEV( dockPL );
-     //resize(sizeHint());
+       //resize(sizeHint());
     }
 #if 0
     doComponentsUpdate();
@@ -796,15 +796,14 @@ void MainInterface::setRate( int rate )
     speedControl->updateControls( rate );
 }
 
-//FIXME Remove this function at the end...
 void MainInterface::updateOnTimer()
 {
- /*   if( intf_ShouldDie( p_intf ) )
+#if 0
+    if( intf_ShouldDie( p_intf ) )
     {
         QApplication::closeAllWindows();
         QApplication::quit();
-    }*/
-#if 0
+    }
     if( need_components_update )
     {
         doComponentsUpdate();

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 75110cdf87753765f6260bb81b447da0a9563b50..b694ab1558b9564fb87b06d1c77f8398c0c9945d 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -268,7 +268,6 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
         /* Minimal View */
         QAction *action=menu->addAction( qtr( "Minimal View..." ), mi,
                 SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) );
-        //FIXME: remove useless thing. But keep it until the release, pls.
         action->setCheckable( true );
         if( mi->getControlsVisibilityStatus() & CONTROLS_VISIBLE )
             action->setChecked( true );
@@ -399,12 +398,11 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *navMenu )
     vector<int> objects;
     vector<const char *> varnames;
 
-    /* FIXME */
     p_object = ( vlc_object_t * )vlc_object_find( p_intf, VLC_OBJECT_INPUT,
             FIND_ANYWHERE );
     if( p_object != NULL )
     {
-        InputAutoMenuBuilder( p_object, objects, varnames );
+        InputAutoMenuBuilder(  p_object, objects, varnames );
         PUSH_VAR( "prev-title" ); PUSH_VAR ( "next-title" );
         PUSH_VAR( "prev-chapter" ); PUSH_VAR( "next-chapter" );
         vlc_object_release( p_object );

diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index 2334b05e0c393f9ba48ae575b13a12f3b0c998e4..d06457dee2fd97f2725ec96e7a5767fb0275391d 100644 (file)
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -91,8 +91,8 @@ public:
     static void MiscPopupMenu( intf_thread_t * );
     static void PopupMenu( intf_thread_t *, bool );
     static void PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu );
-
-static void PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf, input_thread_t *p_input );
+    static void PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf, 
+                                         input_thread_t *p_input );
     /* Systray */
     static void updateSystrayMenu( MainInterface *,intf_thread_t  *,
                                    bool b_force_visible = false);