Author: sh-sh-sh
Date: Tue Mar 4 14:33:33 2008
New Revision: 45186
URL: http://svn.opensuse.org/viewcvs/yast?rev=45186&view=rev
Log:
consistent naming + mandatory indentation style
Modified:
trunk/qt/src/YQSelectionBox.cc
trunk/qt/src/YQSelectionBox.h
Modified: trunk/qt/src/YQSelectionBox.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQSelectionBox.cc?rev=45186&r1=45185&r2=45186&view=diff
==============================================================================
--- trunk/qt/src/YQSelectionBox.cc (original)
+++ trunk/qt/src/YQSelectionBox.cc Tue Mar 4 14:33:33 2008
@@ -60,21 +60,21 @@
YUI_CHECK_NEW( _caption );
layout->addWidget( _caption );
- _qt_listBox = new QListWidget( this );
- YUI_CHECK_NEW( _qt_listBox );
- layout->addWidget( _qt_listBox );
-
- _qt_listBox->installEventFilter( this );
- //FIXME _qt_listBox->setVariableHeight( false );
- _qt_listBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,
- QSizePolicy::Expanding ) );
- //FIXME _qt_listBox->setTopItem(0);
- _caption->setBuddy( _qt_listBox );
+ _qt_listWidget = new QListWidget( this );
+ YUI_CHECK_NEW( _qt_listWidget );
+ layout->addWidget( _qt_listWidget );
+
+ _qt_listWidget->installEventFilter( this );
+ //FIXME _qt_listWidget->setVariableHeight( false );
+ _qt_listWidget->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,
+ QSizePolicy::Expanding ) );
+ //FIXME _qt_listWidget->setTopItem(0);
+ _caption->setBuddy( _qt_listWidget );
- connect( _qt_listBox, SIGNAL( itemSelectionChanged() ),
+ connect( _qt_listWidget, SIGNAL( itemSelectionChanged() ),
this, SLOT ( slotSelectionChanged() ) );
- connect( _qt_listBox, SIGNAL( itemDoubleClicked( QListWidgetItem * ) ),
+ connect( _qt_listWidget, SIGNAL( itemDoubleClicked( QListWidgetItem * ) ),
this, SLOT ( slotActivated( QListWidgetItem * ) ) );
connect( &_timer, SIGNAL( timeout() ),
@@ -111,30 +111,30 @@
if ( icon.isNull() )
{
- _qt_listBox->addItem( fromUTF8( item->label() ) );
+ _qt_listWidget->addItem( fromUTF8( item->label() ) );
}
else
{
- QListWidgetItem *i = new QListWidgetItem(_qt_listBox);
- i->setData(Qt::DisplayRole, fromUTF8( item->label() ) );
- i->setData(Qt::DecorationRole, icon );
- _qt_listBox->addItem( i );
+ QListWidgetItem *i = new QListWidgetItem( _qt_listWidget );
+ i->setData(Qt::DisplayRole, fromUTF8( item->label() ) );
+ i->setData(Qt::DecorationRole, icon );
+ _qt_listWidget->addItem( i );
}
if ( item->selected() )
{
- YQSignalBlocker sigBlocker( _qt_listBox );
- _qt_listBox->setCurrentItem( _qt_listBox->item( item->index() ) );
+ YQSignalBlocker sigBlocker( _qt_listWidget );
+ _qt_listWidget->setCurrentItem( _qt_listWidget->item( item->index() ) );
}
}
void YQSelectionBox::selectItem( YItem * item, bool selected )
{
- YQSignalBlocker sigBlocker( _qt_listBox );
+ YQSignalBlocker sigBlocker( _qt_listWidget );
YSelectionBox::selectItem( item, selected );
- _qt_listBox->setCurrentRow( selected ? item->index() : -1 );
+ _qt_listWidget->setCurrentRow( selected ? item->index() : -1 );
}
@@ -159,9 +159,9 @@
void YQSelectionBox::deselectAllItems()
{
YSelectionBox::deselectAllItems();
- _qt_listBox->clearSelection();
+ _qt_listWidget->clearSelection();
- if ( _qt_listBox->currentRow() > -1 )
+ if ( _qt_listWidget->currentRow() > -1 )
{
// Some item is selected after all; the Qt documtation says this
// happens if the QListBox is in single selection mode (which it is)
@@ -171,16 +171,16 @@
// displays. This has a small performance penalty because it calls
// YSelectionBox::deselectAllItems() again which again iterates over
// all items.
- selectItem( _qt_listBox->row(_qt_listBox->currentItem()) );
+ selectItem( _qt_listWidget->row(_qt_listWidget->currentItem()) );
}
}
void YQSelectionBox::deleteAllItems()
{
- YQSignalBlocker sigBlocker( _qt_listBox );
+ YQSignalBlocker sigBlocker( _qt_listWidget );
- _qt_listBox->clear();
+ _qt_listWidget->clear();
YSelectionBox::deleteAllItems();
}
@@ -199,8 +199,8 @@
{
int hintHeight = !_caption->isHidden() ? _caption->sizeHint().height() : 0;
int visibleLines = shrinkable() ? SHRINKABLE_VISIBLE_LINES : DEFAULT_VISIBLE_LINES;
- hintHeight += visibleLines * _qt_listBox->fontMetrics().lineSpacing();
- hintHeight += _qt_listBox->frameWidth() * 2;
+ hintHeight += visibleLines * _qt_listWidget->fontMetrics().lineSpacing();
+ hintHeight += _qt_listWidget->frameWidth() * 2;
return max( 80, hintHeight );
}
@@ -215,15 +215,15 @@
void YQSelectionBox::setEnabled( bool enabled )
{
_caption->setEnabled( enabled );
- _qt_listBox->setEnabled( enabled );
- //FIXME needed? _qt_listBox->triggerUpdate( true );
+ _qt_listWidget->setEnabled( enabled );
+ //FIXME needed? _qt_listWidget->triggerUpdate( true );
YWidget::setEnabled( enabled );
}
bool YQSelectionBox::setKeyboardFocus()
{
- _qt_listBox->setFocus();
+ _qt_listWidget->setFocus();
return true;
}
@@ -264,8 +264,8 @@
void YQSelectionBox::slotSelectionChanged()
{
- QList