convert core/applets/* to Opie debug framework

12 files changed, 100 insertions, 89 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 1ad8b55..3a6ad27 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -10,55 +10,51 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "cardmon.h"
 
 /* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/odevice.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 
 /* QT */
 #include <qcopchannel_qws.h>
 #include <qpainter.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qsound.h>
 #include <qtimer.h>
 
 /* STD */
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
-
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 
-using namespace Opie;
-
-using namespace Opie::Ui;
-using namespace Opie::Ui;
-using namespace Opie::Core;
-
 CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ),
         pm( Resource::loadPixmap( "cardmon/pcmcia" ) )
 {
 
     QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
     connect( pcmciaChannel,
              SIGNAL( received(const QCString&,const QByteArray&) ), this,
              SLOT( cardMessage(const QCString&,const QByteArray&) ) );
 
     QCopChannel *sdChannel = new QCopChannel( "QPE/Card", this );
     connect( sdChannel,
              SIGNAL( received(const QCString&,const QByteArray&) ), this,
@@ -188,30 +184,30 @@ void CardMonitor::mousePressEvent( QMouseEvent * )
                     err );
             popUp( tr( "CF/PCMCIA card eject failed!" ) );
         }
     }
     delete menu;
 }
 
 
 void CardMonitor::cardMessage( const QCString & msg, const QByteArray & )
 {
     if ( msg == "stabChanged()" )
     {
-        // qDebug("Pcmcia: stabchanged");
+        // odebug << "Pcmcia: stabchanged" << oendl;
         getStatusPcmcia();
     }
     else if ( msg == "mtabChanged()" )
     {
-        // qDebug("CARDMONAPPLET: mtabchanged");
+        // odebug << "CARDMONAPPLET: mtabchanged" << oendl;
         getStatusSd();
     }
 }
 
 bool CardMonitor::getStatusPcmcia( int showPopUp )
 {
 
     bool cardWas0 = cardInPcmcia0;	// remember last state
     bool cardWas1 = cardInPcmcia1;
 
     QString fileName;
 
@@ -322,25 +318,25 @@ bool CardMonitor::getStatusPcmcia( int showPopUp )
                 text += cardInPcmcia1Name;
                 popUp( text, "cardmon/" + cardInPcmcia1Type );
             }
 #ifndef QT_NO_SOUND
             QSound::play( Resource::findSound( "cardmon/card" + what ) );
 #endif
 
         }
     }
     else
     {
         // no file found
-        qDebug( "no file found" );
+        odebug << "no file found" << oendl;
         cardInPcmcia0 = FALSE;
         cardInPcmcia1 = FALSE;
     }
     repaint( FALSE );
     return ( ( cardWas0 == cardInPcmcia0
                && cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE );
 
 }
 
 
 bool CardMonitor::getStatusSd( int showPopUp )
 {
@@ -348,25 +344,25 @@ bool CardMonitor::getStatusSd( int showPopUp )
     bool cardWas = cardInSd;	// remember last state
     cardInSd = FALSE;
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
     struct mntent *me;
     FILE *mntfp = setmntent( "/etc/mtab", "r" );
 
     if ( mntfp )
     {
         while ( ( me = getmntent( mntfp ) ) != 0 )
         {
             QString fs = me->mnt_fsname;
-            //qDebug( fs );
+            //odebug << fs << oendl;
             if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd"
                     || fs.left( 9 ) == "/dev/mmcd" )
             {
                 cardInSd = TRUE;
                 show();
             }
             //            else {
             //                 cardInSd = FALSE;
             //             }
         }
         endmntent( mntfp );
     }
@@ -376,25 +372,25 @@ bool CardMonitor::getStatusSd( int showPopUp )
         QString text = QString::null;
         QString what = QString::null;
         if ( cardInSd )
         {
             text += "New card: SD/MMC";
             what = "on";
         }
         else
         {
             text += "Ejected: SD/MMC";
             what = "off";
         }
-        //qDebug("TEXT: " + text );
+        //odebug << "TEXT: " + text << oendl;
 #ifndef QT_NO_SOUND
         QSound::play( Resource::findSound( "cardmon/card" + what ) );
 #endif
         popUp( text, "cardmon/ide" );	// XX add SD pic
     }
 #else
 #error "Not on Linux"
 #endif
     repaint( FALSE );
     return ( ( cardWas == cardInSd ) ? FALSE : TRUE );
 }
 
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp
index 3b13d74..7d396e7 100644
--- a/core/applets/clockapplet/clock.cpp
+++ b/core/applets/clockapplet/clock.cpp
@@ -11,30 +11,34 @@
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "clock.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 
+using namespace Opie::Core;
 using namespace Opie::Ui;
