summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/big-screen/owidgetstack.cpp2
-rw-r--r--libopie2/opieui/ofontselector.cpp1
-rw-r--r--libopie2/opieui/olistview.cpp20
-rw-r--r--libopie2/opieui/oselector.cpp2
-rw-r--r--libopie2/opieui/owait.cpp1
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
@@ -440,2 +440,2 @@ void OWidgetStack::switchTop() {
}
-} \ No newline at end of file
+}
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
@@ -195,2 +195,3 @@ bool OFontSelector::setSelectedFont( const QString &familyStr, const QString &st
{
+ Q_CONST_UNUSED( charset )
QString sizeStr = QString::number ( sizeVal );
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
@@ -189,3 +189,3 @@ void OListView::serializeFrom( QDataStream& s )
s >> coltext;
- odebug << "read text '" << coltext << "' for column " << i << "" << oendl;
+ odebug << "read text '" << coltext << "' for column " << i << "" << oendl;
setColumnText( i, coltext );
@@ -234,2 +234,3 @@ QDataStream& operator<<( QDataStream& s, const OListView& lv )
lv.serializeTo( s );
+ return s;
}
@@ -239,2 +240,3 @@ QDataStream& operator>>( QDataStream& s, OListView& lv )
lv.serializeFrom( s );
+ return s;
}
@@ -444,3 +446,3 @@ void OListViewItem::serializeFrom( QDataStream& s )
s >> coltext;
- odebug << "read text '" << coltext << "' for column " << i << "" << oendl;
+ odebug << "read text '" << coltext << "' for column " << i << "" << oendl;
setText( i, coltext );
@@ -450,3 +452,3 @@ void OListViewItem::serializeFrom( QDataStream& s )
s >> items;
- odebug << "read number of items = " << items << "" << oendl;
+ odebug << "read number of items = " << items << "" << oendl;
@@ -465,2 +467,3 @@ QDataStream& operator<<( QDataStream& s, const OListViewItem& lvi )
lvi.serializeTo( s );
+ return s;
}
@@ -471,2 +474,3 @@ QDataStream& operator>>( QDataStream& s, OListViewItem& lvi )
lvi.serializeFrom( s );
+ return s;
}
@@ -617,3 +621,3 @@ void ONamedListView::addColumns( const QStringList& columns )
{
- odebug << "adding column " << *it << "" << oendl;
+ odebug << "adding column " << *it << "" << oendl;
addColumn( *it );
@@ -646,3 +650,3 @@ ONamedListViewItem* ONamedListView::find( ONamedListViewItem* item, int column,
{
- odebug << "checked " << item->text( column ) << "" << oendl;
+ odebug << "checked " << item->text( column ) << "" << oendl;
@@ -650,3 +654,3 @@ ONamedListViewItem* ONamedListView::find( ONamedListViewItem* item, int column,
{
- odebug << "recursion is " << recurse << " - recursing into..." << oendl;
+ odebug << "recursion is " << recurse << " - recursing into..." << oendl;
result = find( (ONamedListViewItem*) item->firstChild(), column, text, recurse-1 );
@@ -727,3 +731,3 @@ void ONamedListViewItem::setText( const QStringList& texts )
{
- odebug << "setting column " << col << " = text " << *it << "" << oendl;
+ odebug << "setting column " << col << " = text " << *it << "" << oendl;
OListViewItem::setText( col++, *it );
@@ -743,3 +747,3 @@ void ONamedListViewItem::setText( const QString& column, const QString& text )
else
- owarn << "ONamedListViewItem::setText(): Warning! Columntext '" << column << "' not found." << oendl;
+ owarn << "ONamedListViewItem::setText(): Warning! Columntext '" << column << "' not found." << oendl;
}
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
@@ -148,2 +148,4 @@ void OXYSelector::wheelEvent( QWheelEvent *e )
emit valueChanged( xPos, yPos );
+ #else
+ Q_UNUSED( e )
#endif
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
@@ -57,2 +57,3 @@ OWait::OWait( QWidget *parent, const char* msg, bool dispIcon )
+ Q_UNUSED( dispIcon )