Author: sh-sh-sh
Date: Thu Jan 24 15:06:25 2008
New Revision: 43881
URL: http://svn.opensuse.org/viewcvs/yast?rev=43881&view=rev
Log:
use YCP-less logging
Modified:
trunk/qt/src/ (props changed)
trunk/qt/src/YQPushButton.cc
trunk/qt/src/YQRichText.cc
trunk/qt/src/YQTree.cc
trunk/qt/src/YQWizard.cc
trunk/qt/src/pkg/ (props changed)
Modified: trunk/qt/src/YQPushButton.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQPushButton.cc?rev=43881&r1=43880&r2=43881&view=diff
==============================================================================
--- trunk/qt/src/YQPushButton.cc (original)
+++ trunk/qt/src/YQPushButton.cc Thu Jan 24 15:06:25 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/YQRichText.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQRichText.cc?rev=43881&r1=43880&r2=43881&view=diff
==============================================================================
--- trunk/qt/src/YQRichText.cc (original)
+++ trunk/qt/src/YQRichText.cc Thu Jan 24 15:06:25 2008
@@ -16,8 +16,8 @@
/-*/
-#define y2log_component "qt-ui"
-#include
+#define YUILogComponent "qt-ui"
+#include "YUILog.h"
#include <QColorGroup>
#include <QScrollBar>
@@ -135,8 +135,8 @@
void YQRichText::linkClicked( const QUrl & url )
{
- // y2debug( "Selected hyperlink \"%s\"", (const char *) url );
- YQUI::ui()->sendEvent( new YMenuEvent(url.toString().toUtf8()) );
+ // yuiDebug() << "Selected hyperlink \"" << url.toString() << "\" << endl;
+ YQUI::ui()->sendEvent( new YMenuEvent( url.toString().toUtf8()) );
}
Modified: trunk/qt/src/YQTree.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.cc?rev=43881&r1=43880&r2=43881&view=diff
==============================================================================
--- trunk/qt/src/YQTree.cc (original)
+++ trunk/qt/src/YQTree.cc Thu Jan 24 15:06:25 2008
@@ -24,8 +24,8 @@
#include <QString>
//Added by qt3to4:
#include <QPixmap>
-#define y2log_component "qt-ui"
-#include
+#define YUILogComponent "qt-ui"
+#include "YUILog.h"
using std::min;
using std::max;
@@ -97,7 +97,7 @@
void YQTree::rebuildTree()
{
- // y2debug( "Rebuilding tree" );
+ // yuiDebug() << "Rebuilding tree" << endl;
YQSignalBlocker sigBlocker( _qt_listView );
_qt_listView->clear();
@@ -161,7 +161,7 @@
openBranch( item );
YTree::selectItem( item->origItem(), true );
- y2debug( "selected item: \"%s\"", item->origItem()->label().c_str() );
+ yuiDebug() << "selected item: \"" << item->origItem()->label() << "\"" << endl;
}
}
@@ -267,7 +267,7 @@
init( tree, orig, serial );
#if VERBOSE_TREE_ITEMS
- y2debug( "Creating toplevel tree item \"%s\"", orig->label().c_str() );
+ yuiDebug() << "Creating toplevel tree item \"" << orig->label() << "\"" << endl;
#endif
}
@@ -280,9 +280,10 @@
{
init( tree, orig, serial );
#if VERBOSE_TREE_ITEMS
- y2debug( "Creating tree item \"%s\" as child of \"%s\"",
- orig->label().c_str(),
- parentItem->origItem()->label().c_str() );
+ yuiDebug() << "Creating tree item \"" << orig->label()
+ << "\" as child of \"" << parentItem->origItem()->label() << "\""
+ << endl;
+
#endif
}
@@ -309,7 +310,7 @@
QPixmap icon( iconName.c_str() );
if ( icon.isNull() )
- y2warning( "Can't load icon %s", iconName.c_str() );
+ yuiWarning() << "Can't load icon " << iconName << endl;
else
setData( 0, Qt::DecorationRole, icon );
}
Modified: trunk/qt/src/YQWizard.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=43881&r1=43880&r2=43881&view=diff
==============================================================================
--- trunk/qt/src/YQWizard.cc (original)
+++ trunk/qt/src/YQWizard.cc Thu Jan 24 15:06:25 2008
@@ -19,8 +19,8 @@
/-*/
#include "YQWizard.h"
-#define y2log_component "qt-wizard"
-#include
+#define YUILogComponent "qt-wizard"
+#include "YUILog.h"
// For the command parser
@@ -238,10 +238,9 @@
if ( _stepsIDs[ qId ] )
{
- y2error( "Step ID \"%s\" (\"%s\") already used for \"%s\"",
- id.c_str(),
- text.c_str(),
- qPrintable( _stepsIDs[ qId ]->name() ) );
+ yuiError() << "Step ID \"" << id << "\" (\"" << text
+ <<"\") already used for \"" << _stepsIDs[ qId ]->name() <<"\""
+ << endl;
return;
}
@@ -474,7 +473,7 @@
if ( ! _tree )
{
- y2error( "YQWizard widget not created with `opt(`treeEnabled) !" );
+ yuiError() << "YQWizard widget not created with `opt(`treeEnabled) !" << endl;
return;
}
@@ -758,7 +757,7 @@
{
if ( QString( signal ).contains( "nextClicked()" ) )
{
- y2debug( "nextClicked connected, no longer directly sending button events" );
+ yuiDebug() << "nextClicked connected, no longer directly sending button events" << endl;
_sendButtonEvents = false;
}
}
@@ -768,7 +767,7 @@
{
if ( QString( signal ).contains( "nextClicked()" ) )
{
- y2debug( "nextClicked disconnected, directly sending button events again" );
+ yuiDebug() << "nextClicked disconnected, directly sending button events again" << endl;
_sendButtonEvents = true;
}
}
@@ -783,7 +782,7 @@
QPixmap icon( iconName.c_str() );
if ( icon.isNull() )
- y2warning( "Couldn't load dialog icon \"%s\"", iconName.c_str() );
+ yuiWarning() << "Couldn't load dialog icon \"" << iconName << "\"" << endl;
else
{
_dialogIcon->setPixmap( icon );
@@ -880,7 +879,7 @@
if ( ! _releaseNotesButtonId.empty() )
{
- y2milestone( "Release Notes button clicked" );
+ yuiMilestone() << "Release Notes button clicked" << endl;
sendEvent( _releaseNotesButtonId );
}
}
@@ -944,7 +943,7 @@
}
else
{
- y2error( "Can't find menu with ID %s", parentMenuID.c_str() );
+ yuiError() << "Can't find menu with ID " << parentMenuID << endl;
}
}
@@ -965,7 +964,7 @@
}
else
{
- y2error( "Can't find menu with ID %s", parentMenuID.c_str() );
+ yuiError() << "Can't find menu with ID " << parentMenuID << endl;
}
}
@@ -980,7 +979,7 @@
}
else
{
- y2error( "Can't find menu with ID %s", parentMenuID.c_str() );
+ yuiError() << "Can't find menu with ID " << parentMenuID << endl;
}
}
@@ -1005,7 +1004,7 @@
}
else
{
- y2error( "Invalid menu ID: %d", numID );
+ yuiError() << "Invalid menu ID: " << numID << endl;
}
}
@@ -1038,7 +1037,7 @@
void YQWizard::resizeClientArea()
{
- y2debug( "resizing client area" );
+ yuiDebug() << "resizing client area" << endl;
QRect contentsRect = _clientArea->contentsRect();
_contents->setSize( contentsRect.width(), contentsRect.height() );
}
@@ -1078,10 +1077,10 @@
if ( ! _releaseNotesButton )
{
- y2error( "NULL Release Notes button" );
+ yuiError() << "NULL Release Notes button" << endl;
if ( ! _stepsPanel )
- y2error( "This works only if there is a \"steps\" panel!" );
+ yuiError() << "This works only if there is a \"steps\" panel!" << endl;
return;
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
sh-sh-sh＠svn.opensuse.org