Mailinglist Archive: yast-commit (190 mails)

[gs@xxxxxxxxxxxxxxxx]

Author: gs
Date: Wed May 30 14:53:16 2007
New Revision: 38203

URL: http://svn.opensuse.org/viewcvs/yast?rev=38203&view=rev
Log:
remove YNCursesUI from params

Modified:
    trunk/ncurses/src/pkg/NCPackageSelectorStart.cc
    trunk/ncurses/src/pkg/NCPackageSelectorStart.h

Modified: trunk/ncurses/src/pkg/NCPackageSelectorStart.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelectorStart.cc?rev=38203&r1=38202&r2=38203&view=diff
==============================================================================
--- trunk/ncurses/src/pkg/NCPackageSelectorStart.cc (original)
+++ trunk/ncurses/src/pkg/NCPackageSelectorStart.cc Wed May 30 14:53:16 2007
@@ -40,16 +40,17 @@
 //
 //     DESCRIPTION :
 //
-NCPackageSelectorStart::NCPackageSelectorStart( YNCursesUI *ui,
-                                               NCWidget * parent,
-                                               const YWidgetOpt & opt, YUIDimension dimension,
-                                               string floppyDevice )
+NCPackageSelectorStart::NCPackageSelectorStart( NCWidget * parent,
+                                               const YWidgetOpt & opt,
+                                               YUIDimension dimension )
     : NCSplit( parent, opt, dimension )
       , widgetRoot( 0 )
       , packager( 0 )
       , youMode ( false )
       , updateMode ( false )
 {
+    YNCursesUI * ui = YNCursesUI::ui();
+    
     // set the textdomain
     setTextdomain( "packages" );
     
@@ -64,14 +65,14 @@
     YCPTerm pkgLayout = YCPNull();
     if ( youMode )
     {
-       pkgLayout = readLayoutFile( ui, "/usr/share/YaST2/data/you_layout.ycp" );
+       pkgLayout = readLayoutFile( "/usr/share/YaST2/data/you_layout.ycp" );
     }
     else
     { 
-       pkgLayout = readLayoutFile( ui, "/usr/share/YaST2/data/pkg_layout.ycp" );
+       pkgLayout = readLayoutFile( "/usr/share/YaST2/data/pkg_layout.ycp" );
     }
 
-    if ( ! pkgLayout.isNull() )
+    if ( ! pkgLayout.isNull() && ui )
     {
        YWidgetOpt childrenOpt( opt );
        widgetRoot = (YContainerWidget *)ui->createWidgetTree( dynamic_cast<YWidget *>(parent),
@@ -80,7 +81,7 @@
 
     // create the PackageSelector (creation with 'new' is required because initialization
     // in the list of member variables causes problems with untranslated messages)
-    packager = new NCPackageSelector( ui, opt, floppyDevice );
+    packager = new NCPackageSelector( ui, opt );
 
     if ( widgetRoot )
     {
@@ -226,8 +227,7 @@
 // 
 // Read a layout file (containing a YCPTerm)
 //
-YCPTerm NCPackageSelectorStart::readLayoutFile( YNCursesUI *ui,
-                                               const char * layoutFilename )
+YCPTerm NCPackageSelectorStart::readLayoutFile( const char * layoutFilename )
 {
     YCPTerm   pkgLayout = YCPNull();
     

Modified: trunk/ncurses/src/pkg/NCPackageSelectorStart.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelectorStart.h?rev=38203&r1=38202&r2=38203&view=diff
==============================================================================
--- trunk/ncurses/src/pkg/NCPackageSelectorStart.h (original)
+++ trunk/ncurses/src/pkg/NCPackageSelectorStart.h Wed May 30 14:53:16 2007
@@ -67,9 +67,8 @@
      * Constructor
      * creates the widget tree of the package selector
      */
-    NCPackageSelectorStart( YNCursesUI *ui, NCWidget * parent,
-                           const YWidgetOpt & opt, YUIDimension dimension,
-                           string floppyDevice );
+    NCPackageSelectorStart( NCWidget * parent,
+                           const YWidgetOpt & opt, YUIDimension dimension );
 
     /**
      * Destructor
@@ -105,7 +104,7 @@
     * @param layoutFilename The filename
     * @return YCPTerm
     */
-    YCPTerm readLayoutFile( YNCursesUI *ui, const char * layoutFilename );
+    YCPTerm readLayoutFile( const char * layoutFilename );
 
 };
 

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx