Qt4 - Cleanups, simplifications. Public=>Private for slots.
authorJean-Baptiste Kempf <jb@videolan.org>
Sat, 8 Sep 2007 16:01:33 +0000 (16:01 +0000)
committerJean-Baptiste Kempf <jb@videolan.org>
Sat, 8 Sep 2007 16:01:33 +0000 (16:01 +0000)
modules/gui/qt4/dialogs/mediainfo.cpp
modules/gui/qt4/dialogs/podcast_configuration.cpp
modules/gui/qt4/dialogs/sout.cpp
modules/gui/qt4/dialogs/sout.hpp
modules/gui/qt4/dialogs_provider.cpp

index b81ebaf..c5b2a67 100644 (file)
@@ -204,7 +204,7 @@ void MediaInfoDialog::close()
     MP->setEditMode( false );
 }
 
-void MediaInfoDialog::( int i_tab )
+void MediaInfoDialog::updateButtons( int i_tab )
 {
     if( MP->isInEditMode() && i_tab == 0 )
         saveMetaButton->show();
index 617453a..7206810 100644 (file)
@@ -27,6 +27,7 @@ PodcastConfigurationDialog::PodcastConfigurationDialog( intf_thread_t *_p_intf )
     :p_intf( _p_intf )
 {
     ui.setupUi( this );
+    
     QPushButton *okButton = new QPushButton( qtr( "OK" ), this );
     QPushButton *cancelButton = new QPushButton( qtr( "Cancel" ), this );
     ui.okCancel->addButton( okButton, QDialogButtonBox::AcceptRole );
index c7e18b9..e62a656 100644 (file)
@@ -133,7 +133,7 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf,
 
 QString SoutDialog::getMrl()
 {
-    return this->mrl;
+    return mrl;
 }
 
 void SoutDialog::fileBrowse()
index 3137d8c..09d2814 100644 (file)
@@ -43,20 +43,23 @@ public:
                 bool _transcode_only = false );
     virtual ~SoutDialog() {}
 
-    QString getMrl();
-    QString mrl;
+    QString getMrl();  
     //sout_gui_descr_t *sout;
 private:
     Ui::Sout ui;
     QPushButton *okButton;
+    QString mrl;
     bool b_transcode_only;
+
 public slots:
+    void updateMRL();
+
+private slots:
     void ok();
     void cancel();
-    void updateMRL();
-    void fileBrowse();
     void toggleSout();
     void setOptions();
+    void fileBrowse();
     void setVTranscodeOptions( bool );
     void setATranscodeOptions( bool );
     void setSTranscodeOptions( bool );
index 47d1b8e..1aa8d75 100644 (file)
@@ -396,11 +396,11 @@ void DialogsProvider::streamingDialog( QString mrl, bool b_transcode_only )
                                                     b_transcode_only );
     if( s->exec() == QDialog::Accepted )
     {
-        msg_Err(p_intf, "mrl %s\n", qta(s->mrl));
+        msg_Err( p_intf, "mrl %s\n", qta( s->getMrl() ) );
         /* Just do it */
-        int i_len = strlen( qtu(s->mrl) ) + 10;
+        int i_len = strlen( qtu( s->getMrl() ) ) + 10;
         char *psz_option = (char*)malloc(i_len);
-        snprintf( psz_option, i_len - 1, "%s", qtu(s->mrl));
+        snprintf( psz_option, i_len - 1, "%s", qtu( s->getMrl() ) );
 
         playlist_AddExt( THEPL, qtu( mrl ), "Streaming",
                          PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,