-rw-r--r-- | libopie2/opieui/big-screen/owidgetstack.cpp | 2 | ||||
-rw-r--r-- | libopie2/opieui/ofontselector.cpp | 1 | ||||
-rw-r--r-- | libopie2/opieui/olistview.cpp | 20 | ||||
-rw-r--r-- | libopie2/opieui/oselector.cpp | 2 | ||||
-rw-r--r-- | libopie2/opieui/owait.cpp | 1 |
5 files changed, 17 insertions, 9 deletions
diff --git a/libopie2/opieui/big-screen/owidgetstack.cpp b/libopie2/opieui/big-screen/owidgetstack.cpp index de7f83f..9c9f7ec 100644 --- a/libopie2/opieui/big-screen/owidgetstack.cpp +++ b/libopie2/opieui/big-screen/owidgetstack.cpp | |||
@@ -438,4 +438,4 @@ void OWidgetStack::switchTop() { | |||
438 | } | 438 | } |
439 | 439 | ||
440 | } | 440 | } |
441 | } \ No newline at end of file | 441 | } |
diff --git a/libopie2/opieui/ofontselector.cpp b/libopie2/opieui/ofontselector.cpp index 6763ee6..4870cd9 100644 --- a/libopie2/opieui/ofontselector.cpp +++ b/libopie2/opieui/ofontselector.cpp | |||
@@ -193,6 +193,7 @@ bool OFontSelector::setSelectedFont ( const QFont &f ) | |||
193 | */ | 193 | */ |
194 | bool OFontSelector::setSelectedFont( const QString &familyStr, const QString &styleStr, int sizeVal, const QString & charset ) | 194 | bool OFontSelector::setSelectedFont( const QString &familyStr, const QString &styleStr, int sizeVal, const QString & charset ) |
195 | { | 195 | { |
196 | Q_CONST_UNUSED( charset ) | ||
196 | QString sizeStr = QString::number ( sizeVal ); | 197 | QString sizeStr = QString::number ( sizeVal ); |
197 | 198 | ||
198 | QListBoxItem *family = d->m_font_family_list->findItem ( familyStr ); | 199 | QListBoxItem *family = d->m_font_family_list->findItem ( familyStr ); |
diff --git a/libopie2/opieui/olistview.cpp b/libopie2/opieui/olistview.cpp index b90c786..67b4b83 100644 --- a/libopie2/opieui/olistview.cpp +++ b/libopie2/opieui/olistview.cpp | |||
@@ -187,7 +187,7 @@ void OListView::serializeFrom( QDataStream& s ) | |||
187 | { | 187 | { |
188 | QString coltext; | 188 | QString coltext; |
189 | s >> coltext; | 189 | s >> coltext; |
190 | odebug << "read text '" << coltext << "' for column " << i << "" << oendl; | 190 | odebug << "read text '" << coltext << "' for column " << i << "" << oendl; |
191 | setColumnText( i, coltext ); | 191 | setColumnText( i, coltext ); |
192 | } | 192 | } |
193 | 193 | ||
@@ -232,11 +232,13 @@ void OListView::collapse() | |||
232 | QDataStream& operator<<( QDataStream& s, const OListView& lv ) | 232 | QDataStream& operator<<( QDataStream& s, const OListView& lv ) |
233 | { | 233 | { |
234 | lv.serializeTo( s ); | 234 | lv.serializeTo( s ); |
235 | return s; | ||
235 | } | 236 | } |
236 | 237 | ||
237 | QDataStream& operator>>( QDataStream& s, OListView& lv ) | 238 | QDataStream& operator>>( QDataStream& s, OListView& lv ) |
238 | { | 239 | { |
239 | lv.serializeFrom( s ); | 240 | lv.serializeFrom( s ); |
241 | return s; | ||
240 | } | 242 | } |
241 | #endif // QT_NO_DATASTREAM | 243 | #endif // QT_NO_DATASTREAM |
242 | 244 | ||
@@ -442,13 +444,13 @@ void OListViewItem::serializeFrom( QDataStream& s ) | |||
442 | { | 444 | { |
443 | QString coltext; | 445 | QString coltext; |
444 | s >> coltext; | 446 | s >> coltext; |
445 | odebug << "read text '" << coltext << "' for column " << i << "" << oendl; | 447 | odebug << "read text '" << coltext << "' for column " << i << "" << oendl; |
446 | setText( i, coltext ); | 448 | setText( i, coltext ); |
447 | } | 449 | } |
448 | 450 | ||
449 | int items; | 451 | int items; |
450 | s >> items; | 452 | s >> items; |
451 | odebug << "read number of items = " << items << "" << oendl; | 453 | odebug << "read number of items = " << items << "" << oendl; |
452 | 454 | ||
453 | for ( int i = 0; i < items; ++i ) | 455 | for ( int i = 0; i < items; ++i ) |
454 | { | 456 | { |
@@ -463,12 +465,14 @@ void OListViewItem::serializeFrom( QDataStream& s ) | |||
463 | QDataStream& operator<<( QDataStream& s, const OListViewItem& lvi ) | 465 | QDataStream& operator<<( QDataStream& s, const OListViewItem& lvi ) |
464 | { | 466 | { |
465 | lvi.serializeTo( s ); | 467 | lvi.serializeTo( s ); |
468 | return s; | ||
466 | } | 469 | } |
467 | 470 | ||
468 | 471 | ||
469 | QDataStream& operator>>( QDataStream& s, OListViewItem& lvi ) | 472 | QDataStream& operator>>( QDataStream& s, OListViewItem& lvi ) |
470 | { | 473 | { |
471 | lvi.serializeFrom( s ); | 474 | lvi.serializeFrom( s ); |
475 | return s; | ||
472 | } | 476 | } |
473 | #endif // QT_NO_DATASTREAM | 477 | #endif // QT_NO_DATASTREAM |
474 | 478 | ||
@@ -615,7 +619,7 @@ void ONamedListView::addColumns( const QStringList& columns ) | |||
615 | { | 619 | { |
616 | for ( QStringList::ConstIterator it = columns.begin(); it != columns.end(); ++it ) | 620 | for ( QStringList::ConstIterator it = columns.begin(); it != columns.end(); ++it ) |
617 | { | 621 | { |
618 | odebug << "adding column " << *it << "" << oendl; | 622 | odebug << "adding column " << *it << "" << oendl; |
619 | addColumn( *it ); | 623 | addColumn( *it ); |
620 | } | 624 | } |
621 | } | 625 | } |
@@ -644,11 +648,11 @@ ONamedListViewItem* ONamedListView::find( ONamedListViewItem* item, int column, | |||
644 | ONamedListViewItem* result; | 648 | ONamedListViewItem* result; |
645 | while ( item && item->text( column ) != text ) | 649 | while ( item && item->text( column ) != text ) |
646 | { | 650 | { |
647 | odebug << "checked " << item->text( column ) << "" << oendl; | 651 | odebug << "checked " << item->text( column ) << "" << oendl; |
648 | 652 | ||
649 | if ( recurse < 0 || recurse > 0 ) | 653 | if ( recurse < 0 || recurse > 0 ) |
650 | { | 654 | { |
651 | odebug << "recursion is " << recurse << " - recursing into..." << oendl; | 655 | odebug << "recursion is " << recurse << " - recursing into..." << oendl; |
652 | result = find( (ONamedListViewItem*) item->firstChild(), column, text, recurse-1 ); | 656 | result = find( (ONamedListViewItem*) item->firstChild(), column, text, recurse-1 ); |
653 | if ( result ) return result; | 657 | if ( result ) return result; |
654 | } | 658 | } |
@@ -725,7 +729,7 @@ void ONamedListViewItem::setText( const QStringList& texts ) | |||
725 | int col = 0; | 729 | int col = 0; |
726 | for ( QStringList::ConstIterator it = texts.begin(); it != texts.end(); ++it ) | 730 | for ( QStringList::ConstIterator it = texts.begin(); it != texts.end(); ++it ) |
727 | { | 731 | { |
728 | odebug << "setting column " << col << " = text " << *it << "" << oendl; | 732 | odebug << "setting column " << col << " = text " << *it << "" << oendl; |
729 | OListViewItem::setText( col++, *it ); | 733 | OListViewItem::setText( col++, *it ); |
730 | } | 734 | } |
731 | 735 | ||
@@ -741,7 +745,7 @@ void ONamedListViewItem::setText( const QString& column, const QString& text ) | |||
741 | if ( col != -1 ) | 745 | if ( col != -1 ) |
742 | OListViewItem::setText( col, text ); | 746 | OListViewItem::setText( col, text ); |
743 | else | 747 | else |
744 | owarn << "ONamedListViewItem::setText(): Warning! Columntext '" << column << "' not found." << oendl; | 748 | owarn << "ONamedListViewItem::setText(): Warning! Columntext '" << column << "' not found." << oendl; |
745 | } | 749 | } |
746 | 750 | ||
747 | 751 | ||
diff --git a/libopie2/opieui/oselector.cpp b/libopie2/opieui/oselector.cpp index 5f6f10f..05543c5 100644 --- a/libopie2/opieui/oselector.cpp +++ b/libopie2/opieui/oselector.cpp | |||
@@ -146,6 +146,8 @@ void OXYSelector::wheelEvent( QWheelEvent *e ) | |||
146 | setValues( xValue(), yValue() + e->delta()/120 ); | 146 | setValues( xValue(), yValue() + e->delta()/120 ); |
147 | 147 | ||
148 | emit valueChanged( xPos, yPos ); | 148 | emit valueChanged( xPos, yPos ); |
149 | #else | ||
150 | Q_UNUSED( e ) | ||
149 | #endif | 151 | #endif |
150 | } | 152 | } |
151 | 153 | ||
diff --git a/libopie2/opieui/owait.cpp b/libopie2/opieui/owait.cpp index 9519888..ec1f25a 100644 --- a/libopie2/opieui/owait.cpp +++ b/libopie2/opieui/owait.cpp | |||
@@ -55,6 +55,7 @@ OWait::OWait( QWidget *parent, const char* msg, bool dispIcon ) | |||
55 | :QDialog( parent, msg, TRUE, WStyle_Customize ) | 55 | :QDialog( parent, msg, TRUE, WStyle_Customize ) |
56 | { | 56 | { |
57 | 57 | ||
58 | Q_UNUSED( dispIcon ) | ||
58 | 59 | ||
59 | QHBoxLayout * hbox = new QHBoxLayout( this ); | 60 | QHBoxLayout * hbox = new QHBoxLayout( this ); |
60 | 61 | ||