Author: sh-sh-sh Date: Tue Jul 31 16:08:46 2007 New Revision: 39842 URL: http://svn.opensuse.org/viewcvs/yast?rev=39842&view=rev Log: removed cruft Modified: branches/tmp/sh/qt4-port/qt/src/YQLabel.cc branches/tmp/sh/qt4-port/qt/src/YQUI.h branches/tmp/sh/qt4-port/qt/src/YQUIComponent.h branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc Modified: branches/tmp/sh/qt4-port/qt/src/YQLabel.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQLabel.cc?rev=39842&r1=39841&r2=39842&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQLabel.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQLabel.cc Tue Jul 31 16:08:46 2007 @@ -44,7 +44,6 @@ if ( opt.isHeading.value() ) { setFont( YQUI::ui()->headingFont() ); - } else { @@ -52,7 +51,6 @@ YQUI::ui()->boldFont() : YQUI::ui()->currentFont() ); } - if ( opt.isOutputField.value() ) { Modified: branches/tmp/sh/qt4-port/qt/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUI.h?rev=39842&r1=39841&r2=39842&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUI.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUI.h Tue Jul 31 16:08:46 2007 @@ -737,13 +737,6 @@ **/ vector _popup_stack; -#ifdef FIXME_OBSOLETE - /** - * Numeric ID for defaultsize dialogs for the widget stack - **/ - int _main_dialog_id; -#endif - /** * Size for `opt(`defaultsize) dialogs. */ Modified: branches/tmp/sh/qt4-port/qt/src/YQUIComponent.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUIComponent.h?rev=39842&r1=39841&r2=39842&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUIComponent.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUIComponent.h Tue Jul 31 16:08:46 2007 @@ -21,6 +21,9 @@ #ifndef YQUIComponent_h #define YQUIComponent_h +#define y2log_component "qt-ui" +#include + #include #include "YQUI.h" @@ -38,7 +41,12 @@ **/ virtual YUI * createUI( int argc, char **argv, bool with_threads, const char * macro_file ) { +#ifdef FIXME_ENABLE_THREADS return new YQUI( argc, argv, with_threads, macro_file ); +#else + y2warning( "Threads don't work with Qt4 yet - threading disabled" ); + return new YQUI( argc, argv, false, macro_file ); +#endif } /** Modified: branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc?rev=39842&r1=39841&r2=39842&view=diff ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc Tue Jul 31 16:08:46 2007 @@ -58,9 +58,6 @@ : QObject() , YUI( with_threads ) , _main_win( NULL ) -#ifdef FIXME - , _main_dialog_id(0) -#endif , _eventLoop( 0 ) , _font_family( "Sans Serif" ) , _lang_fonts( 0 ) @@ -86,23 +83,14 @@ qInstallMsgHandler( qMessageHandler ); - // DEBUG - // DEBUG - // DEBUG + // Copy command line arguments for QApplication + char ** argv_copy = (char **) malloc( (argc+1) * sizeof( const char * ) ); for ( int i=0; i < argc; i++ ) argv_copy[i+1] = strdup( argv[i] ); argv_copy[0] = strdup( "YaST2" ); - // DEBUG - // DEBUG - // DEBUG - -#if 0 - new QApplication( argc, argv_copy, - true ); // GUI enabled -#endif int argc_copy = argc; new QApplication( argc_copy, argv_copy, @@ -114,9 +102,7 @@ // Qt keeps track to a global QApplication in qApp. Q_CHECK_PTR( qApp ); -#ifdef FIXME qApp->installEventFilter( this ); -#endif processCommandLineArgs( argc_copy, argv_copy ); calcDefaultSize(); @@ -217,9 +203,7 @@ // Init other stuff -#ifdef FIXME qApp->setFont( currentFont() ); -#endif busyCursor(); connect( & _user_input_timer, SIGNAL( timeout() ), @@ -568,12 +552,6 @@ // y2milestone( "Hiding main window" ); _main_win->hide(); } -#ifdef FIXME_OBSOLETE - else - { - _widget_stack->raiseWidget( _main_dialog_id ); - } -#endif } else // non-defaultsize dialog { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org