-rw-r--r-- | libopie2/opieui/big-screen/osplitter.cpp | 25 | ||||
-rw-r--r-- | libopie2/opieui/big-screen/owidgetstack.cpp | 5 | ||||
-rw-r--r-- | libopie2/opieui/fileselector/ofileselector.cpp | 5 | ||||
-rw-r--r-- | libopie2/opieui/olistview.cpp | 16 | ||||
-rw-r--r-- | libopie2/opieui/opopupmenu.cpp | 30 | ||||
-rw-r--r-- | libopie2/opieui/otaskbarapplet.h | 10 | ||||
-rw-r--r-- | libqtaux/oticker.cpp | 10 |
7 files changed, 56 insertions, 45 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 @@ -29,8 +29,9 @@ #include "osplitter.h" /* OPIE */ #include <opie2/otabwidget.h> +#include <opie2/odebug.h> /* QT */ #include <qvaluelist.h> #include <qvbox.h> @@ -80,9 +81,9 @@ OSplitter::OSplitter( Orientation orient, QWidget* parent, const char* name, WFl * @see addWidget */ OSplitter::~OSplitter() { - qWarning("Deleted Splitter"); + owarn << "Deleted Splitter" << oendl; m_splitter.setAutoDelete( true ); m_splitter.clear(); delete m_hbox; @@ -209,9 +210,9 @@ 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 OSplitterContainer cont; @@ -365,11 +366,11 @@ void OSplitter::resizeEvent( QResizeEvent* res ) QFrame::resizeEvent( 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 ) { changeHBox(); @@ -384,9 +385,9 @@ 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; } @@ -443,9 +444,9 @@ void OSplitter::changeTab() m_tabWidget->setGeometry( frameRect() ); 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 * @@ -470,9 +471,9 @@ void OSplitter::changeTab() this, SIGNAL(currentChanged(QWidget*) ) ); 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) ); } for ( OSplitter* split = m_splitter.first(); split; split = m_splitter.next() ) @@ -503,9 +504,9 @@ void OSplitter::changeHBox() m_hbox->setGeometry( frameRect() ); return; } - qWarning("new HBox %s", name() ); + owarn << "new HBox " << name() << "" << oendl; m_hbox = new QHBox( this ); commonChangeBox(); } @@ -516,9 +517,9 @@ void OSplitter::changeVBox() m_hbox->setGeometry( frameRect() ); return; } - qWarning("New VBOX %s", name() ); + owarn << "New VBOX " << name() << "" << oendl; m_hbox = new QVBox( this ); commonChangeBox(); @@ -531,16 +532,16 @@ void OSplitter::changeVBox() * it is recursive as well due the call to setTabWidget */ 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() ) { @@ -558,9 +559,9 @@ void OSplitter::commonChangeBox() if (m_parentTab ) 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; m_tabWidget = 0; 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 @@ -27,8 +27,11 @@ */ #include "owidgetstack.h" +/* OPIE */ +#include <opie2/odebug.h> + /* QT */ #include <qapplication.h> #include <qwidgetstack.h> @@ -306,9 +309,9 @@ 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(); if ( size.width() >= mode_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 @@ -35,8 +35,9 @@ #include "ofileselector_p.h" /* OPIE */ #include <opie2/ofileselector.h> +#include <opie2/odebug.h> #include <qpe/qpeapplication.h> #include <qpe/mimetype.h> #include <qpe/resource.h> @@ -545,9 +546,9 @@ void OFileViewFileListView::slotCurrentChanged( QListViewItem* item) selector()->m_lneEdit->setText( sel->text(1) ); // 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 ); DocLnk lnk( path ); @@ -573,9 +574,9 @@ void OFileViewFileListView::slotClicked(int button , QListViewItem* item, const reread( m_all ); } 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 ); DocLnk lnk( 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 @@ -186,9 +186,9 @@ void OListView::serializeFrom( QDataStream& s ) for ( int i = 0; i < cols; ++i ) { 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 ); } int items; @@ -441,15 +441,15 @@ void OListViewItem::serializeFrom( QDataStream& s ) for ( int i = 0; i < listView()->columns(); ++i ) { 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 ) { OListViewItem* item = childFactory(); @@ -614,9 +614,9 @@ ONamedListView::~ONamedListView() 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 ); } } @@ -643,13 +643,13 @@ 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; } @@ -724,9 +724,9 @@ 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 ); } } @@ -740,9 +740,9 @@ void ONamedListViewItem::setText( const QString& column, const QString& text ) int col = ( (ONamedListView*) listView() )->findColumn( column ); 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; } ONamedListViewItem* ONamedListViewItem::find( int column, const QString& text, int recurse ) const 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 @@ -16,17 +16,17 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 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; @@ -131,9 +131,9 @@ public: , autoExec(false) , lastHitIndex(-1) , m_ctxMenu(0) {} - + ~OPopupMenuPrivate () { delete m_ctxMenu; } @@ -177,9 +177,9 @@ OPopupMenu::~OPopupMenu() { OPopupMenuPrivate::s_contextedMenu = 0; OPopupMenuPrivate::s_highlightedItem = -1; } - + delete d; } int OPopupMenu::insertTitle(const QString &text, int id, int index) @@ -208,14 +208,14 @@ void OPopupMenu::changeTitle(int id, const QString &text) if(item->widget()) ((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 } void OPopupMenu::changeTitle(int id, const QPixmap &icon, const QString &text) @@ -225,14 +225,14 @@ void OPopupMenu::changeTitle(int id, const QPixmap &icon, const QString &text) if(item->widget()) ((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 } QString OPopupMenu::title(int id) const @@ -243,12 +243,12 @@ QString OPopupMenu::title(int id) const if(item){ 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); } QPixmap OPopupMenu::titlePixmap(int id) const @@ -257,12 +257,12 @@ QPixmap OPopupMenu::titlePixmap(int id) const if(item){ 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 @@ -31,11 +31,15 @@ #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; @@ -60,16 +64,16 @@ 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; } diff --git a/libqtaux/oticker.cpp b/libqtaux/oticker.cpp index e954cc8..29478fd 100644 --- a/libqtaux/oticker.cpp +++ b/libqtaux/oticker.cpp @@ -30,8 +30,10 @@ #include "oticker.h" /* OPIE */ +#include <opie2/odebug.h> + #include <qpe/config.h> using namespace Opie::Ui; @@ -71,16 +73,16 @@ void OTicker::setFrame( int frameStyle ) void OTicker::setText( const QString& text ) { pos = 0; // reset it everytime the text is changed scrollText = text; - qDebug( scrollText ); + odebug << scrollText << oendl; int pixelLen = 0; bool bigger = false; int contWidth = contentsRect().width(); int contHeight = contentsRect().height(); int pixelTextLen = fontMetrics().width( text ); - qDebug( "<<<<<<<height %d, width %d, text width %d %d\n", contHeight, contWidth, pixelTextLen, scrollText.length() ); + odebug << "<<<<<<<height " << contHeight << ", width " << contWidth << ", text width " << pixelTextLen << " " << scrollText.length() << "\n" << oendl; if ( pixelTextLen < contWidth ) { pixelLen = contWidth; } @@ -99,9 +101,9 @@ void OTicker::setText( const QString& text ) pmp.end(); scrollTextPixmap = pm; killTimers(); - // qDebug("Scrollupdate %d", updateTimerTime); + // odebug << "Scrollupdate " << updateTimerTime << "" << oendl; if ( bigger /*pixelTextLen > contWidth*/ ) startTimer( updateTimerTime ); update(); } @@ -122,9 +124,9 @@ void OTicker::drawContents( QPainter *p ) } void OTicker::mouseReleaseEvent( QMouseEvent * ) { - // qDebug("<<<<<<<>>>>>>>>>"); + // odebug << "<<<<<<<>>>>>>>>>" << oendl; emit mousePressed(); } void OTicker::setUpdateTime( int time ) |