+
 LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
 {
     // If you want a sunken border around the clock do this:
     // setFrameStyle( QFrame::Panel | QFrame::Sunken );
     //setFont( QFont( "Helvetica", , QFont::Normal ) );
     connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime() ) );
     connect( qApp, SIGNAL( clockChanged(bool) ),
        this, SLOT( slotClockChanged(bool) ) );
     readConfig();
     timerId = 0;
     timerEvent( 0 );
     show();
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index 2196d18..7122b40 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -198,37 +198,37 @@ void IrdaApplet::showDiscovered ( )
 		QMap <QString, QString>::Iterator it;
 
 		for ( it = m_devices. begin ( ); it != m_devices. end ( ); ++it )
 			it. data ( ). prepend ( "+++" );
 
 		for ( QStringList::Iterator lit = list. begin ( ); lit != list. end ( ); ++lit ) {
 			const QString &line = *lit;
 
 			if ( line. startsWith ( "nickname:" )) {
 				discoveredDevice = line. mid ( line. find ( ':' ) + 2, line. find ( ',' ) - line. find ( ':' ) - 2 );
 				deviceAddr       = line. mid ( line. find ( "daddr:" ) + 9, 8 );
 
-				// qDebug(discoveredDevice + "(" + deviceAddr + ")");
+				// odebug << discoveredDevice + "(" + deviceAddr + ")" << oendl; 
 
 				if ( !m_devices. contains ( deviceAddr )) {
 					popup ( tr( "Found:" ) + " " + discoveredDevice );
 					//snd_found. play ( );
 					qcopsend = true;
 				}
 				m_devices. replace ( deviceAddr, discoveredDevice );
 			}
 		}
 
 		for ( it = m_devices. begin ( ); it != m_devices. end ( ); ) {
-			// qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?");
+			// odebug << "IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?" << oendl; 
 
 			if ( it. data ( ). left ( 3 ) == "+++" ) {
 				popup ( tr( "Lost:" ) + " " + it. data ( ). mid ( 3 ));
 				//snd_lost. play ( );
 
 				QMap <QString, QString>::Iterator tmp = it;
 				tmp++;
 				m_devices. remove ( it ); // in contrast to QValueListIterator this remove doesn't return the next Iterator
 				it = tmp;
 
 				qcopsend = true;
 			}
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp
index 195ada5..195d8a4 100644
--- a/core/applets/multikeyapplet/multikey.cpp
+++ b/core/applets/multikeyapplet/multikey.cpp
@@ -59,25 +59,25 @@ void Multikey::mousePressEvent(QMouseEvent *ev)
         setText(labels[lang]);
     }
     QWidget::mousePressEvent(ev);
 }
 
 void Multikey::mouseReleaseEvent(QMouseEvent *ev)
 {
     if (!sw_maps.count())
 	return;
 
     lang = lang < sw_maps.count()-1 ? lang+1 : 0;
     QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)");
-    //qDebug("Lang=%d, count=%d, lab=%s", lang, sw_maps.count(), labels[lang].ascii());
+    //odebug << "Lang=" << lang << ", count=" << sw_maps.count() << ", lab=" << labels[lang].ascii() << "" << oendl; 
     e << sw_maps[lang];
     setText(labels[lang]);
 }
 
 void Multikey::message(const QCString &message, const QByteArray &data)
 {
     if ( message == "setsw(QString,QString)" ) {
 
 	QDataStream stream(data, IO_ReadOnly);
 	QString maps, current_map;
 	stream >> maps >> current_map;
 	QStringList sw = QStringList::split(QChar('|'), maps);
diff --git a/core/applets/restartapplet/restart.cpp b/core/applets/restartapplet/restart.cpp
index 226c2a8..2e17608 100644
--- a/core/applets/restartapplet/restart.cpp
+++ b/core/applets/restartapplet/restart.cpp
@@ -44,29 +44,27 @@ static char *restart_xpm[] = {
 " .--+$&*=&$+--. ",
 "  .$#++$$++#$.  ",
 " .@=$-$++$-$=@. ",
 " .+@-..@@..-@+. ",
 "  ... .+=. ...  ",
 "      .-$.      ",
 "       ..       ",
 "                "};
 RestartApplet::RestartApplet( QWidget *parent, const char *name )
     : QWidget( parent, name ) {
       setFixedHeight( 18 );
       setFixedWidth( 16 );
-    qDebug("new restartapplet");
     show();
 }
 
 RestartApplet::~RestartApplet() {
 }
 
 void RestartApplet::mousePressEvent( QMouseEvent *) {
     QCopEnvelope e("QPE/System", "restart()");
 }
 
 void RestartApplet::paintEvent( QPaintEvent* ) {
       QPainter p(this);
-      qDebug("paint RESTART pixmap");
       p.drawPixmap( 0, 1,  ( const char** ) restart_xpm );
 }
 
diff --git a/core/applets/restartapplet/restartappletimpl.cpp b/core/applets/restartapplet/restartappletimpl.cpp
index d8e10d3..3adc80c 100644
--- a/core/applets/restartapplet/restartappletimpl.cpp
+++ b/core/applets/restartapplet/restartappletimpl.cpp
@@ -24,25 +24,24 @@
 RestartAppletImpl::RestartAppletImpl()
     : restart(0)
 {
 }
 
 RestartAppletImpl::~RestartAppletImpl()
 {
     delete restart;
 }
 
 QWidget *RestartAppletImpl::applet( QWidget *parent )
 {
-    qDebug("restart applet");
     if ( !restart )
         restart = new RestartApplet( parent );
     return restart;
 }
 
 int RestartAppletImpl::position() const
 {
     return 6;
 }
 
 QRESULT RestartAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index f621aa9..f23423d 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -22,24 +22,25 @@
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=            this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #include "rotate.h"
 
 /* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/odevice.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 using namespace Opie::Core;
 
 /* QT */
 
 #include <time.h>
 
 RotateApplet::RotateApplet()
@@ -53,59 +54,59 @@ RotateApplet::RotateApplet()
 #endif
 
 }
 
 RotateApplet::~RotateApplet ( )
 {}
 
 /**
  * Qcop receive method.
  */
 void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data )
 {
-    qDebug( "RotateApplet::channelReceived( '%s' )", (const char*) msg );
+    odebug << "RotateApplet::channelReceived( '" <<  msg << "' )" << oendl;
 
     if ( ODevice::inst()->hasHingeSensor() )
     {
         struct timespec interval;
         struct timespec remain;
         interval.tv_sec = 0;
         interval.tv_nsec = 600000;
         ::nanosleep( &interval, &remain );
         OHingeStatus status = ODevice::inst()->readHingeSensor();
-        qDebug( "RotateApplet::readHingeSensor = %d", (int) status );
+        odebug << "RotateApplet::readHingeSensor = " << (int) status << "" << oendl;
 
         Config cfg( "apm" );
         cfg.setGroup( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ? "AC" : "Battery" );
         int action = cfg.readNumEntry( "CloseHingeAction", 0 );
 
         if ( status == CASE_CLOSED )
         {
             switch ( action )
             {
                 case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 0 ); break;
                 case 2: /* SUSPEND */ ODevice::inst()->suspend(); break;
                 default: /* IGNORE */ break;
             }
         }
         else /* status != CASE_CLOSED */
         {
             switch ( action )
             {
                 case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 127 ); break;
                 case 2: /* SUSPEND */ /* How to wake up the device from kernel? */; break;
                 default: /* IGNORE */ break;
             }
         }
