summaryrefslogtreecommitdiff
path: root/libopie2/opieui
Side-by-side diff
Diffstat (limited to 'libopie2/opieui') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/big-screen/osplitter.cpp25
-rw-r--r--libopie2/opieui/big-screen/owidgetstack.cpp5
-rw-r--r--libopie2/opieui/fileselector/ofileselector.cpp5
-rw-r--r--libopie2/opieui/olistview.cpp16
-rw-r--r--libopie2/opieui/opopupmenu.cpp30
-rw-r--r--libopie2/opieui/otaskbarapplet.h10
6 files changed, 50 insertions, 41 deletions
diff --git a/libopie2/opieui/big-screen/osplitter.cpp b/libopie2/opieui/big-screen/osplitter.cpp
index f0287ed..f50e7f0 100644
--- a/libopie2/opieui/big-screen/osplitter.cpp
+++ b/libopie2/opieui/big-screen/osplitter.cpp
@@ -30,6 +30,7 @@
/* OPIE */
#include <opie2/otabwidget.h>
+#include <opie2/odebug.h>
/* QT */
#include <qvaluelist.h>
@@ -81,7 +82,7 @@ OSplitter::OSplitter( Orientation orient, QWidget* parent, const char* name, WFl
*/
OSplitter::~OSplitter()
{
- qWarning("Deleted Splitter");
+ owarn << "Deleted Splitter" << oendl;
m_splitter.setAutoDelete( true );
m_splitter.clear();
@@ -210,7 +211,7 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab
#ifdef DEBUG
if (!wid )
{
- qWarning("Widget is not valid!");
+ owarn << "Widget is not valid!" << oendl;
return;
}
#endif
@@ -366,9 +367,9 @@ void OSplitter::resizeEvent( QResizeEvent* res )
/*
*
*/
- // qWarning("Old size was width = %d height = %d", res->oldSize().width(), res->oldSize().height() );
+ // owarn << "Old size was width = " << res->oldSize().width() << " height = " << res->oldSize().height() << "" << oendl;
bool mode = true;
- qWarning("New size is width = %d height = %d %s", res->size().width(), res->size().height(), name() );
+ owarn << "New size is width = " << res->size().width() << " height = " << res->size().height() << " " << name() << "" << oendl;
if ( res->size().width() > m_size_policy &&
m_orient == Horizontal )
{
@@ -385,7 +386,7 @@ void OSplitter::resizeEvent( QResizeEvent* res )
else if ( res->size().height() > m_size_policy &&
m_orient == Vertical )
{
- qWarning("Changng to vbox %s", name() );
+ owarn << "Changng to vbox " << name() << "" << oendl;
changeVBox();
mode = false;
}
@@ -444,7 +445,7 @@ void OSplitter::changeTab()
return;
}
- qWarning(" New Tab Widget %s", name() );
+ owarn << " New Tab Widget " << name() << "" << oendl;
/*
* and add all widgets this will reparent them
* delete m_hbox set it to 0
@@ -471,7 +472,7 @@ void OSplitter::changeTab()
for ( ContainerList::Iterator it = m_container.begin(); it != m_container.end(); ++it )
{
- qWarning("Widget is %s", (*it).name.latin1() );
+ owarn << "Widget is " << (*it).name << "" << oendl;
addToTab( (*it) );
}
@@ -504,7 +505,7 @@ void OSplitter::changeHBox()
return;
}
- qWarning("new HBox %s", name() );
+ owarn << "new HBox " << name() << "" << oendl;
m_hbox = new QHBox( this );
commonChangeBox();
}
@@ -517,7 +518,7 @@ void OSplitter::changeVBox()
return;
}
- qWarning("New VBOX %s", name() );
+ owarn << "New VBOX " << name() << "" << oendl;
m_hbox = new QVBox( this );
commonChangeBox();
@@ -532,14 +533,14 @@ void OSplitter::changeVBox()
*/
void OSplitter::commonChangeBox()
{
- qWarning(" Name of Splitters is %s", name() );
+ owarn << " Name of Splitters is " << name() << "" << oendl;
for (ContainerList::Iterator it = m_container.begin(); it != m_container.end(); ++it )
{
/* only if parent tab.. m_tabWidgets gets deleted and would do that as well */
if (m_parentTab )
removeFromTab( (*it).widget );
- qWarning("Adding to box %s", (*it).name.latin1() );
+ owarn << "Adding to box " << (*it).name << "" << oendl;
addToBox( (*it) );
}
for ( OSplitter* split = m_splitter.first(); split; split = m_splitter.next() )
@@ -559,7 +560,7 @@ void OSplitter::commonChangeBox()
m_parentTab->addTab(m_hbox, iconName(), label() );
else
{
- qWarning(" setting Box geometry for %s", name() );
+ owarn << " setting Box geometry for " << name() << "" << oendl;
m_hbox->setGeometry( frameRect() );
m_hbox->show();
delete m_tabWidget;
diff --git a/libopie2/opieui/big-screen/owidgetstack.cpp b/libopie2/opieui/big-screen/owidgetstack.cpp
index a0a6355..de7f83f 100644
--- a/libopie2/opieui/big-screen/owidgetstack.cpp
+++ b/libopie2/opieui/big-screen/owidgetstack.cpp
@@ -28,6 +28,9 @@
#include "owidgetstack.h"
+/* OPIE */
+#include <opie2/odebug.h>
+
/* QT */
#include <qapplication.h>
#include <qwidgetstack.h>
@@ -307,7 +310,7 @@ void OWidgetStack::hideWidget( QWidget* wid) {
bool OWidgetStack::eventFilter( QObject* obj, QEvent* e) {
- qWarning(" %s %s", obj->name(), obj->className() );
+ owarn << " " << obj->name() << " " << obj->className() << "" << oendl;
if ( e->type() == QEvent::Resize ) {
QResizeEvent *res = static_cast<QResizeEvent*>( e );
QSize size = res->size();
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index a9ec8c4..1f6ca05 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -36,6 +36,7 @@
/* OPIE */
#include <opie2/ofileselector.h>
+#include <opie2/odebug.h>
#include <qpe/qpeapplication.h>
#include <qpe/mimetype.h>
@@ -546,7 +547,7 @@ void OFileViewFileListView::slotCurrentChanged( QListViewItem* item)
// if in fileselector mode we will emit selected
if ( selector()->mode() == OFileSelector::FileSelector )
{
- qWarning("slot Current Changed");
+ owarn << "slot Current Changed" << oendl;
QStringList str = QStringList::split("->", sel->text(1) );
QString path = sel->directory() + "/" + str[0].stripWhiteSpace();
emit selector()->fileSelected( path );
@@ -574,7 +575,7 @@ void OFileViewFileListView::slotClicked(int button , QListViewItem* item, const
}
else
{ // file
- qWarning("slot Clicked");
+ owarn << "slot Clicked" << oendl;
selector()->m_lneEdit->setText( str[0].stripWhiteSpace() );
QString path = sel->directory() + "/" + str[0].stripWhiteSpace();
emit selector()->fileSelected( path );
diff --git a/libopie2/opieui/olistview.cpp b/libopie2/opieui/olistview.cpp
index d7c92fd..0b3bdea 100644
--- a/libopie2/opieui/olistview.cpp
+++ b/libopie2/opieui/olistview.cpp
@@ -187,7 +187,7 @@ void OListView::serializeFrom( QDataStream& s )
{
QString coltext;
s >> coltext;
- qDebug( "read text '%s' for column %d", (const char*) coltext, i );
+ odebug << "read text '" << coltext << "' for column " << i << "" << oendl;
setColumnText( i, coltext );
}
@@ -442,13 +442,13 @@ void OListViewItem::serializeFrom( QDataStream& s )
{
QString coltext;
s >> coltext;
- qDebug( "read text '%s' for column %d", (const char*) coltext, i );
+ odebug << "read text '" << coltext << "' for column " << i << "" << oendl;
setText( i, coltext );
}
int items;
s >> items;
- qDebug( "read number of items = %d", items );
+ odebug << "read number of items = " << items << "" << oendl;
for ( int i = 0; i < items; ++i )
{
@@ -615,7 +615,7 @@ void ONamedListView::addColumns( const QStringList& columns )
{
for ( QStringList::ConstIterator it = columns.begin(); it != columns.end(); ++it )
{
- qDebug( "adding column %s", (const char*) *it );
+ odebug << "adding column " << *it << "" << oendl;
addColumn( *it );
}
}
@@ -644,11 +644,11 @@ ONamedListViewItem* ONamedListView::find( ONamedListViewItem* item, int column,
ONamedListViewItem* result;
while ( item && item->text( column ) != text )
{
- qDebug( "checked %s", (const char*) item->text( column ) );
+ odebug << "checked " << item->text( column ) << "" << oendl;
if ( recurse < 0 || recurse > 0 )
{
- qDebug( "recursion is %d - recursing into...", recurse );
+ odebug << "recursion is " << recurse << " - recursing into..." << oendl;
result = find( (ONamedListViewItem*) item->firstChild(), column, text, recurse-1 );
if ( result ) return result;
}
@@ -725,7 +725,7 @@ void ONamedListViewItem::setText( const QStringList& texts )
int col = 0;
for ( QStringList::ConstIterator it = texts.begin(); it != texts.end(); ++it )
{
- qDebug( "setting column %d = text %s", col, (const char*) *it );
+ odebug << "setting column " << col << " = text " << *it << "" << oendl;
OListViewItem::setText( col++, *it );
}
@@ -741,7 +741,7 @@ void ONamedListViewItem::setText( const QString& column, const QString& text )
if ( col != -1 )
OListViewItem::setText( col, text );
else
- qWarning( "ONamedListViewItem::setText(): Warning! Columntext '%s' not found.", (const char*) column );
+ owarn << "ONamedListViewItem::setText(): Warning! Columntext '" << column << "' not found." << oendl;
}
diff --git a/libopie2/opieui/opopupmenu.cpp b/libopie2/opieui/opopupmenu.cpp
index 3ab8490..50c613f 100644
--- a/libopie2/opieui/opopupmenu.cpp
+++ b/libopie2/opieui/opopupmenu.cpp
@@ -17,15 +17,15 @@
Boston, MA 02111-1307, USA.
*/
-/* QT */
+/* OPIE */
+#include <opie2/opopupmenu.h>
+#include <opie2/oconfig.h>
+#include <opie2/odebug.h>
+/* QT */
#include <qdrawutil.h>
#include <qtimer.h>
-/* OPIE */
-
-#include <opie2/opopupmenu.h>
-#include <opie2/oconfig.h>
using namespace Opie::Core;
using namespace Opie::Ui;
@@ -132,7 +132,7 @@ public:
, lastHitIndex(-1)
, m_ctxMenu(0)
{}
-
+
~OPopupMenuPrivate ()
{
delete m_ctxMenu;
@@ -178,7 +178,7 @@ OPopupMenu::~OPopupMenu()
OPopupMenuPrivate::s_contextedMenu = 0;
OPopupMenuPrivate::s_highlightedItem = -1;
}
-
+
delete d;
}
@@ -209,12 +209,12 @@ void OPopupMenu::changeTitle(int id, const QString &text)
((OPopupTitle *)item->widget())->setTitle(text);
#ifndef NDEBUG
else
- qWarning( "KPopupMenu: changeTitle() called with non-title id %d", id );
+ owarn << "KPopupMenu: changeTitle() called with non-title id " << id << "" << oendl;
#endif
}
#ifndef NDEBUG
else
- qWarning( "KPopupMenu: changeTitle() called with invalid id %d", id );
+ owarn << "KPopupMenu: changeTitle() called with invalid id " << id << "" << oendl;
#endif
}
@@ -226,12 +226,12 @@ void OPopupMenu::changeTitle(int id, const QPixmap &icon, const QString &text)
((OPopupTitle *)item->widget())->setTitle(text, &icon);
#ifndef NDEBUG
else
- qWarning( "KPopupMenu: changeTitle() called with non-title id %d", id );
+ owarn << "KPopupMenu: changeTitle() called with non-title id " << id << "" << oendl;
#endif
}
#ifndef NDEBUG
else
- qWarning( "KPopupMenu: changeTitle() called with invalid id %d", id );
+ owarn << "KPopupMenu: changeTitle() called with invalid id " << id << "" << oendl;
#endif
}
@@ -244,10 +244,10 @@ QString OPopupMenu::title(int id) const
if(item->widget())
return(((OPopupTitle *)item->widget())->title());
else
- qWarning("OPopupMenu: title() called with non-title id %d.", id);
+ owarn << "OPopupMenu: title() called with non-title id " << id << "." << oendl;
}
else
- qWarning("OPopupMenu: title() called with invalid id %d.", id);
+ owarn << "OPopupMenu: title() called with invalid id " << id << "." << oendl;
return(QString::null);
}
@@ -258,10 +258,10 @@ QPixmap OPopupMenu::titlePixmap(int id) const
if(item->widget())
return(((OPopupTitle *)item->widget())->icon());
else
- qWarning("KPopupMenu: titlePixmap() called with non-title id %d.", id);
+ owarn << "KPopupMenu: titlePixmap() called with non-title id " << id << "." << oendl;
}
else
- qWarning("KPopupMenu: titlePixmap() called with invalid id %d.", id);
+ owarn << "KPopupMenu: titlePixmap() called with invalid id " << id << "." << oendl;
QPixmap tmp;
return(tmp);
}
diff --git a/libopie2/opieui/otaskbarapplet.h b/libopie2/opieui/otaskbarapplet.h
index 77cc461..75c07d1 100644
--- a/libopie2/opieui/otaskbarapplet.h
+++ b/libopie2/opieui/otaskbarapplet.h
@@ -32,9 +32,13 @@
#ifndef OTASKBARAPPLET_H
#define OTASKBARAPPLET_H
+/* OPIE */
+#include <opie2/odebug.h>
+
#include <qpe/taskbarappletinterface.h>
#include <qpe/qcom.h>
+/* QT */
#include <qwidget.h>
class QMouseEvent;
@@ -61,14 +65,14 @@ template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
QRESULT queryInterface( const QUuid& uuid, QUnknownInterface** iface )
{
- qDebug( "OTaskbarAppletWrapper::queryInterface()" );
+ odebug << "OTaskbarAppletWrapper::queryInterface()" << oendl;
*iface = 0;
if ( uuid == IID_QUnknown )
*iface = this;
else if ( uuid == IID_TaskbarApplet )
*iface = this;
- else
- return QS_FALSE;
+ else
+ return QS_FALSE;
if ( *iface ) (*iface)->addRef();
return QS_OK;