[yast-commit] r43911 - in /trunk/qt: ./ src/ src/pkg/

Author: sh-sh-sh Date: Fri Jan 25 15:51:12 2008 New Revision: 43911 URL: http://svn.opensuse.org/viewcvs/yast?rev=43911&view=rev Log: migrated to YCP-less logging Modified: trunk/qt/src/QY2Settings.cc trunk/qt/src/YQImage.cc trunk/qt/src/YQUI_builtins.cc trunk/qt/src/YQWizard.cc trunk/qt/src/pkg/YQPackageSelector.cc trunk/qt/src/pkg/YQPackageSelectorBase.cc trunk/qt/src/pkg/YQPackageSelectorHelp.cc trunk/qt/src/pkg/YQPatternSelector.cc trunk/qt/src/pkg/YQPkgChangeLogView.cc trunk/qt/src/pkg/YQPkgChangesDialog.cc trunk/qt/src/pkg/YQPkgConflictDialog.cc trunk/qt/src/pkg/YQPkgConflictList.cc trunk/qt/src/pkg/YQPkgDependenciesView.cc trunk/qt/src/pkg/YQPkgDescriptionDialog.cc trunk/qt/src/pkg/YQPkgDescriptionView.cc trunk/qt/src/pkg/YQPkgDiskUsageList.cc trunk/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc trunk/qt/src/pkg/YQPkgFileListView.cc trunk/qt/src/pkg/YQPkgGenericDetailsView.cc trunk/qt/src/pkg/YQPkgLangList.cc trunk/qt/src/pkg/YQPkgList.cc trunk/qt/src/pkg/YQPkgObjList.cc trunk/qt/src/pkg/YQPkgPatchFilterView.cc trunk/qt/src/pkg/YQPkgPatchList.cc trunk/qt/src/pkg/YQPkgPatternList.cc trunk/qt/src/pkg/YQPkgProductDialog.cc trunk/qt/src/pkg/YQPkgProductList.cc trunk/qt/src/pkg/YQPkgRepoFilterView.cc trunk/qt/src/pkg/YQPkgRepoList.cc trunk/qt/src/pkg/YQPkgRpmGroupTagsFilterView.cc trunk/qt/src/pkg/YQPkgSearchFilterView.cc trunk/qt/src/pkg/YQPkgSelDescriptionView.cc trunk/qt/src/pkg/YQPkgSelList.cc trunk/qt/src/pkg/YQPkgSelMapper.cc trunk/qt/src/pkg/YQPkgStatusFilterView.cc trunk/qt/src/pkg/YQPkgTechnicalDetailsView.cc trunk/qt/src/pkg/YQPkgTextDialog.cc trunk/qt/src/pkg/YQPkgUpdateProblemFilterView.cc trunk/qt/src/pkg/YQPkgVersionsView.cc trunk/qt/src/pkg/YQSimplePatchSelector.cc trunk/qt/yast2-qt.spec.in Modified: trunk/qt/src/QY2Settings.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2Settings.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/QY2Settings.cc (original) +++ trunk/qt/src/QY2Settings.cc Fri Jan 25 15:51:12 2008 @@ -154,8 +154,8 @@ if ( ! file.open( QIODevice::ReadOnly ) ) { - cerr << "Can't load settings from " << qPrintable(_fileName) - << ": " << qPrintable(file.errorString()) + cerr << "Can't load settings from " << qPrintable( _fileName ) + << ": " << qPrintable( file.errorString() ) << endl; _readError = true; @@ -205,13 +205,12 @@ value.replace( QRegExp( "\"$" ), "" ); // strip trailing " value.replace( "\\\"", "\"" ); // un-escape " - // qDebug( "Read %s=%s", (const char *) key, (const char *) value ); set( key, value ); } else { qWarning( "%s:%d: Syntax error: %s", - qPrintable( _fileName), lineCount, qPrintable(line) ); + qPrintable( _fileName ), lineCount, qPrintable( line ) ); } } @@ -230,8 +229,8 @@ if ( ! file.open( QIODevice::WriteOnly ) ) { - cerr << "Can't save settings to " << qPrintable(_fileName) - << ": " << qPrintable(file.errorString()) + cerr << "Can't save settings to " << qPrintable( _fileName ) + << ": " << qPrintable( file.errorString() ) << endl; return false; Modified: trunk/qt/src/YQImage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQImage.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/YQImage.cc (original) +++ trunk/qt/src/YQImage.cc Fri Jan 25 15:51:12 2008 @@ -166,15 +166,19 @@ void YQImage::setEnabled( bool enable ) { - qDebug("setEnabled %d", enable); - if (enable) - setImage( imageFileName(), animated() ); - else { - // Trigger image re-display - QPixmap pixmap( fromUTF8( imageFileName() ) ); - QIcon icon(pixmap); - QLabel::setPixmap( icon.pixmap( pixmap.size(), QIcon::Disabled, QIcon::Off) ); - } + yuiDebug() << "setEnabled: " << enable << endl; + + if (enable) + { + setImage( imageFileName(), animated() ); + } + else + { + // Trigger image re-display + QPixmap pixmap( fromUTF8( imageFileName() ) ); + QIcon icon(pixmap); + QLabel::setPixmap( icon.pixmap( pixmap.size(), QIcon::Disabled, QIcon::Off) ); + } } #include "YQImage.moc" Modified: trunk/qt/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI_builtins.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/YQUI_builtins.cc (original) +++ trunk/qt/src/YQUI_builtins.cc Fri Jan 25 15:51:12 2008 @@ -215,7 +215,7 @@ { saveLogsCommand += " '" + fileName + "'"; yuiMilestone() << "Saving y2logs: " << saveLogsCommand << endl; - int result = system( qPrintable( saveLogsCommand) ); + int result = system( qPrintable( saveLogsCommand ) ); if ( result != 0 ) { Modified: trunk/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/YQWizard.cc (original) +++ trunk/qt/src/YQWizard.cc Fri Jan 25 15:51:12 2008 @@ -278,7 +278,8 @@ if ( ! _stepsPanel ) return; - qDebug( "updateSteps" ); + yuiDebug() << "updateSteps" << endl; + // Create a grid layout for the steps delete _stepsPanel->layout(); QVBoxLayout *_stepsVBox = new QVBoxLayout( _stepsPanel ); @@ -313,7 +314,7 @@ // Heading // - qDebug( "%p - add Stepheading %s", this, qPrintable( step->name() ) ); + yuiDebug() << this << ": add StepHeading " << step->name() << endl; QLabel * label = new QLabel( step->name(), _stepsPanel ); YUI_CHECK_NEW( label ); label->setObjectName( step->name() ); @@ -331,7 +332,8 @@ // Step status // - qDebug( "%p - add Step %s", this, qPrintable( step->name() ) ); + yuiDebug() << this << ": add Step " << step->name() << endl; + QLabel * statusLabel = new QLabel( _stepsPanel ); YUI_CHECK_NEW( statusLabel ); @@ -368,7 +370,8 @@ void YQWizard::updateStepStates() { - qDebug( "updateStepStates %d", _stepsDirty ); + yuiDebug() << "steps dirty: " << _stepsDirty << endl; + if ( _stepsDirty ) updateSteps(); @@ -409,7 +412,8 @@ void YQWizard::setCurrentStep( const string & id ) { - qDebug( "setCurrentStep %s", id.c_str() ); + yuiDebug() << "Setting current step to " << id << endl; + _currentStepID = fromUTF8( id ); updateStepStates(); } @@ -417,7 +421,8 @@ void YQWizard::deleteSteps() { - qDebug( "deleteSteps" ); + yuiDebug() << "Deleting steps" << endl; + qDeleteAll(_stepsList); _stepsList.clear(); _stepsIDs.clear(); Modified: trunk/qt/src/pkg/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPackageSelector.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPackageSelector.cc (original) +++ trunk/qt/src/pkg/YQPackageSelector.cc Fri Jan 25 15:51:12 2008 @@ -46,8 +46,8 @@ #include <QTimer> #include <QMenu> -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include "QY2LayoutUtils.h" @@ -130,8 +130,8 @@ _excludeDebugInfoPkgs = 0; - if ( onlineUpdateMode() ) y2milestone( "Online update mode" ); - if ( updateMode() ) y2milestone( "Update mode" ); + if ( onlineUpdateMode() ) yuiMilestone() << "Online update mode" << endl; + if ( updateMode() ) yuiMilestone() << "Update mode" << endl; basicLayout(); @@ -159,7 +159,7 @@ } else if ( _searchFilterView ) { - y2milestone( "No multiple repositories - falling back to search mode" ); + yuiMilestone() << "No multiple repositories - falling back to search mode" << endl; _filters->showPage( _searchFilterView ); _searchFilterView->filter(); QTimer::singleShot( 0, _searchFilterView, SLOT( setFocus() ) ); @@ -197,7 +197,7 @@ if ( _diskUsageList ) _diskUsageList->updateDiskUsage(); - y2milestone( "PackageSelector init done" ); + yuiMilestone() << "PackageSelector init done" << endl; #if CHECK_DEPENDENCIES_ON_STARTUP @@ -1018,7 +1018,7 @@ { if ( ! _pkgConflictDialog ) { - y2error( "No package conflict dialog existing" ); + yuiError() << "No package conflict dialog existing" << endl; return QDialog::Accepted; } @@ -1062,7 +1062,7 @@ { if ( ! _patchFilterView ) { - y2milestone( "Activating patches filter view" ); + yuiMilestone() << "Activating patches filter view" << endl; addPatchFilterView(); connectPatchList(); @@ -1132,11 +1132,11 @@ exportFile.exceptions( std::ios_base::badbit | std::ios_base::failbit ); exportFile << writer; - y2milestone( "Package list exported to %s", qPrintable(filename) ); + yuiMilestone() << "Package list exported to " << filename << endl; } catch ( std::exception & exception ) { - y2warning( "Error exporting package list to %s", qPrintable(filename) ); + yuiWarning() << "Error exporting package list to " << filename << endl; // The export might have left over a partially written file. // Try to delete it. Don't care if it doesn't exist and unlink() fails. @@ -1163,7 +1163,7 @@ if ( ! filename.isEmpty() ) { - y2milestone( "Importing package list from %s", qPrintable(filename) ); + yuiMilestone() << "Importing package list from " << filename << endl; try { @@ -1190,10 +1190,10 @@ else if ( kind == "pattern" ) importPatterns.insert( ImportMapPair( it->name(), *it ) ); } - y2debug( "Found %zu packages and %zu patterns in %s", - importPkg.size(), - importPatterns.size(), - qPrintable(filename) ); + yuiDebug() << "Found " << importPkg.size() + <<" packages and " << importPatterns.size() + << " patterns in " << filename + << endl; // @@ -1234,7 +1234,7 @@ } catch ( const zypp::Exception & exception ) { - y2warning( "Error reading package list from %s", qPrintable(filename) ); + yuiWarning() << "Error reading package list from " << filename << endl; // Post error popup QMessageBox::warning( this, // parent @@ -1276,7 +1276,7 @@ case S_Del: case S_AutoDel: newStatus = S_KeepInstalled; - y2debug( "Keeping %s %s", kind, selectable->name().c_str() ); + yuiDebug() << "Keeping " << kind << " " << selectable->name() << endl; break; case S_NoInst: @@ -1285,12 +1285,12 @@ if ( selectable->hasCandidateObj() ) { newStatus = S_Install; - y2debug( "Adding %s %s", kind, selectable->name().c_str() ); + yuiDebug() << "Adding " << kind << " " << selectable->name() << endl; } else { - y2debug( "Can't add %s %s: No candidate", - kind, selectable->name().c_str() ); + yuiDebug() << "Can't add " << kind << " " << selectable->name() + << ": No candidate" << endl; } break; } @@ -1310,7 +1310,7 @@ case S_Update: case S_AutoUpdate: newStatus = S_Del; - y2debug( "Deleting %s %s", kind, selectable->name().c_str() ); + yuiDebug() << "Deleting " << kind << " " << selectable->name() << endl; break; case S_Del: @@ -1335,7 +1335,7 @@ int count = _pkgList->globalSetPkgStatus( S_Update, force, true ); // countOnly - y2milestone( "%d pkgs found for update", count ); + yuiMilestone() << count << " pkgs found for update" << endl; if ( count >= GLOBAL_UPDATE_CONFIRMATION_THRESHOLD ) { @@ -1424,7 +1424,7 @@ { subPkgs[ name ] = *it; - y2debug( "Found subpackage: %s", qPrintable(name) ); + yuiDebug() << "Found subpackage: " << name << endl; } } @@ -1450,7 +1450,7 @@ case S_Taboo: case S_Del: // Don't install the subpackage - y2milestone( "Ignoring unwanted subpackage %s", qPrintable(subPkgName) ); + yuiMilestone() << "Ignoring unwanted subpackage " << subPkgName << endl; break; case S_AutoInstall: @@ -1462,7 +1462,7 @@ if ( ! subPkg->installedObj() ) { subPkg->set_status( S_Install ); - y2milestone( "Installing subpackage %s", qPrintable(subPkgName) ); + yuiMilestone() << "Installing subpackage " << subPkgName << endl; } break; @@ -1475,12 +1475,12 @@ if ( ! subPkg->installedObj() ) { subPkg->set_status( S_Install ); - y2milestone( "Installing subpackage %s", qPrintable(subPkgName) ); + yuiMilestone() << "Installing subpackage " << subPkgName << endl; } else { subPkg->set_status( S_Update ); - y2milestone( "Updating subpackage %s", qPrintable(subPkgName) ); + yuiMilestone() << "Updating subpackage " << subPkgName << endl; } break; Modified: trunk/qt/src/pkg/YQPackageSelectorBase.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPackageSelectorBase.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPackageSelectorBase.cc (original) +++ trunk/qt/src/pkg/YQPackageSelectorBase.cc Fri Jan 25 15:51:12 2008 @@ -21,8 +21,8 @@ #include <QMessageBox> #include <QKeyEvent> -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QAction> #include <QVBoxLayout> @@ -89,13 +89,13 @@ // Install event handler to handle WM_CLOSE like "Cancel" topLevelWidget()->installEventFilter( this ); - y2milestone( "PackageSelectorBase init done" ); + yuiMilestone() << "PackageSelectorBase init done" << endl; } YQPackageSelectorBase::~YQPackageSelectorBase() { - y2milestone( "Destroying PackageSelector" ); + yuiMilestone() << "Destroying PackageSelector" << endl; } @@ -104,7 +104,7 @@ { if ( ! _pkgConflictDialog ) { - y2error( "No package conflict dialog existing" ); + yuiError() << "No package conflict dialog existing" << endl; return QDialog::Accepted; } @@ -126,7 +126,7 @@ { if ( ! _pkgConflictDialog ) { - y2error( "No package conflict dialog existing" ); + yuiError() << "No package conflict dialog existing" << endl; return QDialog::Accepted; } @@ -212,19 +212,19 @@ if ( changes ) { if ( zyppPool().diffStatezypp::Package() ) - y2milestone( "diffState() reports changed packages" ); + yuiMilestone() << "diffState() reports changed packages" << endl; if ( zyppPool().diffStatezypp::Pattern() ) - y2milestone( "diffState() reports changed patterns" ); + yuiMilestone() << "diffState() reports changed patterns" << endl; if ( zyppPool().diffStatezypp::Selection() ) - y2milestone( "diffState() reports changed selections" ); + yuiMilestone() << "diffState() reports changed selections" << endl; if ( zyppPool().diffStatezypp::Language() ) - y2milestone( "diffState() reports changed languages" ); + yuiMilestone() << "diffState() reports changed languages" << endl; if ( zyppPool().diffStatezypp::Patch() ) - y2milestone( "diffState() reports changed patches" ); + yuiMilestone() << "diffState() reports changed patches" << endl; } if ( ! changes || @@ -242,7 +242,7 @@ zyppPool().restoreState(); zyppPool().restoreState(); - y2milestone( "Closing PackageSelector with \"Cancel\"" ); + yuiMilestone() << "Closing PackageSelector with \"Cancel\"" << endl; YQUI::ui()->sendEvent( new YCancelEvent() ); } } @@ -286,7 +286,7 @@ if ( checkDiskUsage() == QDialog::Rejected ) return; - y2milestone( "Closing PackageSelector with \"Accept\"" ); + yuiMilestone() << "Closing PackageSelector with \"Accept\"" << endl; YQUI::ui()->sendEvent( new YMenuEvent( YCPSymbol( "accept" ) ) ); } @@ -294,7 +294,7 @@ bool YQPackageSelectorBase::showPendingLicenseAgreements() { - y2milestone( "Showing all pending license agreements" ); + yuiMilestone() << "Showing all pending license agreements" << endl; bool allConfirmed = true; @@ -329,16 +329,17 @@ if ( ! licenseText.empty() ) { - y2milestone( "Resolvable %s has a license agreement", sel->name().c_str() ); + yuiMilestone() << "Resolvable " << sel->name() << " has a license agreement" << endl; if( ! sel->hasLicenceConfirmed() ) { - y2debug( "Showing license agreement for resolvable %s", sel->name().c_str() ); + yuiDebug() << "Showing license agreement for resolvable " << sel->name() << endl; allConfirmed = YQPkgObjListItem::showLicenseAgreement( sel ) && allConfirmed; } else { - y2milestone( "Resolvable %s's license is already confirmed", sel->name().c_str() ); + yuiMilestone() << "Resolvable " << sel->name() + << "'s license is already confirmed" << endl; } } } Modified: trunk/qt/src/pkg/YQPackageSelectorHelp.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPackageSelectorHelp.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPackageSelectorHelp.cc (original) +++ trunk/qt/src/pkg/YQPackageSelectorHelp.cc Fri Jan 25 15:51:12 2008 @@ -21,8 +21,8 @@ #include -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include "YQPackageSelector.h" #include "YQPkgTextDialog.h" Modified: trunk/qt/src/pkg/YQPatternSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPatternSelector.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPatternSelector.cc (original) +++ trunk/qt/src/pkg/YQPatternSelector.cc Fri Jan 25 15:51:12 2008 @@ -24,8 +24,8 @@ #include <QPushButton> #include <QSplitter> -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include "QY2LayoutUtils.h" @@ -77,7 +77,7 @@ if ( zyppPool().empty() && zyppPool().emptyzypp::Selection() ) { - y2warning( "Neither patterns nor selections in ZyppPool" ); + yuiWarning() << "Neither patterns nor selections in ZyppPool" << endl; } @@ -163,7 +163,7 @@ * looks better than a lot of grey empty space. **/ - y2warning( "No patterns in ZyppPool - using selections instead" ); + yuiWarning() << "No patterns in ZyppPool - using selections instead" << endl; _selList = new YQPkgSelList( vbox, false, // no autoFill - need to connect to details view first false ); // no autoFilter - filterMatch() is not connected @@ -342,7 +342,7 @@ } } - y2milestone( "Connection set up" ); + yuiMilestone() << "Connection set up" << endl; if ( _wizard ) @@ -362,7 +362,7 @@ void YQPatternSelector::detailedPackageSelection() { - y2milestone( "\"Details..\" button clicked" ); + yuiMilestone() << "\"Details..\" button clicked" << endl; YQUI::ui()->sendEvent( new YMenuEvent( YCPSymbol( "details" ) ) ); } @@ -370,7 +370,7 @@ void YQPatternSelector::debugTrace() { - y2warning( "debugTrace" ); + yuiWarning() << "debugTrace" << endl; } Modified: trunk/qt/src/pkg/YQPkgChangeLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgChangeLogView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgChangeLogView.cc (original) +++ trunk/qt/src/pkg/YQPkgChangeLogView.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include #include "YQPkgChangeLogView.h" Modified: trunk/qt/src/pkg/YQPkgChangesDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgChangesDialog.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgChangesDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgChangesDialog.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QApplication> #include <QDesktopWidget> Modified: trunk/qt/src/pkg/YQPkgConflictDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgConflictDialog.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgConflictDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgConflictDialog.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include #include @@ -228,7 +228,7 @@ { prepareSolving(); - y2debug( "Solving..." ); + yuiDebug() << "Solving..." << endl; QTime solveTime; solveTime.start(); @@ -238,8 +238,9 @@ _totalSolveTime += solveTime.elapsed() / 1000.0; - y2debug( "Solving done in %f s - average: %f s", - solveTime.elapsed() / 1000.0, averageSolveTime() ); + yuiDebug() << "Solving done in " << ( solveTime.elapsed() / 1000.0 ) + << " s - average: " << " s" << averageSolveTime() + << endl; return processSolverResult( success ); } @@ -250,13 +251,13 @@ { prepareSolving(); - y2debug( "Verifying system..." ); + yuiDebug() << "Verifying system..." << endl; QTime solveTime; solveTime.start(); bool success = zypp::getZYpp()->resolver()->verifySystem( true ); // considerNewHardware - y2debug( "System verified in %f s", solveTime.elapsed() / 1000.0 ); + yuiDebug() << "System verified in " << solveTime.elapsed() / 1000.0 << " s" << endl; return processSolverResult( success ); } @@ -323,7 +324,7 @@ } else // There were solving problems. { - y2debug( "Dependency conflict!" ); + yuiDebug() << "Dependency conflict!" << endl; YQUI::ui()->busyCursor(); _conflictList->fill( zypp::getZYpp()->resolver()->problems() ); @@ -377,9 +378,9 @@ if ( button_no == 1 ) // Cancel return; - y2milestone( "Generating solver test case START" ); - bool success = zypp::getZYpp()->resolver()->createSolverTestcase( qPrintable(testCaseDir) ); - y2milestone( "Generating solver test case END" ); + yuiMilestone() << "Generating solver test case START" << endl; + bool success = zypp::getZYpp()->resolver()->createSolverTestcase( qPrintable( testCaseDir ) ); + yuiMilestone() << "Generating solver test case END" << endl; if ( success ) { Modified: trunk/qt/src/pkg/YQPkgConflictList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgConflictList.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgConflictList.cc (original) +++ trunk/qt/src/pkg/YQPkgConflictList.cc Fri Jan 25 15:51:12 2008 @@ -30,8 +30,8 @@ #include -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include #include "YQPkgConflictList.h" @@ -169,7 +169,7 @@ if ( ! file.open(QIODevice::WriteOnly) ) { - y2error( "Can't open file %s", qPrintable(filename) ); + yuiError() << "Can't open file " << filename << endl; if ( interactive ) { @@ -334,9 +334,9 @@ continue; zypp::ProblemSolution_Ptr solution = it.value(); - y2milestone( "User selected resolution \"%s\" for problem \"%s\"", - solution->description().c_str(), - solution->problem()->description().c_str() ); + yuiMilestone() << "User selected resolution \""<< solution->description() + << "\" for problem \"" << solution->problem()->description() + <<"\"" << endl; return solution; } Modified: trunk/qt/src/pkg/YQPkgDependenciesView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgDependenciesView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgDependenciesView.cc (original) +++ trunk/qt/src/pkg/YQPkgDependenciesView.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include #include "YQPkgDependenciesView.h" Modified: trunk/qt/src/pkg/YQPkgDescriptionDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgDescriptionDialog.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgDescriptionDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgDescriptionDialog.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QApplication> #include <QDesktopWidget> @@ -37,6 +37,7 @@ #include "QY2LayoutUtils.h" #include "YQi18n.h" #include "YQUI.h" +#include "utf8.h" #define SPACING 2 // between subwidgets @@ -113,7 +114,7 @@ void YQPkgDescriptionDialog::filter( const QString & qPkgName ) { - std::string pkgName( qPrintable(qPkgName) ); + std::string pkgName( toUTF8( qPkgName ) ); YQUI::ui()->busyCursor(); _pkgList->clear(); Modified: trunk/qt/src/pkg/YQPkgDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgDescriptionView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgDescriptionView.cc (original) +++ trunk/qt/src/pkg/YQPkgDescriptionView.cc Fri Jan 25 15:51:12 2008 @@ -16,8 +16,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QRegExp> #include <QList> @@ -119,13 +119,13 @@ if ( url.scheme() == "pkg" ) { QString pkgName = url.authority(); - y2milestone( "Hyperlinking to package '%s'", qPrintable(pkgName) ); + yuiMilestone() << "Hyperlinking to package \"" << pkgName << "\"" << endl; YQPkgDescriptionDialog::showDescriptionDialog( pkgName ); } else { - y2error( "Protocol not supported - can't follow hyperlink '%s'", - qPrintable(url.toString()) ); + yuiError() << "Protocol not supported - can't follow hyperlink \"" + << url.toString() << "\"" << endl; } } Modified: trunk/qt/src/pkg/YQPkgDiskUsageList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgDiskUsageList.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgDiskUsageList.cc (original) +++ trunk/qt/src/pkg/YQPkgDiskUsageList.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QStyle> #include <QHeaderView> @@ -115,7 +115,7 @@ if ( item ) item->updateDuData( partitionDu ); else - y2error( "No entry for mount point %s", partitionDu.dir.c_str() ); + yuiError() << "No entry for mount point " << partitionDu.dir << endl; } resizeColumnToContents( totalSizeCol() ); @@ -181,7 +181,7 @@ if ( event->key() == Qt::Key_Q ) { _debug = ! _debug; - y2milestone( "Debug mode %s", _debug ? "on" : "off" ); + yuiMilestone() << "Debug mode: " << _debug << endl; } } @@ -256,7 +256,7 @@ , _partitionDu( partitionDu ) , _pkgDiskUsageList( parent ) { - y2debug( "disk usage list entry for %s", partitionDu.dir.c_str() ); + yuiDebug() << "disk usage list entry for " << partitionDu.dir << endl; } Modified: trunk/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QApplication> #include <QLabel> Modified: trunk/qt/src/pkg/YQPkgFileListView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgFileListView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgFileListView.cc (original) +++ trunk/qt/src/pkg/YQPkgFileListView.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QRegExp> #include "YQPkgFileListView.h" Modified: trunk/qt/src/pkg/YQPkgGenericDetailsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgGenericDetailsView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgGenericDetailsView.cc (original) +++ trunk/qt/src/pkg/YQPkgGenericDetailsView.cc Fri Jan 25 15:51:12 2008 @@ -16,8 +16,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QTabWidget> #include <QRegExp> #include <QDateTime> @@ -125,7 +125,7 @@ YQPkgGenericDetailsView::htmlEscape( const QString & plainText ) { QString html = plainText; - // y2debug( "Escaping '%s'", (const char *) plainText ); + // yuiDebug() << "Escaping \"" << plainText << "\"" << endl; html.replace( QRegExp( "&" ), "&" ); html.replace( QRegExp( "<" ), "<" ); Modified: trunk/qt/src/pkg/YQPkgLangList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgLangList.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgLangList.cc (original) +++ trunk/qt/src/pkg/YQPkgLangList.cc Fri Jan 25 15:51:12 2008 @@ -19,8 +19,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include #include "YQi18n.h" @@ -33,7 +33,7 @@ YQPkgLangList::YQPkgLangList( QWidget * parent ) : YQPkgObjList( parent ) { - y2debug( "Creating language list" ); + yuiDebug() << "Creating language list" << endl; int numCol = 0; QStringList headers; @@ -54,7 +54,7 @@ fillList(); selectSomething(); - y2debug( "Creating language list done" ); + yuiDebug() << "Creating language list done" << endl; } @@ -68,7 +68,7 @@ YQPkgLangList::fillList() { clear(); - y2debug( "Filling language list" ); + yuiDebug() << "Filling language list" << endl; for ( ZyppPoolIterator it = zyppLangBegin(); @@ -80,10 +80,10 @@ if ( zyppLang ) addLangItem( *it, zyppLang ); else - y2error( "Found non-Language selectable" ); + yuiError() << "Found non-Language selectable" << endl; } - y2debug( "Language list filled" ); + yuiDebug() << "Language list filled" << endl; } @@ -136,15 +136,17 @@ if ( pkg ) { - y2debug( "Found pkg %s for lang %s", - pkg->name().c_str(), currentLang.c_str() ); + yuiDebug() << "Found pkg " << pkg->name() + << " for lang " << currentLang + << endl; emit filterMatch( *it, pkg ); } else { - y2warning( "Found non-pkg obj %s for lang %s", - pkg->name().c_str(), currentLang.c_str() ); + yuiWarning() << "Found non-pkg obj " << pkg->name() + << " for lang " << currentLang + << endl; } } } @@ -163,7 +165,7 @@ { if ( ! selectable ) { - y2error( "NULL ZyppSel!" ); + yuiError() << "NULL ZyppSel!" << endl; return; } Modified: trunk/qt/src/pkg/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgList.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgList.cc (original) +++ trunk/qt/src/pkg/YQPkgList.cc Fri Jan 25 15:51:12 2008 @@ -20,8 +20,8 @@ #define SOURCE_RPM_DISABLED 0 -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QPixmap> #include <QAction> #include <QMenu> @@ -128,7 +128,7 @@ { if ( ! selectable ) { - y2error( "NULL zypp::ui::Selectable!" ); + yuiError() << "NULL zypp::ui::Selectable!" << endl; return; } @@ -401,7 +401,7 @@ if ( file.error() != QFile::NoError ) { - y2error( "Can't open file %s", qPrintable(filename) ); + yuiError() << "Can't open file " << filename << endl; if ( interactive ) { @@ -538,7 +538,7 @@ selectable->set_status( newStatus ); changedCount++; - // y2milestone( "Updating %s", selectable->name().c_str() ); + // yuiMilestone() << "Updating " << selectable->name() << endl; } } } Modified: trunk/qt/src/pkg/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgObjList.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgObjList.cc (original) +++ trunk/qt/src/pkg/YQPkgObjList.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QPixmap> #include <QHeaderView> #include <QMenu> @@ -107,7 +107,7 @@ { if ( ! selectable ) { - y2error( "Null zypp::ui::Selectable!" ); + yuiError() << "Null zypp::ui::Selectable!" << endl; return; } @@ -593,7 +593,7 @@ if ( event->key() == Qt::Key_Q ) { _debug= ! _debug; - y2milestone( "Debug mode %s", _debug ? "on" : "off" ); + yuiMilestone() << "Debug mode: " << _debug << endl; } } @@ -721,7 +721,7 @@ void YQPkgObjList::applyExcludeRules() { - // y2debug( "Applying exclude rules" ); + // yuiDebug() << "Applying exclude rules" << endl; QTreeWidgetItemIterator listView_it( this ); while ( *listView_it ) @@ -759,7 +759,7 @@ { if ( _excludedItems->size() > 0 ) { - y2milestone( "%d packages excluded", _excludedItems->size() ); + yuiMilestone() << _excludedItems->size() << " packages excluded" << endl; for ( ExcludeRuleList::iterator rule_it = _excludeRules.begin(); rule_it != _excludeRules.end(); @@ -769,8 +769,9 @@ if ( rule->isEnabled() ) { - y2milestone( "Active exclude rule: \"%s\"", - qPrintable(rule->regexp().pattern()) ); + yuiMilestone() << "Active exclude rule: \"" + << rule->regexp().pattern() << "\"" + << endl; } } } @@ -806,13 +807,13 @@ #if VERBOSE_EXCLUDE_RULES if ( exclude ) { - y2debug( "Rule %s matches: Excluding %s", - matchingRule->regexp().pattern().ascii(), - item->zyppObj()->name().c_str() ); + yuiDebug() << "Rule \"" << matchingRule->regexp().pattern() + << "\" matches: Excluding " << item->zyppObj()->name() + << endl; } else { - y2debug( "Un-excluding %s", item->zyppObj()->name().c_str() ); + yuiDebug() << "Un-excluding " << item->zyppObj()->name() << endl; } #endif } @@ -978,7 +979,7 @@ { if ( ! selectable() ) { - y2error( "No selectable" ); + yuiError() << "No selectable" << endl; return S_NoInst; } @@ -1048,7 +1049,7 @@ { if ( statusCol() >= 0 ) { - y2debug( "setStatusIcon" ); + yuiDebug() << "setStatusIcon" << endl; bool enabled = editable() && _pkgObjList->editable(); setIcon( statusCol(), _pkgObjList->statusIcon( status(), enabled, bySelection() ) ); } @@ -1077,9 +1078,10 @@ if ( isBroken() ) { setIcon( brokenIconCol(), YQIconPool::warningSign() ); - y2warning( "Broken object: %s - %s", - _selectable->theObj()->name().c_str(), - _selectable->theObj()->summary().c_str() ); + + yuiWarning() << "Broken object: " << _selectable->theObj()->name() + << " - " << _selectable->theObj()->summary() + << endl; } } } @@ -1125,11 +1127,11 @@ case S_AutoInstall: case S_Taboo: - y2error( "Expected uninstalled zyppObj" ); + yuiError() << "Expected uninstalled zyppObj" << endl; return false; } - y2error( "Should never get here" ); + yuiError() << "Should never get here" << endl; return false; } @@ -1181,7 +1183,7 @@ } else { - y2warning( "No candidate for %s", selectable()->theObj()->name().c_str() ); + yuiWarning() << "No candidate for " << selectable()->theObj()->name() << endl; newStatus = S_NoInst; } break; @@ -1239,7 +1241,7 @@ if ( ! text.empty() ) { - y2debug( "Showing notify text" ); + yuiDebug() << "Showing notify text" << endl; YQPkgTextDialog::showText( _pkgObjList, selectable(), text ); } } @@ -1277,12 +1279,12 @@ if ( licenseText.empty() ) return true; - y2debug( "Showing license agreement for %s", sel->name().c_str() ); + yuiDebug() << "Showing license agreement for " << sel->name() << endl; bool confirmed = YQPkgTextDialog::confirmText( 0, sel, licenseText ); if ( confirmed ) { - y2milestone( "User confirmed license agreement for %s", sel->name().c_str() ); + yuiMilestone() << "User confirmed license agreement for " << sel->name() << endl; sel->setLicenceConfirmed( true ); } else @@ -1295,8 +1297,9 @@ case S_Install: case S_AutoInstall: - y2warning( "User rejected license agreement for %s - setting to TABOO", - sel->name().c_str() ); + yuiWarning() << "User rejected license agreement for " << sel->name() + << " - setting to TABOO" + << endl; sel->set_status( S_Taboo ); break; @@ -1305,8 +1308,9 @@ case S_Update: case S_AutoUpdate: - y2warning( "User rejected license agreement for %s - setting to PROTECTED", - sel->name().c_str() ); + yuiWarning() << "User rejected license agreement for " << sel->name() + << " - setting to PROTECTED" + << endl; sel->set_status( S_Protected ); // S_Keep wouldn't be good enough: The next solver run might @@ -1462,9 +1466,9 @@ _enabled = enable; #if VERBOSE_EXCLUDE_RULES - y2debug( "%s exclude rule %s", - enable ? "Enabling" : "Disabling", - _regexp.pattern().ascii() ); + yuiDebug() << ( enable ? "Enabling" : "Disabling" ) + << " exclude rule " << _regexp.pattern() + << endl; #endif } Modified: trunk/qt/src/pkg/YQPkgPatchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgPatchFilterView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgPatchFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgPatchFilterView.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QComboBox> #include <QLabel> @@ -215,7 +215,9 @@ _totalDownloadSize->setText( totalSize.asString().c_str() ); #endif - y2debug( "Calculated total download size in %d millisec", calcTime.elapsed() ); + yuiDebug() << "Calculated total download size in " + << calcTime.elapsed() << " millisec" + << endl; } Modified: trunk/qt/src/pkg/YQPkgPatchList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgPatchList.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgPatchList.cc (original) +++ trunk/qt/src/pkg/YQPkgPatchList.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QMenu> #include <QAction> @@ -47,7 +47,7 @@ YQPkgPatchList::YQPkgPatchList( QWidget * parent ) : YQPkgObjList( parent ) { - y2debug( "Creating patch list" ); + yuiDebug() << "Creating patch list" << endl; _filterCriteria = RelevantPatches; @@ -79,7 +79,7 @@ sortItems( categoryCol(), Qt::AscendingOrder ); fillList(); - y2debug( "Creating patch list done" ); + yuiDebug() << "Creating patch list done" << endl; } @@ -112,7 +112,7 @@ YQPkgPatchList::fillList() { clear(); - y2debug( "Filling patch list" ); + yuiDebug() << "Filling patch list" << endl; for ( ZyppPoolIterator it = zyppPatchesBegin(); it != zyppPatchesEnd(); @@ -138,9 +138,10 @@ displayPatch = true; - y2warning( "Installed patch is broken: %s - %s", - zyppPatch->name().c_str(), - zyppPatch->summary().c_str() ); + yuiWarning() << "Installed patch is broken: " + << zyppPatch->name() + << " - " << zyppPatch->summary() + << endl; } } else // not installed @@ -158,9 +159,10 @@ displayPatch = true; - y2milestone( "Patch satisfied, but not installed yet: %s - %s", - zyppPatch->name().c_str(), - zyppPatch->summary().c_str() ); + yuiMilestone() << "Patch satisfied, but not installed yet: " + << zyppPatch->name() + << " - " << zyppPatch->summary() + << endl; } } @@ -181,9 +183,9 @@ { // None of the packages that belong to the patch is installed on the system. - y2debug( "Patch not needed: %s - %s", - zyppPatch->name().c_str(), - zyppPatch->summary().c_str() ); + yuiDebug() << "Patch not needed: " << zyppPatch->name() + << " - " << zyppPatch->summary() + << endl; } } break; @@ -206,9 +208,9 @@ } else { - y2milestone( "Patch not needed: %s - %s", - zyppPatch->name().c_str(), - zyppPatch->summary().c_str() ); + yuiMilestone() << "Patch not needed: " << zyppPatch->name() + << " - " << zyppPatch->summary() + << endl; } } break; @@ -225,14 +227,16 @@ if ( displayPatch ) { #if VERBOSE_PATCH_LIST - y2debug( "Displaying patch %s - %s", zyppPatch->name().c_str(), zyppPatch->summary().c_str() ); + yuiDebug() << "Displaying patch " << zyppPatch->name() + << " - " << zyppPatch->summary() + << endl; #endif addPatchItem( *it, zyppPatch); } } else { - y2error( "Found non-patch selectable" ); + yuiError() << "Found non-patch selectable" << endl; } } @@ -241,7 +245,7 @@ message( _( "No patches available." ) ); #endif - y2debug( "patch list filled" ); + yuiDebug() << "Patch list filled" << endl; } @@ -288,7 +292,9 @@ if ( pkg ) { - y2debug( "Found patch pkg: %s arch: %s", (*it)->name().c_str(), (*it)->arch().asString().c_str() ); + yuiDebug() << "Found patch pkg: " << (*it)->name() + << " arch: " << (*it)->arch().asString() + << endl; ZyppSel sel = _selMapper.findZyppSel( pkg ); @@ -296,10 +302,10 @@ { if ( contains( patchSelectables, sel ) ) { - y2milestone( "Suppressing duplicate selectable %s-%s arch: %s", - (*it)->name().c_str(), - (*it)->edition().asString().c_str(), - (*it)->arch().asString().c_str() ); + yuiMilestone() << "Suppressing duplicate selectable " + << (*it)->name() << "-" << (*it)->edition().asString() + << " arch: " << (*it)->arch().asString() + << endl; } else { @@ -308,26 +314,25 @@ } } else - y2error( "No selectable for pkg %s", (*it)->name().c_str() ); + yuiError() << "No selectable for pkg " << (*it)->name() << endl; } else // No ZyppPkg - some other kind of object (script, message) { if ( zypp::isKindzypp::Script ( *it ) ) { - y2debug( "Found patch script %s", (*it)->name().c_str() ); + yuiDebug() << "Found patch script " << (*it)->name() << endl; emit filterMatch( _( "Script" ), fromUTF8( (*it)->name() ), -1 ); } else if ( zypp::isKindzypp::Message ( *it ) ) { - y2debug( "Found patch message %s (ignoring)", (*it)->name().c_str() ); + yuiDebug() << "Found patch message " << (*it)->name() << " (ignoring)" << endl; } else { - y2error( "Found unknown object of kind %s in patch: %s-%s arch: %s", - (*it)->kind().asString().c_str(), - (*it)->name().c_str(), - (*it)->edition().asString().c_str(), - (*it)->arch().asString().c_str() ); + yuiError() << "Found unknown object of kind " << (*it)->kind().asString() + << " in patch: " << (*it)->name() << "-" << (*it)->edition().asString() + << " arch: " << (*it)->arch().asString() + << endl; } } } @@ -344,7 +349,7 @@ { if ( ! selectable ) { - y2error( "NULL ZyppSel!" ); + yuiError() << "NULL ZyppSel!" << endl; return; } @@ -444,7 +449,7 @@ if ( item && item->selectable()->hasInstalledObj() ) { - y2warning( "Deleting patches is not supported" ); + yuiWarning() << "Deleting patches is not supported" << endl; return; } } @@ -516,7 +521,7 @@ if ( category == "optional" ) return YQPkgOptionalPatch; if ( category == "document" ) return YQPkgDocumentPatch; - y2warning( "Unknown patch category \"%s\"", qPrintable(category) ); + yuiWarning() << "Unknown patch category \"" << category << "\"" << endl; return YQPkgUnknownPatchCategory; } Modified: trunk/qt/src/pkg/YQPkgPatternList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgPatternList.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgPatternList.cc (original) +++ trunk/qt/src/pkg/YQPkgPatternList.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QRegExp> #include #include @@ -34,6 +34,9 @@ #include "YQApplication.h" #include "YQUI.h" +using std::string; +using std::set; + #define CATEGORY_BACKGROUND QColor( 0xFF, 0xC0, 0x50 ) @@ -41,7 +44,7 @@ YQPkgPatternList::YQPkgPatternList( QWidget * parent, bool autoFill, bool autoFilter ) : YQPkgObjList( parent ) { - y2debug( "Creating pattern list" ); + yuiDebug() << "Creating pattern list" << endl; int numCol = 1; QStringList headers; @@ -95,7 +98,7 @@ fillList(); selectSomething(); } - y2debug( "Creating pattern list done" ); + yuiDebug() << "Creating pattern list done" << endl; } @@ -109,7 +112,7 @@ YQPkgPatternList::fillList() { clear(); - y2debug( "Filling pattern list" ); + yuiDebug() << "Filling pattern list" << endl; for ( ZyppPoolIterator it = zyppPatternsBegin(); @@ -125,15 +128,16 @@ addPatternItem( *it, zyppPattern ); } else - y2debug( "Pattern %s is not user-visible", zyppPattern->name().c_str() ); + yuiDebug() << "Pattern " << zyppPattern->name() + << " is not user-visible" << endl; } else { - y2error( "Found non-Pattern selectable" ); + yuiError() << "Found non-Pattern selectable" << endl; } } - y2debug( "Pattern list filled" ); + yuiDebug() << "Pattern list filled" << endl; } @@ -147,7 +151,7 @@ if ( ! cat ) { - y2debug( "New pattern category \"%s\"", qPrintable(categoryName) ); + yuiDebug() << "New pattern category \""<< categoryName << "\"" << endl; cat = new YQPkgPatternCategoryItem( this, categoryName ); Q_CHECK_PTR( cat ); @@ -209,7 +213,7 @@ { if ( ! selectable ) { - y2error( "NULL ZyppSelectable!" ); + yuiError() << "NULL ZyppSelectable!" << endl; return; } Modified: trunk/qt/src/pkg/YQPkgProductDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgProductDialog.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgProductDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgProductDialog.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QApplication> #include Modified: trunk/qt/src/pkg/YQPkgProductList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgProductList.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgProductList.cc (original) +++ trunk/qt/src/pkg/YQPkgProductList.cc Fri Jan 25 15:51:12 2008 @@ -19,8 +19,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include "YQi18n.h" #include "utf8.h" @@ -35,7 +35,7 @@ : YQPkgObjList( parent ) , _vendorCol( -42 ) { - y2debug( "Creating product list" ); + yuiDebug() << "Creating product list" << endl; #if FIXME int numCol = 0; @@ -52,7 +52,7 @@ selectSomething(); #endif - y2debug( "Creating product list done" ); + yuiDebug() << "Creating product list done" << endl; } @@ -66,7 +66,7 @@ YQPkgProductList::fillList() { clear(); - y2debug( "Filling product list" ); + yuiDebug() << "Filling product list" << endl; for ( ZyppPoolIterator it = zyppProductsBegin(); it != zyppProductsEnd(); @@ -80,11 +80,11 @@ } else { - y2error( "Found non-product selectable" ); + yuiError() << "Found non-product selectable" << endl; } } - y2debug( "product list filled" ); + yuiDebug() << "product list filled" << endl; } @@ -94,7 +94,7 @@ { if ( ! selectable ) { - y2error( "NULL ZyppSel!" ); + yuiError() << "NULL ZyppSel!" << endl; return; } Modified: trunk/qt/src/pkg/YQPkgRepoFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoFilterView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgRepoFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgRepoFilterView.cc Fri Jan 25 15:51:12 2008 @@ -19,8 +19,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include Modified: trunk/qt/src/pkg/YQPkgRepoList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoList.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgRepoList.cc (original) +++ trunk/qt/src/pkg/YQPkgRepoList.cc Fri Jan 25 15:51:12 2008 @@ -21,8 +21,8 @@ #include <algorithm> #include <QDateTime> -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include #include <QTreeWidget> @@ -30,16 +30,16 @@ #include "YQi18n.h" #include "utf8.h" +using std::string; using std::list; using std::set; using std::vector; - YQPkgRepoList::YQPkgRepoList( QWidget * parent ) : QY2ListView( parent ) { - y2debug( "Creating repository list" ); + yuiDebug() << "Creating repository list" << endl; _nameCol = -1; _urlCol = -1; @@ -63,7 +63,7 @@ fillList(); selectSomething(); - y2debug( "Creating repository list done" ); + yuiDebug() << "Creating repository list done" << endl; } @@ -77,7 +77,7 @@ YQPkgRepoList::fillList() { clear(); - y2debug( "Filling repository list" ); + yuiDebug() << "Filling repository list" << endl; for ( ZyppRepositoryIterator it = ZyppRepositoriesBegin(); it != ZyppRepositoriesEnd(); @@ -86,7 +86,7 @@ addRepo( *it ); } - y2debug( "Inst repository filled" ); + yuiDebug() << "Inst repository filled" << endl; } @@ -110,7 +110,7 @@ { emit filterStart(); - y2milestone( "Collecting packages in selected repositories..." ); + yuiMilestone() << "Collecting packages in selected repositories..." << endl; QTime stopWatch; stopWatch.start(); @@ -193,7 +193,9 @@ ++sel_it; } - y2debug( "Packages sent to package list. Elapsed time: %f sec", stopWatch.elapsed() / 1000.0 ); + yuiDebug() << "Packages sent to package list. Elapsed time: " + << stopWatch.elapsed() / 1000.0 << " sec" + << endl; emit filterFinished(); } @@ -289,8 +291,9 @@ { if ( zypp::dynamic_pointer_castzypp::Product( *it ) ) { - y2milestone( "Multiple products in repository %s", - zyppRepo.info().alias().c_str() ); + yuiMilestone() << "Multiple products in repository " + << zyppRepo.info().alias() + << endl; ZyppProduct null; return null; } @@ -299,8 +302,9 @@ } if ( ! product ) - y2milestone( "No product in repository %s", - zyppRepo.info().alias().c_str() ); + yuiMilestone() << "No product in repository " + << zyppRepo.info().alias() + << endl; return product; } Modified: trunk/qt/src/pkg/YQPkgRpmGroupTagsFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRpmGroupTagsFilterView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgRpmGroupTagsFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgRpmGroupTagsFilterView.cc Fri Jan 25 15:51:12 2008 @@ -19,8 +19,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include "YQPkgRpmGroupTagsFilterView.h" #include "YQi18n.h" @@ -70,7 +70,7 @@ void YQPkgRpmGroupTagsFilterView::fillRpmGroupsTree() { - y2debug( "Filling RPM groups tree" ); + yuiDebug() << "Filling RPM groups tree" << endl; for ( ZyppPoolIterator it = zyppPkgBegin(); it != zyppPkgEnd(); @@ -82,7 +82,7 @@ rpmGroupsTree()->addRpmGroup( zyppPkg->group() ); } - y2debug( "Filling RPM groups tree done" ); + yuiDebug() << "Filling RPM groups tree done" << endl; } @@ -132,7 +132,7 @@ YQPkgRpmGroupTagsFilterView::filter() { emit filterStart(); - // y2debug( "Filtering packages for RPM group \"%s\"", selectedRpmGroup().c_str() ); + // yuiDebug() << "Filtering packages for RPM group \"" << selectedRpmGroup() << "\"" << endl; if ( selection() ) { Modified: trunk/qt/src/pkg/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgSearchFilterView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgSearchFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgSearchFilterView.cc Fri Jan 25 15:51:12 2008 @@ -29,8 +29,8 @@ #include <QDateTime> #include <QKeyEvent> -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include "YQPkgSearchFilterView.h" #include "QY2LayoutUtils.h" @@ -361,7 +361,7 @@ { if ( check( ( *it).index(), regexp ) ) { - // y2debug( "Match for %s", (*it).asString().c_str() ); + // yuiDebug() << "Match for " << (*it).asString() << endl; return true; } } Modified: trunk/qt/src/pkg/YQPkgSelDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgSelDescriptionView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgSelDescriptionView.cc (original) +++ trunk/qt/src/pkg/YQPkgSelDescriptionView.cc Fri Jan 25 15:51:12 2008 @@ -16,8 +16,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include #include <QRegExp> @@ -97,7 +97,7 @@ { if ( icon.startsWith( "./" ) ) icon.replace( QRegExp( "^\\./" ), "" ); - + if ( ! icon.endsWith( ".png", Qt::CaseInsensitive ) && ! icon.endsWith( ".jpg", Qt::CaseInsensitive ) ) icon += ".png"; @@ -127,8 +127,9 @@ } if ( pattern && icon.isEmpty() ) - y2warning( "No icon for pattern %s - icon name: %s", - zyppObj->name().c_str(), qPrintable(origIconName) ); + yuiWarning() << "No icon for pattern " << zyppObj->name() + << " - icon name: " << origIconName + << endl; } @@ -160,14 +161,14 @@ QString YQPkgSelDescriptionView::findIcon( const QString & icon ) const { - if ( access( qPrintable(icon), R_OK ) == 0 ) + if ( access( qPrintable( icon ), R_OK ) == 0 ) { - y2debug( "Found icon %s", qPrintable(icon) ); + yuiDebug() << "Found icon " << icon << endl; return icon; } else { - y2debug( "No icon %s", qPrintable(icon) ); + yuiDebug() << "No icon " << icon << endl; return ""; } } Modified: trunk/qt/src/pkg/YQPkgSelList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgSelList.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgSelList.cc (original) +++ trunk/qt/src/pkg/YQPkgSelList.cc Fri Jan 25 15:51:12 2008 @@ -19,22 +19,23 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include #include #include - #include "YQi18n.h" #include "utf8.h" #include "YQPkgSelList.h" +using std::set; + YQPkgSelList::YQPkgSelList( QWidget * parent, bool autoFill, bool autoFilter ) : YQPkgObjList( parent ) { - y2debug( "Creating selection list" ); + yuiDebug() << "Creating selection list" << endl; #if FIXME int numCol = 0; @@ -58,7 +59,7 @@ selectSomething(); } - y2debug( "Creating selection list done" ); + yuiDebug() << "Creating selection list done" << endl; } @@ -72,7 +73,7 @@ YQPkgSelList::fillList() { clear(); - y2debug( "Filling selection list" ); + yuiDebug() << "Filling selection list" << endl; for ( ZyppPoolIterator it = zyppSelectionsBegin(); @@ -90,11 +91,11 @@ } else { - y2error( "Found non-Selection selectable" ); + yuiError() << "Found non-Selection selectable" << endl; } } - y2debug( "Selection list filled" ); + yuiDebug() << "Selection list filled" << endl; } @@ -148,7 +149,7 @@ { if ( ! selectable ) { - y2error( "NULL ZyppSel!" ); + yuiError() << "NULL ZyppSel!" << endl; return; } Modified: trunk/qt/src/pkg/YQPkgSelMapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgSelMapper.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgSelMapper.cc (original) +++ trunk/qt/src/pkg/YQPkgSelMapper.cc Fri Jan 25 15:51:12 2008 @@ -17,8 +17,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include "YQPkgSelMapper.h" @@ -39,7 +39,7 @@ { if ( --_refCount == 0 ) { - y2debug( "Destroying pkg -> selectable cache" ); + yuiDebug() << "Destroying pkg -> selectable cache" << endl; _cache.clear(); } } @@ -48,7 +48,7 @@ void YQPkgSelMapper::rebuildCache() { _cache.clear(); - y2debug( "Building pkg -> selectable cache" ); + yuiDebug() << "Building pkg -> selectable cache" << endl; for ( ZyppPoolIterator sel_it = zyppPkgBegin(); sel_it != zyppPkgEnd(); @@ -80,7 +80,7 @@ } } - y2debug( "Building pkg -> selectable cache done" ); + yuiDebug() << "Building pkg -> selectable cache done" << endl; } @@ -95,7 +95,7 @@ if ( it != YQPkgSelMapper::_cache.end() ) sel = it->second; else - y2warning( "No selectable found for package %s", pkg->name().c_str() ); + yuiWarning() << "No selectable found for package " << pkg->name() << endl; return sel; } Modified: trunk/qt/src/pkg/YQPkgStatusFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgStatusFilterView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgStatusFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgStatusFilterView.cc Fri Jan 25 15:51:12 2008 @@ -25,8 +25,8 @@ #include <QGroupBox> #include <QPixmap> -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include "YQPkgStatusFilterView.h" #include "YQIconPool.h" Modified: trunk/qt/src/pkg/YQPkgTechnicalDetailsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgTechnicalDetailsView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgTechnicalDetailsView.cc (original) +++ trunk/qt/src/pkg/YQPkgTechnicalDetailsView.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include "YQPkgTechnicalDetailsView.h" #include "YQi18n.h" Modified: trunk/qt/src/pkg/YQPkgTextDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgTextDialog.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgTextDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgTextDialog.cc Fri Jan 25 15:51:12 2008 @@ -18,8 +18,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include <QTextBrowser> @@ -258,7 +258,7 @@ YQPkgTextDialog::htmlEscape( const QString & plainText ) { QString html = plainText; - // y2debug( "Escaping '%s'", (const char *) plainText ); + // yuiDebug() << "Escaping \"" << plainText << "\"" << endl; html.replace( QRegExp( "&" ), "&" ); html.replace( QRegExp( "<" ), "<" ); Modified: trunk/qt/src/pkg/YQPkgUpdateProblemFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgUpdateProblemFilterView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgUpdateProblemFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgUpdateProblemFilterView.cc Fri Jan 25 15:51:12 2008 @@ -19,8 +19,8 @@ /-*/ -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include "YQPkgUpdateProblemFilterView.h" #include "YQi18n.h" @@ -92,8 +92,9 @@ if ( sel ) { - y2milestone( "Problematic package: %s-%s", - pkg->name().c_str(), pkg->edition().asString().c_str() ); + yuiMilestone() << "Problematic package: " + << pkg->name() << "-" << pkg->edition().asString() + << endl; emit filterMatch( sel, pkg ); } Modified: trunk/qt/src/pkg/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgVersionsView.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgVersionsView.cc (original) +++ trunk/qt/src/pkg/YQPkgVersionsView.cc Fri Jan 25 15:51:12 2008 @@ -18,11 +18,11 @@ /-*/ -#define y2log_component "qt-pkg" +#define YUILogComponent "qt-pkg" #include #include -#include +#include "YUILog.h" #include <QTabWidget> #include <QRegExp> #include <QHeaderView> @@ -180,7 +180,7 @@ if ( newCandidate != _selectable->candidateObj() ) { - y2milestone( "Candidate changed" ); + yuiMilestone() << "Candidate changed" << endl; // Change status of selectable Modified: trunk/qt/src/pkg/YQSimplePatchSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQSimplePatchSelector.cc?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/src/pkg/YQSimplePatchSelector.cc (original) +++ trunk/qt/src/pkg/YQSimplePatchSelector.cc Fri Jan 25 15:51:12 2008 @@ -24,8 +24,8 @@ #include <QPushButton> #include <QSplitter> -#define y2log_component "qt-pkg" -#include +#define YUILogComponent "qt-pkg" +#include "YUILog.h" #include "QY2LayoutUtils.h" @@ -226,7 +226,7 @@ _diskUsageList, SLOT ( updateDiskUsage() ) ); } - y2milestone( "Connection set up" ); + yuiMilestone() << "Connection set up" << endl; if ( _wizard ) { @@ -245,7 +245,7 @@ void YQSimplePatchSelector::detailedPackageSelection() { - y2milestone( "\"Details..\" button clicked" ); + yuiMilestone() << "\"Details..\" button clicked" << endl; YQUI::ui()->sendEvent( new YMenuEvent( YCPSymbol( "details" ) ) ); } @@ -253,7 +253,7 @@ void YQSimplePatchSelector::debugTrace() { - y2warning( "debugTrace" ); + yuiWarning() << "debugTrace" << endl; } Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=43911&r1=43910&r2=43911&view=diff ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Fri Jan 25 15:51:12 2008 @@ -5,9 +5,9 @@ BuildRequires: libzypp-devel docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel libxslt perl-XML-Writer libqt4-devel sgml-skel update-desktop-files Summary: - -BuildRequires: yast2-core-devel >= 2.16.23 BuildRequires: yast2-devtools >= 2.16.3 -Requires: yast2-core >= 2.16.23 +BuildRequires: yast2-core-devel >= 2.16.24 +Requires: yast2-core >= 2.16.24 Requires: yast2_theme >= 2.16.1 Requires: libzypp >= 3.11.8 Provides: yast2_ui -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org