-        qDebug( "RotateApplet::switchAction %d performed.", cfg.readNumEntry( "CloseHingeAction", 0 ) );
+        odebug << "RotateApplet::switchAction " << cfg.readNumEntry( "CloseHingeAction" ) << " performed." << oendl;
     }
 
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "flip()" )
     {
         activated ( );
     }
     else if ( msg == "rotateDefault()")
     {
         rotateDefault();
     }
 }
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp
index 9aa012a..938ea0c 100644
--- a/core/applets/screenshotapplet/screenshot.cpp
+++ b/core/applets/screenshotapplet/screenshot.cpp
@@ -7,48 +7,50 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "screenshot.h"
 #include "inputDialog.h"
 
 /* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 
 /* QT */
 #include <qlineedit.h>
 #include <qdir.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qpainter.h>
 #include <qspinbox.h>
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qmessagebox.h>
 
 /* STD */
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <unistd.h>
 
 /* XPM */
-using namespace Opie::Ui;
 static char * snapshot_xpm[] = {
 "32 32 177 2",
 "  	c None",
 ". 	c #042045",
 "+ 	c #0D2B47",
 "@ 	c #0E325E",
 "# 	c #0D2E50",
 "$ 	c #0A1C32",
 "% 	c #0F3A69",
 "& 	c #164680",
 "* 	c #165EAE",
 "= 	c #134D89",
@@ -353,83 +355,83 @@ void ScreenshotControl::savePixmap()
 {
   DocLnk lnk;
   QString fileName;
 
   if ( setFileName) {
     fileName = FileNamePath;
     //not sure why this is needed here, but it forgets fileName
     // if this is below the braces
 
     if (fileName.right(3) != "png")
       fileName = fileName + ".png";
     lnk.setFile(fileName); //sets File property
-    qDebug("saving file " + fileName);
+    odebug << "saving file " + fileName << oendl;
     snapshot.save( fileName, "PNG");
     QFileInfo fi( fileName);
     lnk.setName( fi.fileName()); //sets file name
 
     if (!lnk.writeLink())
-      qDebug("Writing doclink did not work");
+      odebug << "Writing doclink did not work" << oendl;
   }
   else {
 
     fileName = "sc_" + QDateTime::currentDateTime().toString();
     fileName.replace(QRegExp("'"), "");
     fileName.replace(QRegExp(" "), "_");
     fileName.replace(QRegExp(":"), ".");
     fileName.replace(QRegExp(","), "");
     QString dirName = QDir::homeDirPath() + "/Documents/image/png/";
 
     if ( !QDir( dirName).exists() ) {
-      qDebug("making dir " + dirName);
+      odebug << "making dir " + dirName << oendl;
       QString msg = "mkdir -p " + dirName;
       system(msg.latin1());
     }
     fileName = dirName + fileName;
     if (fileName.right(3) != "png")
       fileName = fileName + ".png";
     lnk.setFile(fileName); //sets File property
-    qDebug("saving file " + fileName);
+    odebug << "saving file " + fileName << oendl;
     snapshot.save( fileName, "PNG");
     QFileInfo fi( fileName);
     lnk.setName( fi.fileName()); //sets file name
 
     if (!lnk.writeLink())
-      qDebug("Writing doclink did not work");
+      odebug << "Writing doclink did not work" << oendl;
 
   }
 
   QPEApplication::beep();
 }
 
 void ScreenshotControl::performGrab()
 {
 		snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(),  QApplication::desktop()->height() );
 
 		if (buttonPushed == 1) {
-				qDebug("grabbing screen");
+                odebug << "grabbing screen" << oendl;
 				grabTimer->stop();
 				show();
 				qApp->processEvents();
 				savePixmap();
 		} else {
 				grabTimer->stop();
 
 				struct sockaddr_in raddr;
 				struct hostent *rhost_info;
 				int sock = -1;
 				bool ok = false;
 
 				QString displayEnv = getenv("QWS_DISPLAY");
-				qDebug(displayEnv);
+                odebug << displayEnv << oendl;
 
 				if(( displayEnv.left(2) != ":0" ) && (!displayEnv.isEmpty())) {
 
 						if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) {
 						::memset ( &raddr, 0, sizeof (struct sockaddr_in));
 						::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length );
 						raddr. sin_family = rhost_info-> h_addrtype;
 						raddr. sin_port = htons ( SCAP_port );
 
 						if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 ) {
 								if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) {
 
@@ -448,25 +450,25 @@ void ScreenshotControl::performGrab()
 												pix = ( snapshot.width() > snapshot.height() ) ? snapshot : snapshot.xForm( QWMatrix().rotate(90) ); 
 									
 										QImage img = pix.convertToImage().convertDepth( 16 ); // could make that also depth independent, if hh.org/scap can handle it
 
 										header = "POST /scap/capture.cgi?%1+%2 HTTP/1.1\n"  // 1: model / 2: user
 												"Content-length: %3\n"                     // 3: content length
 												"Content-Type: image/png\n"
 												"Host: %4\n"                               // 4: scap host
 												"\n";
 
 		 
 										header = header.arg( SCAP_model).arg( ::getenv( "USER" ) ).arg( img.numBytes() ).arg( SCAP_hostname );
-										qDebug(header);
+                                        odebug << header << oendl;
 					
 										if ( !pix.isNull() )  {
 												const char *ascii = header.latin1( );
 												uint ascii_len = ::strlen( ascii );
  												::write ( sock, ascii, ascii_len );
  												::write ( sock, img.bits(), img.numBytes() );
 
 												ok = true;
 										}
 								}
 								::close ( sock );
 						}
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 7dd5b4b..622b1df 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -3,24 +3,28 @@
  ** This file may be distributed and/or modified under the terms of the
  ** GNU General Public License version 2 as published by the Free Software
  ** Foundation and appearing in the file LICENSE.GPL included in the
  ** packaging of this file.
  **
  ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
  ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  **
  ************************************************************************************/
 // copyright 2002 Jeremy Cowgar <jc@cowgar.com>
 // copyright 2002 and 2003  L.J.Potter <ljp@llornkcor.com>
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 extern "C" {
 #include "adpcm.h"
 }
 
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <linux/soundcard.h>
 
 #include <errno.h>
 
