[yast-commit] r43895 - /trunk/qt/src/

Author: sh-sh-sh Date: Thu Jan 24 16:27:54 2008 New Revision: 43895 URL: http://svn.opensuse.org/viewcvs/yast?rev=43895&view=rev Log: use YCP-less logging Modified: trunk/qt/src/QY2ComboTabWidget.cc trunk/qt/src/QY2ListView.cc trunk/qt/src/YFrameBuffer.cc trunk/qt/src/YQAlignment.cc trunk/qt/src/YQApplication.cc trunk/qt/src/YQBarGraph.cc trunk/qt/src/YQBusyIndicator.cc trunk/qt/src/YQCheckBox.cc trunk/qt/src/YQCheckBoxFrame.cc trunk/qt/src/YQComboBox.cc trunk/qt/src/YQDateField.cc trunk/qt/src/YQDialog.cc trunk/qt/src/YQDownloadProgress.cc trunk/qt/src/YQDumbTab.cc trunk/qt/src/YQFrame.cc trunk/qt/src/YQGenericButton.cc trunk/qt/src/YQIconPool.cc trunk/qt/src/YQImage.cc trunk/qt/src/YQInputField.cc trunk/qt/src/YQIntField.cc trunk/qt/src/YQLabel.cc trunk/qt/src/YQLayoutBox.cc trunk/qt/src/YQLogView.cc trunk/qt/src/YQMainWinDock.cc trunk/qt/src/YQMenuButton.cc trunk/qt/src/YQMultiLineEdit.cc trunk/qt/src/YQMultiProgressMeter.cc trunk/qt/src/YQMultiSelectionBox.cc trunk/qt/src/YQPackageSelectorPlugin.cc trunk/qt/src/YQPartitionSplitter.cc trunk/qt/src/YQProgressBar.cc trunk/qt/src/YQRadioButtonGroup.cc trunk/qt/src/YQReplacePoint.cc trunk/qt/src/YQSlider.cc trunk/qt/src/YQTimeField.cc trunk/qt/src/YQTimezoneSelector.cc trunk/qt/src/YQWidgetCaption.cc trunk/qt/src/YQWidgetFactory.cc trunk/qt/src/YQWizardButton.cc Modified: trunk/qt/src/QY2ComboTabWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2ComboTabWidget.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/QY2ComboTabWidget.cc (original) +++ trunk/qt/src/QY2ComboTabWidget.cc Thu Jan 24 16:27:54 2008 @@ -26,8 +26,8 @@ #include <QFrame> -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include "QY2ComboTabWidget.h" @@ -101,7 +101,7 @@ { QWidget * page = pages[ index ]; widget_stack->setCurrentWidget( page ); - // y2debug( "Changing current page" ); + // yuiDebug() << "Changing current page" << endl; emit currentChanged( page ); } else Modified: trunk/qt/src/QY2ListView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2ListView.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/QY2ListView.cc (original) +++ trunk/qt/src/QY2ListView.cc Thu Jan 24 16:27:54 2008 @@ -24,8 +24,8 @@ #include <QMouseEvent> #include "QY2ListView.h" -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" QY2ListView::QY2ListView( QWidget * parent ) : QTreeWidget( parent ) Modified: trunk/qt/src/YFrameBuffer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YFrameBuffer.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YFrameBuffer.cc (original) +++ trunk/qt/src/YFrameBuffer.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "framebuffer" -#include +#define YUILogComponent "framebuffer" +#include "YUILog.h" #include #include @@ -51,7 +51,7 @@ break; default: - y2warning( "Pixel depth %d not supported", _depth ); + yuiWarning() << "Pixel depth " << depth << " not supported" << endl; _bytesPerPixel = 0; break; } @@ -71,7 +71,7 @@ { if ( _fb ) { - y2error( "Framebuffer already mmap()'ed" ); + yuiError() << "Framebuffer already mmap()'ed" << endl; return; } @@ -79,7 +79,7 @@ if ( _fb_fd < 0 ) { - y2error( "Can't open /dev/fb0 - errno %d: %s", errno, strerror( errno ) ); + yuiError() << "Can't open /dev/fb0 - errno " << errno << ": " << strerror( errno ) << endl; return; } @@ -93,7 +93,7 @@ if ( _fb == MAP_FAILED ) { - y2error( "mmap() failed for /dev/fb0 - errno %d: %s", errno, strerror( errno ) ); + yuiError() << "mmap() failed for /dev/fb0 - errno " << errno << ": " << strerror( errno ) << endl; _fb = 0; close( _fb_fd ); } Modified: trunk/qt/src/YQAlignment.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQAlignment.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQAlignment.cc (original) +++ trunk/qt/src/YQAlignment.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include #include "YQAlignment.h" @@ -86,7 +86,7 @@ if ( pixmap.isNull() ) { - y2error( "Can't load background pixmap %s", pixmapName.c_str() ); + yuiError() << "Can't load background pixmap \"" << pixmapName << "\"" << endl; } else { Modified: trunk/qt/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQApplication.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQApplication.cc (original) +++ trunk/qt/src/YQApplication.cc Thu Jan 24 16:27:54 2008 @@ -25,8 +25,8 @@ #include #include -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "YUISymbols.h" #include "utf8.h" @@ -47,12 +47,12 @@ , _autoNormalFontSize( -1 ) , _autoHeadingFontSize( -1 ) { - y2debug( "YQApplication constructor start" ); + yuiDebug() << "YQApplication constructor start" << endl; setIconBasePath( ICONDIR "/icons/22x22/apps/" ); loadPredefinedQtTranslations(); - y2debug( "YQApplication constructor end" ); + yuiDebug() << "YQApplication constructor end" << endl; } @@ -90,8 +90,9 @@ if ( path.isEmpty() ) { - y2warning( "Qt locale directory not set - " - "no translations for predefined Qt dialogs" ); + yuiWarning() << "Qt locale directory not set - " + << "no translations for predefined Qt dialogs" + << endl; return; } @@ -109,13 +110,13 @@ if ( _qtTranslations->isEmpty() ) { - y2warning( "Can't load translations for predefined Qt dialogs from %s/%s", - qPrintable(path), qPrintable(transFile) ); + yuiWarning() << "Can't load translations for predefined Qt dialogs from " + << path << "/" << transFile << endl; } else { - y2milestone( "Loaded translations for predefined Qt dialogs from %s/%s", - qPrintable(path), qPrintable(transFile) ); + yuiMilestone() << "Loaded translations for predefined Qt dialogs from " + << path << "/" << transFile << endl; qApp->installTranslator( _qtTranslations ); } @@ -127,8 +128,8 @@ language.startsWith( "he" ) ) // Hebrew && ! (qApp->layoutDirection() == Qt::RightToLeft) ) { - y2warning( "Using fallback rule for reverse layout for language '%s'", - qPrintable(language) ); + yuiWarning() << "Using fallback rule for reverse layout for language \"" + << language << "\"" << endl; qApp->setLayoutDirection( Qt::RightToLeft ); } @@ -146,9 +147,9 @@ Q_CHECK_PTR( _langFonts ); if ( _langFonts->readError() ) - y2error( "Error reading %s", qPrintable(_langFonts->fileName()) ); + yuiError() << "Error reading " << _langFonts->fileName() << endl; else - y2milestone( "%s read OK", qPrintable(_langFonts->fileName()) ); + yuiMilestone() << _langFonts->fileName() << " read OK" << endl; } QString lang = language.c_str(); @@ -169,29 +170,29 @@ if ( _langFonts->hasKey( fontKey( lang ) ) ) { _fontFamily = _langFonts->get( fontKey( lang ), "Sans Serif" ); - y2milestone( "%s = \"%s\"", qPrintable(fontKey( lang )), qPrintable(_fontFamily) ); + yuiMilestone() << fontKey( lang ) << " = \"" << _fontFamily << "\"" << endl; } else { _fontFamily = _langFonts->get( fontKey( "" ), "Sans Serif" ); - y2milestone( "Using fallback for %s: font = \"%s\"", - qPrintable(lang), qPrintable(_fontFamily) ); + yuiMilestone() << "Using fallback for " << lang + << ": font = \"" << _fontFamily << "\"" + << endl; } if ( _fontFamily != oldFontFamily && ! _fontFamily.isEmpty() ) { - y2milestone( "New font family: %s", qPrintable(_fontFamily) ); + yuiMilestone() << "New font family: " << _fontFamily << endl; deleteFonts(); int size = qApp->font().pointSize(); QFont font( _fontFamily ); font.setPointSize( size ); qApp->setFont(font); // font, informWidgets - y2milestone( "Reloading fonts - now using \"%s\"", - qPrintable(font.toString()) ); + yuiMilestone() << "Reloading fonts - now using \"" << font.toString() << "\"" << endl; } else { - y2debug( "No font change" ); + yuiDebug() << "No font change" << endl; } } @@ -231,14 +232,15 @@ _currentFont->setPixelSize( _autoNormalFontSize ); _currentFont->setWeight( QFont::Normal ); - y2milestone( "Loaded %d pixel font: %s", _autoNormalFontSize, - qPrintable(_currentFont->toString()) ); + yuiMilestone() << "Loaded " << _autoNormalFontSize + << " pixel font: " << _currentFont->toString() + << endl; qApp->setFont( * _currentFont); // font, informWidgets } else { - // y2debug( "Copying QApplication::font()" ); + // yuiDebug() << "Copying QApplication::font()" << endl; _currentFont = new QFont( qApp->font() ); } } @@ -277,8 +279,9 @@ _headingFont->setPixelSize( _autoHeadingFontSize ); _headingFont->setWeight( QFont::Bold ); - y2milestone( "Loaded %d pixel bold font: %s", _autoHeadingFontSize, - qPrintable(_headingFont->toString()) ); + yuiMilestone() << "Loaded " << _autoHeadingFontSize + << " pixel bold font: " << _headingFont->toString() + << endl; } else { @@ -371,8 +374,9 @@ _autoNormalFontSize = normal; _autoHeadingFontSize = heading; - y2milestone( "Selecting auto fonts - normal: %d, heading: %d (bold)", - _autoNormalFontSize, _autoHeadingFontSize ); + yuiMilestone() << "Selecting auto fonts - normal: " << _autoNormalFontSize + << ", heading: " << _autoHeadingFontSize << " (bold)" + << endl; } Modified: trunk/qt/src/YQBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQBarGraph.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQBarGraph.cc (original) +++ trunk/qt/src/YQBarGraph.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include <algorithm> #include @@ -35,6 +35,7 @@ #define YQBarGraphMinWidth 80 #define YQBarGraphMinHeight 30 +using std::max; YQBarGraph::YQBarGraph( YWidget * parent ) Modified: trunk/qt/src/YQBusyIndicator.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQBusyIndicator.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQBusyIndicator.cc (original) +++ trunk/qt/src/YQBusyIndicator.cc Thu Jan 24 16:27:54 2008 @@ -26,8 +26,8 @@ #include <QPainter> -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" using std::max; @@ -95,9 +95,9 @@ QPainter painter(this); QLinearGradient gradient(0, 0, width()-1, 0); - gradient.setColorAt(min(_position - STEP_SIZE, 0.0), background ); + gradient.setColorAt( std::min(_position - STEP_SIZE, 0.0), background ); gradient.setColorAt(_position, foreground ); - gradient.setColorAt(max(_position + STEP_SIZE, 1.0), background ); + gradient.setColorAt( std::max(_position + STEP_SIZE, 1.0), background ); painter.setBrush(gradient); painter.setPen(Qt::NoPen); Modified: trunk/qt/src/YQCheckBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQCheckBox.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQCheckBox.cc (original) +++ trunk/qt/src/YQCheckBox.cc Thu Jan 24 16:27:54 2008 @@ -19,8 +19,8 @@ #include #include <QBoxLayout> -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "utf8.h" #include "YQApplication.h" @@ -142,7 +142,7 @@ void YQCheckBox::stateChanged( int newState ) { - // y2milestone( "new state: %d", newState ); + // yuiMilestone() << "new state: " << newState << endl; if ( notify() ) YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ValueChanged ) ); Modified: trunk/qt/src/YQCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQCheckBoxFrame.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQCheckBoxFrame.cc (original) +++ trunk/qt/src/YQCheckBoxFrame.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include #include <QDebug> #include <QVBoxLayout> @@ -136,7 +136,7 @@ // Reimplemented to prevent the parent class disabling child widgets // according to its default policy. - // y2debug( "ChildEvent" ); + // yuiDebug() << "ChildEvent" << endl; } Modified: trunk/qt/src/YQComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQComboBox.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQComboBox.cc (original) +++ trunk/qt/src/YQComboBox.cc Thu Jan 24 16:27:54 2008 @@ -24,8 +24,8 @@ #include #include #include -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "utf8.h" #include "YQUI.h" @@ -104,8 +104,7 @@ } else { - y2error( "%s \"%s\": Rejecting invalid value \"%s\"", - widgetClass(), debugLabel().c_str(), newValue.c_str() ); + yuiError() << this << ": Rejecting invalid value \"" << newValue << "\"" << endl; } } @@ -121,7 +120,7 @@ icon = QIcon( iconName.c_str() ); if ( icon.isNull() ) - y2warning( "Can't load icon %s", iconName.c_str() ); + yuiWarning() << "Can't load icon \"" << iconName << "\"" << endl; } if ( icon.isNull() ) @@ -157,8 +156,7 @@ { if ( ! _qt_comboBox->isEditable() ) { - y2warning( "Setting ValidChars is useless on a combo box that isn't editable! (%s)", - debugLabel().c_str() ); + yuiWarning() << this << ": Setting ValidChars is useless on a combo box that isn't editable! (%s)" << endl; return; } @@ -177,10 +175,9 @@ if ( ! isValidText( _qt_comboBox->currentText() ) ) { - y2error( "Old value \"%s\" of %s \"%s\" invalid according to ValidChars \"%s\" - deleting", - qPrintable(_qt_comboBox->currentText()), - widgetClass(), debugLabel().c_str(), - newValidChars.c_str() ); + yuiError() << this << ": Old value \"" << _qt_comboBox->currentText() + << " \" invalid according to new ValidChars \""<< newValidChars << "\" - deleting" + << endl; _qt_comboBox->setItemText(_qt_comboBox->currentIndex(), ""); } Modified: trunk/qt/src/YQDateField.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDateField.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQDateField.cc (original) +++ trunk/qt/src/YQDateField.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include #include <QVBoxLayout> Modified: trunk/qt/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDialog.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQDialog.cc (original) +++ trunk/qt/src/YQDialog.cc Thu Jan 24 16:27:54 2008 @@ -19,8 +19,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include #include #include <QDesktopWidget> @@ -111,7 +111,7 @@ if ( dialogType == YMainDialog && YQMainWinDock::mainWinDock()->couldDock() ) { - y2debug( "Adding dialog to mainWinDock" ); + yuiDebug() << "Adding dialog to mainWinDock" << endl; parent = YQMainWinDock::mainWinDock(); } @@ -140,8 +140,10 @@ if ( preferredWidth > screenWidth ) { - y2warning( "Limiting dialog width to screen width (%d) instead of %d - check the layout!", - screenWidth, preferredWidth ); + yuiWarning() << "Limiting dialog width to screen width (" << screenWidth + << ") instead of " << preferredWidth + << " - check the layout!" + << endl; } return preferredWidth; @@ -169,8 +171,10 @@ if ( preferredHeight > screenHeight ) { - y2warning( "Limiting dialog height to screen height (%d) instead of %d - check the layout!", - screenHeight, preferredHeight ); + yuiWarning() << "Limiting dialog height to screen height (" << screenHeight + << ") instead of " << preferredHeight + << " - check the layout!" + << endl; } return preferredHeight; @@ -188,7 +192,7 @@ void YQDialog::setSize( int newWidth, int newHeight ) { - // y2debug( "Resizing dialog to %d x %d", newWidth, newHeight ); + // yuiDebug() << "Resizing dialog to " << newWidth << " x " << newHeight << endl; if ( newWidth > qApp->desktop()->width() ) newWidth = qApp->desktop()->width(); @@ -221,7 +225,7 @@ { if ( event ) { - // y2debug( "Resize event: %d x %d", event->size().width(), event->size().height() ); + // yuiDebug() << "Resize event: " << event->size().width() << " x " << event->size().height() << endl; setSize ( event->size().width(), event->size().height() ); _userSize = event->size(); @@ -309,10 +313,8 @@ { if ( _defaultButton && button != _defaultButton ) { - y2error( "Too many default buttons: [%s]", - qPrintable(button->text()) ); - y2error( "Using old default button: [%s]", - qPrintable(_defaultButton->text()) ); + yuiError() << "Too many default buttons: " << button << endl; + yuiError() << "Using old default button: " << _defaultButton << endl; } else { @@ -445,8 +447,7 @@ } else { - y2error( "Too many `opt(`default) PushButtons: [%s]", - newDefaultButton->label().c_str() ); + yuiError() << "Too many `opt(`default) PushButtons: " << newDefaultButton << endl; newDefaultButton->setDefaultButton( false ); return; } @@ -457,7 +458,7 @@ if ( _defaultButton ) { _defaultButton->setDefaultButton( true ); - y2debug( "New default button: [%s]", qPrintable(_defaultButton->text()) ); + yuiDebug() << "New default button: " << _defaultButton << endl; if ( _defaultButton && ! _focusButton ) _defaultButton->showAsDefault( true ); @@ -478,7 +479,7 @@ _focusButton->isEnabled() && _focusButton->isShownAsDefault() ) { - y2debug( "Activating focus button: [%s]", qPrintable(_focusButton->text()) ); + yuiDebug() << "Activating focus button: " << _focusButton << endl; _focusButton->activate(); return true; } @@ -492,7 +493,7 @@ _defaultButton->isEnabled() && _defaultButton->isShownAsDefault() ) { - y2debug( "Activating default button: [%s]", qPrintable(_defaultButton->text()) ); + yuiDebug() << "Activating default button: " << _defaultButton << endl; _defaultButton->activate(); return true; } @@ -500,7 +501,7 @@ { if ( warn ) { - y2warning( "No default button in this dialog - ignoring [Return]" ); + yuiWarning() << "No default button in this dialog - ignoring [Return]" << endl; } } @@ -557,7 +558,7 @@ if ( YQUI::ui()->usingVisionImpairedPalette() ) { - y2milestone( "Switched to vision impaired palette" ); + yuiMilestone() << "Switched to vision impaired palette" << endl; QMessageBox::information( 0, // parent _("Color switching"), // caption _( "Switching to color palette for vision impaired users -\n" @@ -568,7 +569,7 @@ } return; } - else if ( event->key() == Qt::Key_F7 && // Shift-F7: toggle y2debug logging + else if ( event->key() == Qt::Key_F7 && // Shift-F7: toggle debug logging event->modifiers() == Qt::ShiftModifier ) { YQUI::ui()->askConfigureLogging(); @@ -593,7 +594,7 @@ { // Qt-UI special keys - all with Ctrl-Shift-Alt - y2milestone( "Caught YaST2 magic key combination" ); + yuiMilestone() << "Caught YaST2 magic key combination" << endl; if ( event->key() == Qt::Key_M ) { @@ -612,7 +613,7 @@ } else if ( event->key() == Qt::Key_X ) { - y2milestone( "Starting xterm" ); + yuiMilestone() << "Starting xterm" << endl; system( "/usr/bin/xterm &" ); return; } @@ -630,7 +631,7 @@ // handled just like the user had clicked on the `id`( `cancel ) button in // that dialog. It's up to the YCP application to handle this (if desired). - y2milestone( "Caught window manager close event - returning with YCancelEvent" ); + yuiMilestone() << "Caught window manager close event - returning with YCancelEvent" << endl; event->ignore(); YQUI::ui()->sendEvent( new YCancelEvent() ); } Modified: trunk/qt/src/YQDownloadProgress.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDownloadProgress.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQDownloadProgress.cc (original) +++ trunk/qt/src/YQDownloadProgress.cc Thu Jan 24 16:27:54 2008 @@ -19,8 +19,8 @@ #include #include -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "utf8.h" #include "YQUI.h" Modified: trunk/qt/src/YQDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDumbTab.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQDumbTab.cc (original) +++ trunk/qt/src/YQDumbTab.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include #include #include @@ -71,7 +71,7 @@ YDumbTab::addItem( item ); _tabBar->insertTab( item->index(), fromUTF8( item->label() ) ); - y2debug( "Adding tab page [%s]", item->label().c_str() ); + yuiDebug() << "Adding tab page [" << item->label() << "]" << endl; #warning YItem::setData // item->setData( tab ); @@ -121,7 +121,7 @@ { YItem * item = itemAt( index ); YUI_CHECK_PTR( item ); - y2debug( "Tab [%s] selected", item->label().c_str() ); + yuiDebug() << "Tab [" << item->label() << "] selected" << endl; YQUI::ui()->sendEvent( new YMenuEvent( item ) ); @@ -142,7 +142,7 @@ int tabBarWidth = _tabBar->sizeHint().width(); int childWidth = hasChildren() ? firstChild()->preferredWidth() : 0; - return max( tabBarWidth, childWidth ); + return std::max( tabBarWidth, childWidth ); } Modified: trunk/qt/src/YQFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQFrame.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQFrame.cc (original) +++ trunk/qt/src/YQFrame.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "YQUI.h" #include "utf8.h" #include <QDebug> Modified: trunk/qt/src/YQGenericButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQGenericButton.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQGenericButton.cc (original) +++ trunk/qt/src/YQGenericButton.cc Thu Jan 24 16:27:54 2008 @@ -20,11 +20,10 @@ #include #include #include -//Added by qt3to4: #include #include -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "utf8.h" #include "YQUI.h" @@ -109,7 +108,7 @@ { if ( ! _qPushButton ) { - y2error( "NULL button (icon %s)", iconName.c_str() ); + yuiError() << "NULL button (icon " << iconName << ")" << endl; return; } @@ -125,7 +124,7 @@ QPixmap icon( qIconName ); if ( icon.isNull() ) - y2warning( "Can't load icon '%s'", qPrintable(qIconName) ); + yuiWarning() << "Can't load icon \"" << qIconName << "\"" << endl; else _qPushButton->setIcon( icon ); } @@ -136,7 +135,7 @@ if ( _qPushButton ) _qPushButton->setText( label ); else - y2error( "NULL button '%s'", qPrintable(label) ); + yuiError() << "NULL button \"" << label << "\"" << endl; YPushButton::setLabel( toUTF8( label ) ); } @@ -147,7 +146,7 @@ if ( _qPushButton ) _qPushButton->setText( fromUTF8( label ) ); else - y2error( "NULL button '%s'", label.c_str() ); + yuiError() << "NULL button \"" << label << "\"" << endl; YPushButton::setLabel( label ); } @@ -203,7 +202,7 @@ if ( mouseEvent && mouseEvent->button() == Qt::RightButton ) { - y2milestone( "Right click on button detected" ); + yuiMilestone() << "Right click on button detected" << endl; YQUI::ui()->maybeLeftHandedUser(); } } Modified: trunk/qt/src/YQIconPool.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQIconPool.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQIconPool.cc (original) +++ trunk/qt/src/YQIconPool.cc Thu Jan 24 16:27:54 2008 @@ -16,8 +16,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "YQIconPool.h" Modified: trunk/qt/src/YQImage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQImage.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQImage.cc (original) +++ trunk/qt/src/YQImage.cc Thu Jan 24 16:27:54 2008 @@ -20,11 +20,10 @@ #include #include #include -#include <QIcon> -//Added by qt3to4: #include -#define y2log_component "qt-ui" -#include +#include <QIcon> +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "utf8.h" #include "YQImage.h" @@ -65,11 +64,11 @@ if ( movie.isValid() ) { - y2error( "Couldn't load animation from %s", imageFileName().c_str() ); + yuiError() << "Couldn't load animation from " << imageFileName() << endl; } else { - y2debug( "Loading animation from %s", imageFileName().c_str() ); + yuiDebug() << "Loading animation from " << imageFileName() << endl; QLabel::setMovie( &movie ); } } @@ -79,7 +78,7 @@ if ( pixmap.isNull() ) { - y2error( "Couldn't load pixmap from %s", imageFileName().c_str() ); + yuiError() << "Couldn't load pixmap from " << imageFileName() << endl; } else { @@ -94,10 +93,9 @@ _pixmapHeight = pixmap.size().height(); } - y2debug( "Loading image from %s (%d x %d)", - imageFileName().c_str(), - pixmap.size().width(), - pixmap.size().height() ); + yuiDebug() << "Loading image from " << imageFileName() + << " (" << pixmap.size().width() << " x " << pixmap.size().height() << ")" + << endl; QLabel::setPixmap( pixmap ); } Modified: trunk/qt/src/YQInputField.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQInputField.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQInputField.cc (original) +++ trunk/qt/src/YQInputField.cc Thu Jan 24 16:27:54 2008 @@ -20,8 +20,8 @@ #include -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" using std::max; @@ -105,8 +105,7 @@ } else { - y2error( "%s \"%s\": Rejecting invalid value \"%s\"", - widgetClass(), debugLabel().c_str(), newText.c_str() ); + yuiError() << this << ": Rejecting invalid value \"" << newText << "\"" << endl; } } @@ -178,10 +177,11 @@ if ( ! isValidText( _qt_lineEdit->text() ) ) { - y2error( "Old value \"%s\" of %s \"%s\" invalid according to ValidChars \"%s\" - deleting", - qPrintable(_qt_lineEdit->text()), - widgetClass(), debugLabel().c_str(), - newValidChars.c_str() ); + yuiError() << this << ": Old value \"" << _qt_lineEdit->text() + << "\" invalid according to new ValidChars \"" << newValidChars + << "\" - deleting" + << endl; + _qt_lineEdit->setText( "" ); } @@ -212,7 +212,7 @@ void YQInputField::displayCapsLockWarning() { - y2milestone( "warning" ); + yuiMilestone() << "warning" << endl; if ( _displayingCapsLockWarning ) return; @@ -236,7 +236,7 @@ void YQInputField::clearCapsLockWarning() { - y2milestone( "warning off " ); + yuiMilestone() << "warning off " << endl; if ( ! _displayingCapsLockWarning ) return; @@ -279,12 +279,12 @@ if ( key == XK_Caps_Lock || key == XK_Shift_Lock ) { - y2milestone( "CapsLock released" ); + yuiMilestone() << "CapsLock released" << endl; _capsLockActive = false; } } - y2debug( "Key event; caps lock: %s", _capsLockActive ? "on" : "off" ); + yuiDebug() << "Key event; caps lock: " << _capsLockActive << endl; break; case ButtonPress: @@ -308,7 +308,7 @@ if ( oldCapsLockActive != _capsLockActive ) { - y2milestone( "Emitting warning" ); + yuiMilestone() << "Emitting warning" << endl; if ( _capsLockActive ) emit capsLockActivated(); Modified: trunk/qt/src/YQIntField.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQIntField.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQIntField.cc (original) +++ trunk/qt/src/YQIntField.cc Thu Jan 24 16:27:54 2008 @@ -19,8 +19,8 @@ #include -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "utf8.h" #include "YQUI.h" Modified: trunk/qt/src/YQLabel.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQLabel.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQLabel.cc (original) +++ trunk/qt/src/YQLabel.cc Thu Jan 24 16:27:54 2008 @@ -17,15 +17,15 @@ /-*/ -#define y2log_component "qt-ui" -#include +#include + +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "utf8.h" #include "YQUI.h" #include "YQApplication.h" #include "YQLabel.h" -//Added by qt3to4: -#include YQLabel::YQLabel( YWidget * parent, Modified: trunk/qt/src/YQLayoutBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQLayoutBox.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQLayoutBox.cc (original) +++ trunk/qt/src/YQLayoutBox.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "YQLayoutBox.h" @@ -40,7 +40,7 @@ void YQLayoutBox::setSize( int newWidth, int newHeight ) { - // y2debug( "Resizing %s to %d x %d", widgetClass(), newWidth, newHeight ); + // yuiDebug() << "Resizing " << this << " to " << newWidth << " x " << newHeight << endl; resize( newWidth, newHeight ); YLayoutBox::setSize( newWidth, newHeight ); } Modified: trunk/qt/src/YQLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQLogView.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQLogView.cc (original) +++ trunk/qt/src/YQLogView.cc Thu Jan 24 16:27:54 2008 @@ -21,8 +21,8 @@ #include #include <QVBoxLayout> #include <QScrollBar> -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" using std::max; Modified: trunk/qt/src/YQMainWinDock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMainWinDock.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQMainWinDock.cc (original) +++ trunk/qt/src/YQMainWinDock.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include <QTimer> #include <QResizeEvent> #include @@ -26,6 +26,7 @@ #include #include "YQMainWinDock.h" +#define VERBOSE_RESIZE 0 YQMainWinDock * @@ -53,8 +54,9 @@ resize( YQUI::ui()->defaultSize( YD_HORIZ ), YQUI::ui()->defaultSize( YD_VERT ) ); - y2debug( "MainWinDock initial size: %d x %d", - size().width(), size().height() ); + yuiDebug() << "MainWinDock initial size: " + << size().width() << " x " << size().height() + << endl; } @@ -84,7 +86,11 @@ if ( dialog->size() != size() ) { - // y2debug( "Resizing child dialog %p to %d x %d", dialog, size().width(), size().height() ); +#if VERBOSE_RESIZE + yuiDebug() << "Resizing child dialog " << hex << ( (void *) dialog ) << dec + << " to " << size().width() << " x " << size().height() + << endl; +#endif dialog->resize( size() ); } } @@ -116,7 +122,10 @@ dialog->raise(); dialog->show(); - y2debug( "Adding dialog %p to mainWinDock", dialog ); + yuiDebug() << "Adding dialog " << hex << (void *) dialog << dec + << " to mainWinDock" + << endl; + _widgetStack.push_back( dialog ); resizeVisibleChild(); @@ -130,7 +139,7 @@ if ( ! _widgetStack.empty() ) { QWidget * dialog = _widgetStack.back(); - y2debug( "Showing dialog %p", dialog ); + yuiDebug() << "Showing dialog " << hex << (void *) dialog << dec << endl; dialog->raise(); update(); } @@ -153,7 +162,9 @@ _widgetStack.pop_back(); - y2debug( "Removing dialog %p from mainWinDock", dialog ); + yuiDebug() << "Removing dialog " << hex << (void *) dialog << dec + <<" from mainWinDock" + << endl; } else // The less common (but more generic) case: Remove any dialog { @@ -162,8 +173,10 @@ if ( pos == _widgetStack.end() ) return; - y2warning( "Found dialog somewhere in the middle of the widget stack" ); - y2debug( "Removing dialog %p from mainWinDock", dialog ); + yuiWarning() << "Found dialog somewhere in the middle of the widget stack" << endl; + yuiDebug() << "Removing dialog " << hex << (void *) dialog << dec + << " from mainWinDock" + << endl; _widgetStack.erase( pos ); } @@ -228,7 +241,7 @@ // handled just like the user had clicked on the `id`( `cancel ) button in // that dialog. It's up to the YCP application to handle this (if desired). - y2milestone( "Caught window manager close event - returning with YCancelEvent" ); + yuiMilestone() << "Caught window manager close event - returning with YCancelEvent" << endl; event->ignore(); YQUI::ui()->sendEvent( new YCancelEvent() ); } Modified: trunk/qt/src/YQMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMenuButton.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQMenuButton.cc (original) +++ trunk/qt/src/YQMenuButton.cc Thu Jan 24 16:27:54 2008 @@ -21,8 +21,8 @@ #include <QMenu> #include #include -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "utf8.h" #include "YQUI.h" @@ -106,7 +106,7 @@ icon = QPixmap( iconName.c_str() ); if ( icon.isNull() ) - y2warning( "Can't load icon %s", iconName.c_str() ); + yuiWarning() << "Can't load icon " << iconName << endl; } if ( item->hasChildren() ) @@ -147,7 +147,7 @@ if ( _serials.contains( action ) ) serialNo = _serials[action]; - // y2debug( "Selected menu entry #%d", menu_item_index ); + // yuiDebug() << "Selected menu entry #" << menu_item_index << endl; _selectedItem = findMenuItem( serialNo ); if ( _selectedItem ) @@ -167,7 +167,7 @@ } else { - y2error( "No menu item with serial no. %d", serialNo ); + yuiError() << "No menu item with serial no. " << serialNo << endl; } } Modified: trunk/qt/src/YQMultiLineEdit.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMultiLineEdit.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQMultiLineEdit.cc (original) +++ trunk/qt/src/YQMultiLineEdit.cc Thu Jan 24 16:27:54 2008 @@ -20,8 +20,8 @@ #include <QVBoxLayout> #include <QTextEdit> #include -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" using std::max; Modified: trunk/qt/src/YQMultiProgressMeter.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMultiProgressMeter.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQMultiProgressMeter.cc (original) +++ trunk/qt/src/YQMultiProgressMeter.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include #include <QPointF> @@ -125,7 +125,7 @@ if ( totalSum == 0.0 ) { - y2error( "Avoiding division by zero: totalSum" ); + yuiError() << "Avoiding division by zero: totalSum" << endl; return; } @@ -154,7 +154,7 @@ if ( restSum == 0.0 ) { - y2error( "Avoiding division by zero: restSum" ); + yuiError() << "Avoiding division by zero: restSum" << endl; return; } @@ -204,7 +204,7 @@ { // Easter egg: Switch between rectangular and triangular shape - y2milestone( "Switching shape" ); + yuiMilestone() << "Switching shape" << endl; setTriangularShaped( ! triangularShaped() ); setSize( vertical() ? preferredWidth() : width(), horizontal() ? preferredHeight() : height() ); @@ -236,7 +236,7 @@ if ( maxValue( segment ) == 0.0 ) { - y2error( "Avoiding division by zero: maxValue[%d]", segment ); + yuiError() << "Avoiding division by zero: maxValue[" << segment << "]" << endl; return; } Modified: trunk/qt/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMultiSelectionBox.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQMultiSelectionBox.cc (original) +++ trunk/qt/src/YQMultiSelectionBox.cc Thu Jan 24 16:27:54 2008 @@ -22,8 +22,8 @@ #include <QVBoxLayout> #include <QHeaderView> #include <QDebug> -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" using std::max; Modified: trunk/qt/src/YQPackageSelectorPlugin.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQPackageSelectorPlugin.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQPackageSelectorPlugin.cc (original) +++ trunk/qt/src/YQPackageSelectorPlugin.cc Thu Jan 24 16:27:54 2008 @@ -19,8 +19,8 @@ /-*/ #include "YQPackageSelectorPlugin.h" -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "pkg/YQPackageSelector.h" #include "pkg/YQPatternSelector.h" #include "pkg/YQSimplePatchSelector.h" @@ -34,8 +34,9 @@ { if ( success() ) { - y2milestone( "Loaded %s plugin successfully from %s", - PLUGIN_BASE_NAME, pluginLibFullPath().c_str() ); + yuiMilestone() << "Loaded " << PLUGIN_BASE_NAME + << " plugin successfully from " << pluginLibFullPath() + << endl; } else YUI_THROW( YUIPluginException( PLUGIN_BASE_NAME ) ); @@ -62,13 +63,13 @@ } catch (const std::exception & e) { - y2error( "Caught std::exception: %s", e.what() ); - y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); + yuiError() << "Caught std::exception: %s" << e.what() << endl; + yuiError() << "This is a libzypp problem. Do not file a bug against the UI!" << endl; } catch (...) { - y2error( "Caught unspecified exception." ); - y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); + yuiError() << "Caught unspecified exception." << endl; + yuiError() << "This is a libzypp problem. Do not file a bug against the UI!" << endl; } YUI_CHECK_NEW( packageSelector ); @@ -91,13 +92,13 @@ } catch (const std::exception & e) { - y2error( "Caught std::exception: %s", e.what() ); - y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); + yuiError() << "Caught std::exception: %s" << e.what() << endl; + yuiError() << "This is a libzypp problem. Do not file a bug against the UI!" << endl; } catch (...) { - y2error( "Caught unspecified exception." ); - y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); + yuiError() << "Caught unspecified exception." << endl; + yuiError() << "This is a libzypp problem. Do not file a bug against the UI!" << endl; } YUI_CHECK_NEW( patternSelector ); @@ -120,13 +121,13 @@ } catch (const std::exception & e) { - y2error( "Caught std::exception: %s", e.what() ); - y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); + yuiError() << "Caught std::exception: %s" << e.what() << endl; + yuiError() << "This is a libzypp problem. Do not file a bug against the UI!" << endl; } catch (...) { - y2error( "Caught unspecified exception." ); - y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); + yuiError() << "Caught unspecified exception." << endl; + yuiError() << "This is a libzypp problem. Do not file a bug against the UI!" << endl; } YUI_CHECK_NEW( simplePatchSelector ); Modified: trunk/qt/src/YQPartitionSplitter.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQPartitionSplitter.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQPartitionSplitter.cc (original) +++ trunk/qt/src/YQPartitionSplitter.cc Thu Jan 24 16:27:54 2008 @@ -16,8 +16,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "utf8.h" #include "YQUI.h" Modified: trunk/qt/src/YQProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQProgressBar.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQProgressBar.cc (original) +++ trunk/qt/src/YQProgressBar.cc Thu Jan 24 16:27:54 2008 @@ -21,8 +21,8 @@ #include <QVBoxLayout> #include -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" using std::max; Modified: trunk/qt/src/YQRadioButtonGroup.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQRadioButtonGroup.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQRadioButtonGroup.cc (original) +++ trunk/qt/src/YQRadioButtonGroup.cc Thu Jan 24 16:27:54 2008 @@ -18,8 +18,8 @@ #include <QRadioButton> -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "YQRadioButtonGroup.h" #include "YQRadioButton.h" Modified: trunk/qt/src/YQReplacePoint.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQReplacePoint.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQReplacePoint.cc (original) +++ trunk/qt/src/YQReplacePoint.cc Thu Jan 24 16:27:54 2008 @@ -18,8 +18,8 @@ #include -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "YQReplacePoint.h" Modified: trunk/qt/src/YQSlider.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQSlider.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQSlider.cc (original) +++ trunk/qt/src/YQSlider.cc Thu Jan 24 16:27:54 2008 @@ -21,8 +21,8 @@ #include <QLabel> #include <QVBoxLayout> -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "utf8.h" #include "YQUI.h" @@ -160,7 +160,7 @@ int hintWidth = !_caption->isHidden() ? _caption->sizeHint().width() : 0; // Arbitrary value - there is no really good default - return max( 200, hintWidth ); + return std::max( 200, hintWidth ); } Modified: trunk/qt/src/YQTimeField.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTimeField.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQTimeField.cc (original) +++ trunk/qt/src/YQTimeField.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include Modified: trunk/qt/src/YQTimezoneSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTimezoneSelector.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQTimezoneSelector.cc (original) +++ trunk/qt/src/YQTimezoneSelector.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include #include Modified: trunk/qt/src/YQWidgetCaption.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWidgetCaption.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQWidgetCaption.cc (original) +++ trunk/qt/src/YQWidgetCaption.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "YQWidgetCaption.h" #include "utf8.h" Modified: trunk/qt/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWidgetFactory.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQWidgetFactory.cc (original) +++ trunk/qt/src/YQWidgetFactory.cc Thu Jan 24 16:27:54 2008 @@ -17,8 +17,8 @@ /-*/ #include <QColorGroup> -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "YQWidgetFactory.h" #include "YQUI.h" Modified: trunk/qt/src/YQWizardButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizardButton.cc?rev=43895&r1=43894&r2=43895&view=diff ============================================================================== --- trunk/qt/src/YQWizardButton.cc (original) +++ trunk/qt/src/YQWizardButton.cc Thu Jan 24 16:27:54 2008 @@ -19,8 +19,8 @@ #include #include -#define y2log_component "qt-ui" -#include +#define YUILogComponent "qt-ui" +#include "YUILog.h" #include "utf8.h" #include "YQUI.h" -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org