Mailinglist Archive: yast-commit (687 mails)

[sh-sh-sh@xxxxxxxxxxxxxxxx]

Author: sh-sh-sh
Date: Thu Jan 24 15:27:42 2008
New Revision: 43888

URL: http://svn.opensuse.org/viewcvs/yast?rev=43888&view=rev
Log:
use YCP-less logging

Modified:
    trunk/qt/src/YQRadioButton.cc
    trunk/qt/src/YQSelectionBox.cc
    trunk/qt/src/YQTable.cc

Modified: trunk/qt/src/YQRadioButton.cc
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQRadioButton.cc?rev=43888&r1=43887&r2=43888&view=diff
==============================================================================
--- trunk/qt/src/YQRadioButton.cc (original)
+++ trunk/qt/src/YQRadioButton.cc Thu Jan 24 15:27:42 2008
@@ -19,8 +19,9 @@
 #include <qradiobutton.h>
 #include <QMouseEvent>
 #include <QBoxLayout>
-#define y2log_component "qt-ui"
-#include <ycp/y2log.h>
+
+#define YUILogComponent "qt-ui"
+#include "YUILog.h"
 
 #include "utf8.h"
 #include "YQUI.h"
@@ -148,8 +149,8 @@
 
         if ( mouseEvent && mouseEvent->button() == Qt::RightButton )
         {
-             y2milestone( "Right click on button detected" );
-             YQUI::ui()->maybeLeftHandedUser();
+           yuiMilestone() << "Right click on button detected" << endl;
+           YQUI::ui()->maybeLeftHandedUser();
         }
     }
 

Modified: trunk/qt/src/YQSelectionBox.cc
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQSelectionBox.cc?rev=43888&r1=43887&r2=43888&view=diff
==============================================================================
--- trunk/qt/src/YQSelectionBox.cc (original)
+++ trunk/qt/src/YQSelectionBox.cc Thu Jan 24 15:27:42 2008
@@ -23,8 +23,8 @@
 #include <QPixmap>
 #include <QKeyEvent>
 #include <QVBoxLayout>
-#define y2log_component "qt-ui"
-#include <ycp/y2log.h>
+#define YUILogComponent "qt-ui"
+#include "YUILog.h"
 
 using std::max;
 
@@ -53,7 +53,7 @@
     setLayout( layout );
 
     layout->setSpacing( YQWidgetSpacing );
-    layout->setMargin ( YQWidgetMargin  );
+    layout->setMargin ( YQWidgetMargin );
 
     _caption = new YQWidgetCaption( this, label );
     YUI_CHECK_NEW( _caption );
@@ -76,7 +76,7 @@
     connect( _qt_listBox,      SIGNAL( itemDoubleClicked( QListWidgetItem * ) 
),
             this,              SLOT  ( slotActivated( QListWidgetItem * ) ) );
 
-    connect( &_timer,          SIGNAL( timeout()           ),
+    connect( &_timer,          SIGNAL( timeout()           ),
             this,              SLOT  ( returnImmediately() ) );
 }
 
@@ -105,7 +105,7 @@
        icon = QPixmap( iconName.c_str() );
 
        if ( icon.isNull() )
-           y2warning( "Can't load icon %s", iconName.c_str() );
+           yuiWarning() << "Can't load icon %s" << iconName << endl;
     }
 
     if ( icon.isNull() )
@@ -145,10 +145,7 @@
     if ( item )
     {
 #ifdef VERBOSE_SELECTION
-       y2debug( "%s \"%s\": Selecting item \"%s\"",
-                widgetClass(),
-                debugLabel().c_str(),
-                item->label().c_str() );
+       yuiDebug() << this << ": Selecting item \"" << item->label() << "\"" << 
endl;
 #endif
 
        item->setSelected( true );
@@ -201,7 +198,7 @@
 {
     int hintHeight      = !_caption->isHidden() ? 
_caption->sizeHint().height() : 0;
     int visibleLines    = shrinkable() ? SHRINKABLE_VISIBLE_LINES : 
DEFAULT_VISIBLE_LINES;
-    hintHeight                 += visibleLines * 
_qt_listBox->fontMetrics().lineSpacing();
+    hintHeight         += visibleLines * 
_qt_listBox->fontMetrics().lineSpacing();
     hintHeight         += _qt_listBox->frameWidth() * 2;
 
     return max( 80, hintHeight );
@@ -255,7 +252,7 @@
 
        if ( mouseEvent && mouseEvent->button() == Qt::RightButton )
        {
-           y2milestone( "Right click in selecton box detected" );
+           yuiMilestone() << "Right click in selecton box detected" << endl;
            YQUI::ui()->maybeLeftHandedUser();
        }
     }
@@ -311,7 +308,7 @@
        // Avoid overwriting a (more important) Activated event with a
        // SelectionChanged event
 
-       y2debug( "sending selbox event" );
+       yuiDebug() << "Sending selbox event" << endl;
        YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::SelectionChanged 
) );
     }
 }
@@ -319,7 +316,7 @@
 
 void YQSelectionBox::returnDelayed()
 {
-    y2debug( "Starting selbox timer" );
+    yuiDebug() << "Starting selbox timer" << endl;
     _timer.setSingleShot( true );
     _timer.start( 250 ); // millisec
 }

Modified: trunk/qt/src/YQTable.cc
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTable.cc?rev=43888&r1=43887&r2=43888&view=diff
==============================================================================
--- trunk/qt/src/YQTable.cc (original)
+++ trunk/qt/src/YQTable.cc Thu Jan 24 15:27:42 2008
@@ -19,8 +19,8 @@
 #include <QHeaderView>
 #include <QVBoxLayout>
 #include <QString>
-#define y2log_component "qt-ui"
-#include <ycp/y2log.h>
+#define YUILogComponent "qt-ui"
+#include "YUILog.h"
 
 #include "utf8.h"
 #include "YQUI.h"
@@ -320,7 +320,7 @@
        QPixmap icon     = QPixmap( iconName.c_str() );
 
        if ( icon.isNull() )
-           y2warning( "Can't load icon %s", iconName.c_str() );
+           yuiWarning() << "Can't load icon %s" << iconName << endl;
        else
            setData( column, Qt::DecorationRole, icon );
     }

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