@@ -198,25 +202,25 @@ VMemo::VMemo( QWidget *parent, const char *_name )
   : QWidget( parent, _name ) {
   setFixedHeight( 18 );
   setFixedWidth( 14 );
   
   t_timer = new QTimer( this );
   connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) );
   
     Config vmCfg("Vmemo");
     vmCfg.setGroup("Defaults");
     int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1));
     useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
 
-    qDebug("toggleKey %d", toggleKey);
+    odebug << "toggleKey " << toggleKey << "" << oendl;
     if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
          systemZaurus=TRUE;
     else 
       systemZaurus=FALSE;
       
     myChannel = new QCopChannel( "QPE/VMemo", this );
     connect( myChannel, SIGNAL(received(const QCString&,const QByteArray&)),
              this, SLOT(receive(const QCString&,const QByteArray&)) );
 
     if( toggleKey != -1 ) {
       // keyRegister(key, channel, message)
       QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)");
@@ -236,25 +240,25 @@ VMemo::VMemo( QWidget *parent, const char *_name )
     // }
 }
 
 VMemo::~VMemo() {
 }
 
 int VMemo::position()
 {
     return 6;
 }
 
 void VMemo::receive( const QCString &msg, const QByteArray &data ) {
-  qDebug("receive");
+  odebug << "receive" << oendl;
   QDataStream stream( data, IO_ReadOnly );
 
   if (msg == "toggleRecord()")  {
       if (recording) {
           fromToggle = TRUE;
           stopRecording();
       }  else {
           fromToggle = TRUE;
           startRecording();
       }
   }
 }
@@ -284,63 +288,63 @@ void VMemo::mouseReleaseEvent( QMouseEvent * ) {
 bool VMemo::startRecording() {
   Config config( "Vmemo" );
   config.setGroup( "System" );
 
   useAlerts = config.readBoolEntry("Alert",1);
   if(useAlerts) {
 
     msgLabel = new QLabel( 0, "alertLabel" );
     msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>");
     msgLabel->show();
   }
 
-  qDebug("Start recording engines");
+  odebug << "Start recording engines" << oendl;
   recording = TRUE;
 
   if (openDSP() == -1)  {
     recording = FALSE;
     return FALSE;
   }
   
   config.setGroup("Defaults");
 
   date = TimeString::dateString( QDateTime::currentDateTime(),false,true);
   date.replace(QRegExp("'"),"");
   date.replace(QRegExp(" "),"_");
   date.replace(QRegExp(":"),".");
   date.replace(QRegExp(","),"");
 
   QString fName;
   config.setGroup( "System" );
   fName = QPEApplication::documentDir() ;
   fileName = config.readEntry("RecLocation", fName);
 
   int s;
   s=fileName.find(':');
   if(s)
     fileName=fileName.right(fileName.length()-s-2);
-  qDebug("pathname will be "+fileName);   
+  odebug << "pathname will be "+fileName << oendl;
 
   if( fileName.left(1).find('/') == -1)
     fileName="/"+fileName;
   if( fileName.right(1).find('/') == -1)
     fileName+="/";
   fName = "vm_"+ date+ ".wav";
   
   fileName+=fName;
-  qDebug("filename is "+fileName);
+  odebug << "filename is "+fileName << oendl;
 // open tmp file here
   char *pointer;
   pointer=tmpnam(NULL); 
-  qDebug("Opening tmp file %s",pointer);
+  odebug << "Opening tmp file " << pointer << "" << oendl;
   
   if(openWAV(pointer ) == -1)  {
 
     QString err("Could not open the temp file\n");
     err += fileName;
     QMessageBox::critical(0, "vmemo", err, "Abort");
     ::close(dsp);
     return FALSE;
   }
   if( record() ) {
 
   QString cmd;
@@ -362,25 +366,25 @@ bool VMemo::startRecording() {
   l.setName(dlName);
   l.setType("audio/x-wav");
   l.setCategories(cats);
   l.writeLink();
   return TRUE;
   } else
       return FALSE;
   
 }
 
 void VMemo::stopRecording() {
     show();
-    qDebug("Stopped recording");
+    odebug << "Stopped recording" << oendl;
     recording = FALSE;
     if(useAlerts) {
         msgLabel->close();
         msgLabel=0;
         delete msgLabel;
     }
     t_timer->stop();
     Config cfg("Vmemo");
     cfg.setGroup("Defaults");
     if( cfg.readNumEntry("hideIcon",0) == 1 )
         hide();
 }
@@ -390,25 +394,25 @@ int VMemo::openDSP() {
   cfg.setGroup("Record");
   
   speed = cfg.readNumEntry("SampleRate", 22050);
   channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1)
   if (cfg.readNumEntry("SixteenBit", 1)==1)  {
     format = AFMT_S16_LE;
     resolution = 16;
   } else {
     format = AFMT_U8;
     resolution = 8;
   }
 
-  qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution);  
+  odebug << "samplerate: " << speed << ", channels " << channels << ", resolution " << resolution << "" << oendl;
 
   if(systemZaurus) {
     dsp = open("/dev/dsp1", O_RDONLY); //Zaurus needs /dev/dsp1
     channels=1; //zaurus has one input channel
   }  else {
     dsp = open("/dev/dsp", O_RDONLY);
   }
   
   if(dsp == -1)  {
       msgLabel->close();
       msgLabel=0;
       delete msgLabel;
@@ -474,55 +478,55 @@ int VMemo::openWAV(const char *filename) {
   //    qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d"
   //           , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl );
   write (wav, &wh, sizeof(WaveHeader));
   
   return 1;
 }
 
 bool VMemo::record() {
    length=0;
    int result, value;
   QString msg;
   msg.sprintf("Recording format %d", format);
-  qDebug(msg);
+  odebug << msg << oendl;
   Config config("Vmemo");
   config.setGroup("Record");
   int sRate=config.readNumEntry("SizeLimit", 30);
   if(sRate > 0)
       t_timer->start( sRate * 1000+1000, TRUE);
 
 //    if(systemZaurus) {
 //    } else { // 16 bit only capabilities
 
     msg.sprintf("Recording format other");
-    qDebug(msg);
+    odebug << msg << oendl;
 
     int bufsize=1024;
     int bytesWritten=0;
     signed short sound[1024], monoBuffer[1024];
     char abuf[bufsize/2];
     short sbuf[bufsize];
     Config vmCfg("Vmemo");
     vmCfg.setGroup("Defaults");
     useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
 
     while(recording)  {
 
         if(useADPCM)
             result = read( dsp, sbuf, bufsize); // 8192
         else
             result = read(dsp, sound, 1024); // 8192
         if( result <= 0) {
           perror("recording error ");
-//          qDebug(currentFileName);
+//          odebug << currentFileName << oendl;
           QMessageBox::message(tr("Note"),tr("error recording"));
           recording=FALSE;
           break;
           return FALSE;
         }
 
         if(useADPCM) {
             adpcm_coder( sbuf, abuf, result/2, &encoder_state);
             bytesWritten =  ::write(wav, abuf, result/4);
 
         } else {
             for (int i = 0; i < result; i++) { //since Z is mono do normally
@@ -531,72 +535,72 @@ bool VMemo::record() {
 
             length+=write(wav, monoBuffer, result);
         }
         length +=bytesWritten;
 
       if(length<0) {
         recording=false;
         perror("dev/dsp's is a lookin' messy");
         QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
           break;
           return FALSE;
       }
-      //       printf("%d\r",length);
+      //       odebug << "" << length << "\r" << oendl;
       //       fflush(stdout);
       qApp->processEvents();
     }
     //  qDebug("file has length of %d lasting %d seconds",
     //         length, (( length / speed) / channels) / 2 );
     //  }
 
   //>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<//
 
   value = length+36;
 
   lseek(wav, 4, SEEK_SET);
   write(wav, &value, 4);
   lseek(wav, 40, SEEK_SET);
 
   write(wav, &length, 4);
 
   track.close();
-  qDebug("Track closed");
+  odebug << "Track closed" << oendl;
   
   if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
     perror("ioctl(\"SNDCTL_DSP_RESET\")");
 
   ::close(dsp);
 
       Config cfgO("OpieRec");
       cfgO.setGroup("Sounds");
 
       int nFiles = cfgO.readNumEntry( "NumberofFiles",0);
 
       QString currentFileName = fileName;
       QString currentFile = "vm_"+ date;
       
       float numberOfRecordedSeconds=(float) length / (float)speed * (float)2;
 
       cfgO.writeEntry( "NumberofFiles", nFiles + 1);
       cfgO.writeEntry( QString::number( nFiles + 1), currentFile);
       cfgO.writeEntry( currentFile, currentFileName);
 
       QString time;
       time.sprintf("%.2f", numberOfRecordedSeconds);
       cfgO.writeEntry( currentFileName, time );
-      //      qDebug("writing config numberOfRecordedSeconds "+time);
+      //      odebug << "writing config numberOfRecordedSeconds "+time << oendl;
 
       cfgO.write();
 
-      qDebug("done recording "+fileName);
+      odebug << "done recording "+fileName << oendl;
 
   Config cfg("qpe");
   cfg.setGroup("Volume");
   QString foo = cfg.readEntry("Mute","TRUE");
   if(foo.find("TRUE",0,TRUE) != -1)
     QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute
 return TRUE;
 }
 
 int VMemo::setToggleButton(int tog) {
 
   for( int i=0; i < 10;i++) {
diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp
index bd39093..aec63c3 100644
--- a/core/applets/vtapplet/vt.cpp
+++ b/core/applets/vtapplet/vt.cpp
@@ -1,40 +1,43 @@
 /**********************************************************************
-** Copyright (C) 2003 Michael 'Mickey' Lauer.  All rights reserved.
-**
-** Contact me @ mickeyl@handhelds.org
+** Copyright (C) 2003-2004 Michael 'Mickey' Lauer <mickey@Vanille.de>
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
+#include "vt.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/resource.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qpopupmenu.h>
 
+/* STD */
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <linux/vt.h>
 
-#include "vt.h"
-
 VTApplet::VTApplet ( )
 	: QObject ( 0, "VTApplet" )
 {
 }
 
 VTApplet::~VTApplet ( )
 {
 }
 
 int VTApplet::position ( ) const
 {
     return 2;
@@ -65,85 +68,85 @@ QString VTApplet::tr( const char* s, const char* p ) const
 QIconSet VTApplet::icon ( ) const
 {
 	QPixmap pix;
 	QImage img = Resource::loadImage ( "terminal" );
 
 	if ( !img. isNull ( ))
 		pix. convertFromImage ( img. smoothScale ( 14, 14 ));
 	return pix;
 }
 
 QPopupMenu *VTApplet::popup ( QWidget* parent ) const
 {
-    qDebug( "VTApplet::popup" );
+    odebug << "VTApplet::popup" << oendl;
 
     struct vt_stat vtstat;
     int fd = ::open( "/dev/tty0", O_RDWR );
     if ( fd == -1 ) return 0;
     if ( ioctl( fd, VT_GETSTATE, &vtstat ) == -1 ) return 0;
 
     m_subMenu = new QPopupMenu( parent );
     m_subMenu->setCheckable( true );
     for ( int i = 1; i < 10; ++i )
     {
         int id = m_subMenu->insertItem( QString::number( i ), 500+i );
         m_subMenu->setItemChecked( id, id-500 == vtstat.v_active );
     }
     ::close( fd );
 
     connect( m_subMenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) );
     connect( m_subMenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) );
 
     return m_subMenu;
 }
 
 
 void VTApplet::changeVT( int index )
 {
-    //qDebug( "VTApplet::changeVT( %d )", index-500 );
+    //odebug << "VTApplet::changeVT( " << index-500 << " )" << oendl;
 
     int fd = ::open("/dev/tty0", O_RDWR);
     if ( fd == -1 ) return;
     ioctl( fd, VT_ACTIVATE, index-500 );
 }
 
 
 void VTApplet::updateMenu()
 {
-    //qDebug( "VTApplet::updateMenu()" );
+    //odebug << "VTApplet::updateMenu()" << oendl;
 
     int fd = ::open( "/dev/console", O_RDONLY );
     if ( fd == -1 ) return;
 
     for ( int i = 1; i < 10; ++i )
     {
         int result = ioctl( fd, VT_DISALLOCATE, i );
 
         /*
         if ( result == -1 )
-            qDebug( "VT %d disallocated == free", i );
+            odebug << "VT " << i << " disallocated == free" << oendl;
         else
-            qDebug( "VT %d _not_ disallocated == busy", i );
+            odebug << "VT " << i << " _not_ disallocated == busy" << oendl;
         */
 
         m_subMenu->setItemEnabled( 500+i, result == -1 );
     }
 
     ::close( fd );
 }
 
 
 void VTApplet::activated()
 {
-    qDebug( "VTApplet::activated()" );
+    odebug << "VTApplet::activated()" << oendl;
 }
 
 
 QRESULT VTApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
 	*iface = 0;
 	if ( uuid == IID_QUnknown )
 		*iface = this;
 	else if ( uuid == IID_MenuApplet )
 		*iface = this;
 	else
 	    return QS_FALSE;
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index cd8d58e..f3dd11c 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -1,28 +1,29 @@
+#include "obex.h"
+#include "obexsend.h"
+using namespace OpieObex;
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qcopenvelope_qws.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qtimer.h>
 
-
-#include <qpe/qcopenvelope_qws.h>
-
-#include "obex.h"
-#include "obexsend.h"
-
-using namespace OpieObex;
-
 /* TRANSLATOR OpieObex::SendWidget */
 
-
 SendWidget::SendWidget( QWidget* parent, const char* name )
     : QWidget( parent, name ) {
     initUI();
 }
 SendWidget::~SendWidget() {
 }
 void SendWidget::initUI() {
     m_obex = new Obex(this, "obex");
     connect(m_obex, SIGNAL(error(int) ),
             this, SLOT(slotIrError(int) ) );
     connect(m_obex, SIGNAL(sent(bool) ),
             this, SLOT(slotIrSent(bool) ) );
@@ -95,68 +96,68 @@ void SendWidget::send( const QString& file, const QString& desc ) {
         m_start++;
     }else
         m_btDeSearch = m_devBox->addDevice( tr("Searching for bluetooth Devices."), DeviceBox::Search );
 
     if (m_start != 2 ) {
         QCopEnvelope e0("QPE/IrDaApplet", "enableIrda()");
         QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()");
         QCopEnvelope e2("QPE/IrDaApplet", "listDevices()");
         QCopEnvelope e3("QPE/Bluetooth", "listDevices()");
     }
 }
 void SendWidget::slotIrDaDevices( const QStringList& list) {
-    qWarning("slot it irda devices ");
+    owarn << "slot it irda devices " << oendl;
     for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
         int id = m_devBox->addDevice( (*it), DeviceBox::IrDa, tr("Scheduling for beam.") );
         m_irDa.insert( id, (*it) );
     }
     m_devBox->removeDevice( m_irDeSearch );
     m_irDaIt = m_irDa.begin();
 
     slotStartIrda();
 }
 
 void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) {
     for(QMap<QString, QString>::ConstIterator it = str.begin(); it != str.end(); ++it ) {
         int id = m_devBox->addDevice( it.key(), DeviceBox::BT, tr("Click to beam") );
         m_bt.insert( id, Pair( it.key(), it.data() ) );
     }
     m_devBox->removeDevice( m_btDeSearch );
 }
 void SendWidget::slotSelectedDevice( int name, int dev ) {
-    qWarning("Start beam? %d %d", name, dev );
+    owarn << "Start beam? " << name << " " << dev << "" << oendl;
     if ( name ==  m_irDeSearch ) {
         for (QMap<int, QString>::Iterator it= m_irDa.begin(); it != m_irDa.end(); ++it )
             m_devBox->removeDevice( it.key() );
 
         QCopEnvelope e2("QPE/IrDaApplet", "listDevices()");
     }
 }
 void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) {
-    qWarning("dispatch irda %s", str.data() );
+    owarn << "dispatch irda " << str.data() << "" << oendl;
     if ( str == "devices(QStringList)" ) {
         QDataStream stream( ar, IO_ReadOnly );
         QStringList list;
         stream >> list;
         slotIrDaDevices( list );
     }
 }
 void SendWidget::dispatchBt( const QCString&, const QByteArray&  ) {
 
 }
 void SendWidget::slotIrError( int ) {
 
 }
 void SendWidget::slotIrSent( bool b) {
-    qWarning("irda sent!!");
+    owarn << "irda sent!!" << oendl;
     QString text = b ? tr("Sent") : tr("Failure");
     m_devBox->setStatus( m_irDaIt.key(), text );
     ++m_irDaIt;
     slotStartIrda();
 }
 void SendWidget::slotIrTry(unsigned int trI) {
     m_devBox->setStatus( m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) ) );
 }
 void SendWidget::slotStartIrda() {
     if (m_irDaIt == m_irDa.end() ) {
         m_irDeSearch = m_devBox->addDevice(tr("Search again for IrDa."), DeviceBox::Search );
         return;
@@ -195,25 +196,25 @@ int DeviceBox::addDevice( const QString& name, int dev, const QString& status )
 void DeviceBox::removeDevice( int id ) {
     if (!m_dev.contains(id) ) return;
 
     m_dev.remove( id );
     setText( allText() );
 }
 void DeviceBox::setStatus( int id, const QString& status ) {
     if ( !m_dev.contains(id) ) return;
     m_dev[id].setStatus(status );
     setText( allText() );
 }
 void DeviceBox::setSource( const QString& str ) {
-    qWarning("SetSource:%d", str.toInt() );
+    owarn << "SetSource:" << str.toInt() << "" << oendl;
     int id = str.toInt();
     emit selectedDevice( id, m_dev[id].device() );
 }
 int DeviceBox::idFor ( int id ) {
     static int irId = 1501;
     static int irBT = 1001;
     static int irSr = 501;
     static int irEr = 0;
 
     int ret = -1;
     switch(id ) {
     case IrDa:
diff --git a/core/obex/receiver.cpp b/core/obex/receiver.cpp
index ee2668b..8885256 100644
--- a/core/obex/receiver.cpp
+++ b/core/obex/receiver.cpp
@@ -1,33 +1,36 @@
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <stdlib.h> // int system
-#include <unistd.h>
+#include "obex.h"
+#include "receiver.h"
+using namespace OpieObex;
 
-#include <fcntl.h>
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/applnk.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/qcopenvelope_qws.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qtextview.h>
 #include <qpushbutton.h>
 
-#include <qpe/applnk.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/qcopenvelope_qws.h>
-
-#include "obex.h"
-#include "receiver.h"
-
-using namespace OpieObex;
+/* STD */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <stdlib.h> // int system
+#include <unistd.h>
+#include <fcntl.h>
 
 /* TRANSLATOR OpieObex::Receiver */
 
 Receiver::Receiver() {
     m_obex = new Obex(this, "Receiver");
     connect(m_obex, SIGNAL(receivedFile(const QString&) ),
             this, SLOT(slotReceived(const QString&) ) );
     m_obex->receive();
 }
 Receiver::~Receiver() {
     m_obex->setReceiveEnabled( false );
     delete m_obex;
@@ -66,57 +69,57 @@ void Receiver::tidyUp( QString& _file, const QString& ending) {
     QString file = _file;
     char foo[24]; // big enough
     (void)::strcpy(foo, "/tmp/opie-XXXXXX");
 
     int fd = ::mkstemp(foo);
 
     if ( fd == -1 )
         return;
 
     (void)::strncat( foo, ending.latin1(), 4 );
     _file = QString::fromLatin1( foo );
     QString cmd = QString("sed -e \"s/^\\(X-MICROSOFT-BODYINK\\)\\;/\\1:/;\" < %2 > %2 ").arg( Global::shellQuote(file)).arg( Global::shellQuote(_file) );
-    qWarning("Executing: %s", cmd.latin1() );
+    owarn << "Executing: " << cmd << "" << oendl;
     (void)::system( cmd.latin1() );
 
     cmd = QString("rm %1").arg( Global::shellQuote(file) );
     (void)::system( cmd.latin1() );
 }
 int Receiver::checkFile( QString& file ) {
-    qWarning("check file!! %s", file.latin1() );
+    owarn << "check file!! " << file << "" << oendl;
     int ret;
     QString ending;
 
     if (file.right(4) == ".vcs" ) {
         ret = Datebook;
         ending = QString::fromLatin1(".vcs");
     }else if ( file.right(4) == ".vcf") {
         ret = AddressBook;
         ending = QString::fromLatin1(".vcf");
     }else
         ret = Other;
 
 
     if (ending.isEmpty() )
         return ret;
 
     /**
      * currently the parser is broken in regard of BASE64 encoding
      * and M$ likes to send that. So we will executed a small
      * tidy up system sed script
      * At this point we can also remove umlaute from the filename
      */
     tidyUp( file, ending );
 
-    qWarning("check it now %d", ret );
+    owarn << "check it now " << ret << "" << oendl;
     return ret;
 }
 
 /* TRANSLATOR OpieObex::OtherHandler */
 
 OtherHandler::OtherHandler()
     : QVBox()
 {
     QHBox* box = new QHBox(this);
     QLabel* lbl = new QLabel(box);
     lbl->setText(tr("<qt><b>Received:</b></qt>"));
     m_na = new QLabel(box);
@@ -139,25 +142,25 @@ OtherHandler::OtherHandler()
             this, SLOT(deny() ) );
 
     raise();
     showMaximized();
 }
 OtherHandler::~OtherHandler() {
 
 }
 void OtherHandler::handle( const QString& file ) {
     m_file = file;
     m_na->setText(file);
     DocLnk lnk(file);
-    qWarning(" %s %s", lnk.type().latin1(), lnk.icon().latin1() );
+    owarn << " " << lnk.type() << " " << lnk.icon() << "" << oendl;
 
     QString str = tr("<p>You received a file of type %1 (<img src=\"%2\"> )What do you want to do?").arg(lnk.type() ).arg(lnk.icon() );
     m_view->setText( str );
 }
 
 /*
  * hehe evil evil mmap ahead :)
  * we quickly copy the file and then we'll create a DocLnk for it
  */
 void OtherHandler::accept() {
     QString na = targetName( m_file );
     copy(m_file, na );
@@ -182,18 +185,18 @@ QString OtherHandler::targetName( const QString& file ) {
     int trie = 0;
     while (QFile::exists(newFile + "."+info.extension() ) ) {
         newFile = newFileBase + "_"+QString::number(trie) ;
         trie++;
     }
     newFile += "." + info.extension();
 
     return newFile;
 }
 
 /* fast cpy */
 void OtherHandler::copy(const QString& src, const QString& file) {
-    qWarning("src %s, dest %s", src.latin1(),file.latin1() );
+    owarn << "src " << src << ", dest " << file << "" << oendl;
     QString cmd = QString("mv %1 %2").arg( Global::shellQuote( src )).
                   arg( Global::shellQuote( file ) );
     ::system( cmd.latin1() );
     // done
 }