summaryrefslogtreecommitdiff
path: root/core
Side-by-side diff
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp26
-rw-r--r--core/applets/clockapplet/clock.cpp10
-rw-r--r--core/applets/irdaapplet/irda.cpp4
-rw-r--r--core/applets/multikeyapplet/multikey.cpp2
-rw-r--r--core/applets/restartapplet/restart.cpp2
-rw-r--r--core/applets/restartapplet/restartappletimpl.cpp5
-rw-r--r--core/applets/rotateapplet/rotate.cpp9
-rw-r--r--core/applets/screenshotapplet/screenshot.cpp522
-rw-r--r--core/applets/vmemo/vmemo.cpp108
-rw-r--r--core/applets/vtapplet/vt.cpp65
-rw-r--r--core/obex/obexsend.cpp29
-rw-r--r--core/obex/receiver.cpp41
12 files changed, 417 insertions, 406 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
@@ -19,10 +19,13 @@
#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>
@@ -38,18 +41,11 @@
#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" ) )
{
@@ -197,12 +193,12 @@ 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();
}
}
@@ -210,7 +206,7 @@ void CardMonitor::cardMessage( const QCString & msg, const QByteArray & )
bool CardMonitor::getStatusPcmcia( int showPopUp )
{
- bool cardWas0 = cardInPcmcia0; // remember last state
+ bool cardWas0 = cardInPcmcia0; // remember last state
bool cardWas1 = cardInPcmcia1;
QString fileName;
@@ -331,7 +327,7 @@ bool CardMonitor::getStatusPcmcia( int showPopUp )
else
{
// no file found
- qDebug( "no file found" );
+ odebug << "no file found" << oendl;
cardInPcmcia0 = FALSE;
cardInPcmcia1 = FALSE;
}
@@ -345,7 +341,7 @@ bool CardMonitor::getStatusPcmcia( int showPopUp )
bool CardMonitor::getStatusSd( int showPopUp )
{
- bool cardWas = cardInSd; // remember last state
+ bool cardWas = cardInSd; // remember last state
cardInSd = FALSE;
#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
@@ -357,7 +353,7 @@ bool CardMonitor::getStatusSd( int showPopUp )
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" )
{
@@ -385,11 +381,11 @@ bool CardMonitor::getStatusSd( int showPopUp )
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
+ popUp( text, "cardmon/ide" ); // XX add SD pic
}
#else
#error "Not on Linux"
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
@@ -20,12 +20,16 @@
#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:
@@ -55,9 +59,9 @@ void LauncherClock::readConfig() {
void LauncherClock::mouseReleaseEvent( QMouseEvent * )
{
- QCString setTimeApp;
- setTimeApp="systemtime";
- QCopEnvelope e("QPE/Application/"+setTimeApp, "raise()");
+ QCString setTimeApp;
+ setTimeApp="systemtime";
+ QCopEnvelope e("QPE/Application/"+setTimeApp, "raise()");
}
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
@@ -207,7 +207,7 @@ void IrdaApplet::showDiscovered ( )
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 );
@@ -219,7 +219,7 @@ void IrdaApplet::showDiscovered ( )
}
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 ));
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
@@ -68,7 +68,7 @@ void Multikey::mouseReleaseEvent(QMouseEvent *ev)
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]);
}
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
@@ -53,7 +53,6 @@ RestartApplet::RestartApplet( QWidget *parent, const char *name )
: QWidget( parent, name ) {
setFixedHeight( 18 );
setFixedWidth( 16 );
- qDebug("new restartapplet");
show();
}
@@ -66,7 +65,6 @@ void RestartApplet::mousePressEvent( QMouseEvent *) {
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
@@ -33,7 +33,6 @@ RestartAppletImpl::~RestartAppletImpl()
QWidget *RestartAppletImpl::applet( QWidget *parent )
{
- qDebug("restart applet");
if ( !restart )
restart = new RestartApplet( parent );
return restart;
@@ -52,8 +51,8 @@ QRESULT RestartAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface
else if ( uuid == IID_TaskbarApplet )
*iface = this;
else
- return QS_FALSE;
-
+ return QS_FALSE;
+
if ( *iface )
(*iface)->addRef();
return QS_OK;
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
@@ -31,6 +31,7 @@
#include "rotate.h"
/* OPIE */
+#include <opie2/odebug.h>
#include <opie2/odevice.h>
#include <qpe/config.h>
#include <qpe/power.h>
@@ -62,7 +63,7 @@ RotateApplet::~RotateApplet ( )
*/
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() )
{
@@ -72,7 +73,7 @@ void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data
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" );
@@ -96,7 +97,7 @@ void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data
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 );
@@ -239,7 +240,7 @@ QRESULT RotateApplet::queryInterface( const QUuid &uuid, QUnknownInterface **ifa
else if ( uuid == IID_MenuApplet )
*iface = this;
else
- return QS_FALSE;
+ return QS_FALSE;
if ( *iface )
(*iface)->addRef();
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
@@ -16,9 +16,12 @@
#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>
@@ -39,186 +42,185 @@
#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",
-"- c #0A3A6E",
-"; c #031024",
-"> c #031B36",
-", c #1A5EA3",
-"' c #1862B1",
-") c #1866B9",
-"! c #0F5AAC",
-"~ c #0F56A8",
-"{ c #0C4C96",
-"] c #030918",
-"^ c #060206",
-"/ c #20242C",
-"( c #3E3B3B",
-"_ c #186ABD",
-": c #115EB3",
-"< c #082644",
-"[ c #222C38",
-"} c #5A5859",
-"| c #091921",
-"1 c #1E7EDE",
-"2 c #1A7ADA",
-"3 c #1970CD",
-"4 c #1758A1",
-"5 c #0E529A",
-"6 c #094388",
-"7 c #22364E",
-"8 c #384454",
-"9 c #04162C",
-"0 c #123451",
-"a c #3296B4",
-"b c #298AB1",
-"c c #2484AC",
-"d c #033D86",
-"e c #033677",
-"f c #072C58",
-"g c #525862",
-"h c #5E5E5E",
-"i c #23492A",
-"j c #4FBD3F",
-"k c #50B24C",
-"l c #51C72E",
-"m c #42C64A",
-"n c #2686CA",
-"o c #0B52A4",
-"p c #054A9A",
-"q c #053B7C",
-"r c #2B2325",
-"s c #6E7070",
-"t c #0D240E",
-"u c #1E423E",
-"v c #468ABE",
-"w c #6A8AC2",
-"x c #7EAA8E",
-"y c #84BE4E",
-"z c #65C639",
-"A c #064EA0",
-"B c #0A4DA0",
-"C c #4E5242",
-"D c #62362E",
-"E c #721A1A",
-"F c #6E0A0A",
-"G c #3E0E0E",
-"H c #6AB85E",
-"I c #7E8ECA",
-"J c #929CD4",
-"K c #9EAECA",
-"L c #9EBEAE",
-"M c #8EC26A",
-"N c #32A276",
-"O c #20518C",
-"P c #46566E",
-"Q c #614A51",
-"R c #AE2A26",
-"S c #C41C1A",
-"T c #CE0A0A",
-"U c #A60606",
-"V c #921616",
-"W c #863735",
-"X c #866A66",
-"Y c #9E9EA2",
-"Z c #1E5212",
-"` c #7EC652",
-" . c #B2B2F2",
-".. c #CACAF6",
-"+. c #AECEC6",
-"@. c #92CE72",
-"#. c #42AA86",
-"$. c #365E96",
-"%. c #B82420",
-"&. c #E20E0E",
-"*. c #EF0E0B",
-"=. c #566A86",
-"-. c #92929A",
-";. c #16260E",
-">. c #2E571A",
-",. c #7ED64E",
-"'. c #9ECEB2",
-"). c #C6D5EF",
-"!. c #E2E0FE",
-"~. c #A2DE8A",
-"{. c #4AAA5B",
-"]. c #2A6AB2",
-"^. c #9A7A6E",
-"/. c #D25A52",
-"(. c #F62626",
-"_. c #FA0206",
-":. c #DE1E16",
-"<. c #B63A26",
-"[. c #865A2E",
-"}. c #26568E",
-"|. c #435F7D",
-"1. c #7AE246",
-"2. c #96EA6E",
-"3. c #BEEAAE",
-"4. c #D0EADC",
-"5. c #B6CEFE",
-"6. c #9ADE8A",
-"7. c #2A609A",
-"8. c #7E623E",
-"9. c #CA7A72",
-"0. c #F26E6E",
-"a. c #FE5252",
-"b. c #FA3638",
-"c. c #DA2E28",
-"d. c #9E3E3A",
-"e. c #3E7656",
-"f. c #76CB3A",
-"g. c #90DE44",
-"h. c #A2EE6A",
-"i. c #9EEA9A",
-"j. c #92BEDE",
-"k. c #7ADA7E",
-"l. c #5ECE52",
-"m. c #6A5E52",
-"n. c #A83238",
-"o. c #FA5656",
-"p. c #F29A92",
-"q. c #D29E92",
-"r. c #8A7A62",
-"s. c #05336B",
-"t. c #59C631",
-"u. c #8AD23A",
-"v. c #66E242",
-"w. c #1D6FC1",
-"x. c #E61212",
-"y. c #CA261E",
-"z. c #5A763E",
-"A. c #1E6E9A",
-"B. c #023272",
-"C. c #329696",
-"D. c #2074B6",
-"E. c #3E4E76",
-"F. c #5A525E",
-"G. c #425868",
-"H. c #04448E",
-"I. c #28828A",
-"J. c #2D8593",
-"K. c #12427A",
-"L. c #054696",
-"M. c #042B5E",
-"N. c #134F95",
-"O. c #1E6ABB",
-"P. c #1A5E96",
-"Q. c #022E67",
-"R. c #0C3E7C",
-"S. c #023E8A",
-"T. c #021A3E",
+" c None",
+". c #042045",
+"+ c #0D2B47",
+"@ c #0E325E",
+"# c #0D2E50",
+"$ c #0A1C32",
+"% c #0F3A69",
+"& c #164680",
+"* c #165EAE",
+"= c #134D89",
+"- c #0A3A6E",
+"; c #031024",
+"> c #031B36",
+", c #1A5EA3",
+"' c #1862B1",
+") c #1866B9",
+"! c #0F5AAC",
+"~ c #0F56A8",
+"{ c #0C4C96",
+"] c #030918",
+"^ c #060206",
+"/ c #20242C",
+"( c #3E3B3B",
+"_ c #186ABD",
+": c #115EB3",
+"< c #082644",
+"[ c #222C38",
+"} c #5A5859",
+"| c #091921",
+"1 c #1E7EDE",
+"2 c #1A7ADA",
+"3 c #1970CD",
+"4 c #1758A1",
+"5 c #0E529A",
+"6 c #094388",
+"7 c #22364E",
+"8 c #384454",
+"9 c #04162C",
+"0 c #123451",
+"a c #3296B4",
+"b c #298AB1",
+"c c #2484AC",
+"d c #033D86",
+"e c #033677",
+"f c #072C58",
+"g c #525862",
+"h c #5E5E5E",
+"i c #23492A",
+"j c #4FBD3F",
+"k c #50B24C",
+"l c #51C72E",
+"m c #42C64A",
+"n c #2686CA",
+"o c #0B52A4",
+"p c #054A9A",
+"q c #053B7C",
+"r c #2B2325",
+"s c #6E7070",
+"t c #0D240E",
+"u c #1E423E",
+"v c #468ABE",
+"w c #6A8AC2",
+"x c #7EAA8E",
+"y c #84BE4E",
+"z c #65C639",
+"A c #064EA0",
+"B c #0A4DA0",
+"C c #4E5242",
+"D c #62362E",
+"E c #721A1A",
+"F c #6E0A0A",
+"G c #3E0E0E",
+"H c #6AB85E",
+"I c #7E8ECA",
+"J c #929CD4",
+"K c #9EAECA",
+"L c #9EBEAE",
+"M c #8EC26A",
+"N c #32A276",
+"O c #20518C",
+"P c #46566E",
+"Q c #614A51",
+"R c #AE2A26",
+"S c #C41C1A",
+"T c #CE0A0A",
+"U c #A60606",
+"V c #921616",
+"W c #863735",
+"X c #866A66",
+"Y c #9E9EA2",
+"Z c #1E5212",
+"` c #7EC652",
+" . c #B2B2F2",
+".. c #CACAF6",
+"+. c #AECEC6",
+"@. c #92CE72",
+"#. c #42AA86",
+"$. c #365E96",
+"%. c #B82420",
+"&. c #E20E0E",
+"*. c #EF0E0B",
+"=. c #566A86",
+"-. c #92929A",
+";. c #16260E",
+">. c #2E571A",
+",. c #7ED64E",
+"'. c #9ECEB2",
+"). c #C6D5EF",
+"!. c #E2E0FE",
+"~. c #A2DE8A",
+"{. c #4AAA5B",
+"]. c #2A6AB2",
+"^. c #9A7A6E",
+"/. c #D25A52",
+"(. c #F62626",
+"_. c #FA0206",
+":. c #DE1E16",
+"<. c #B63A26",
+"[. c #865A2E",
+"}. c #26568E",
+"|. c #435F7D",
+"1. c #7AE246",
+"2. c #96EA6E",
+"3. c #BEEAAE",
+"4. c #D0EADC",
+"5. c #B6CEFE",
+"6. c #9ADE8A",
+"7. c #2A609A",
+"8. c #7E623E",
+"9. c #CA7A72",
+"0. c #F26E6E",
+"a. c #FE5252",
+"b. c #FA3638",
+"c. c #DA2E28",
+"d. c #9E3E3A",
+"e. c #3E7656",
+"f. c #76CB3A",
+"g. c #90DE44",
+"h. c #A2EE6A",
+"i. c #9EEA9A",
+"j. c #92BEDE",
+"k. c #7ADA7E",
+"l. c #5ECE52",
+"m. c #6A5E52",
+"n. c #A83238",
+"o. c #FA5656",
+"p. c #F29A92",
+"q. c #D29E92",
+"r. c #8A7A62",
+"s. c #05336B",
+"t. c #59C631",
+"u. c #8AD23A",
+"v. c #66E242",
+"w. c #1D6FC1",
+"x. c #E61212",
+"y. c #CA261E",
+"z. c #5A763E",
+"A. c #1E6E9A",
+"B. c #023272",
+"C. c #329696",
+"D. c #2074B6",
+"E. c #3E4E76",
+"F. c #5A525E",
+"G. c #425868",
+"H. c #04448E",
+"I. c #28828A",
+"J. c #2D8593",
+"K. c #12427A",
+"L. c #054696",
+"M. c #042B5E",
+"N. c #134F95",
+"O. c #1E6ABB",
+"P. c #1A5E96",
+"Q. c #022E67",
+"R. c #0C3E7C",
+"S. c #023E8A",
+"T. c #021A3E",
" ",
" ",
" ",
@@ -299,7 +301,7 @@ ScreenshotControl::ScreenshotControl( QWidget *parent, const char *name )
grabTimer = new QTimer ( this, "grab timer");
-
+
connect ( grabTimer, SIGNAL( timeout()), this, SLOT( performGrab()));
connect ( grabItButton, SIGNAL( clicked()), SLOT( slotGrab()));
connect ( scapButton, SIGNAL( clicked()), SLOT( slotScap()));
@@ -362,13 +364,13 @@ void ScreenshotControl::savePixmap()
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 {
@@ -380,7 +382,7 @@ void ScreenshotControl::savePixmap()
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());
}
@@ -388,13 +390,13 @@ void ScreenshotControl::savePixmap()
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;
}
@@ -403,84 +405,84 @@ void ScreenshotControl::savePixmap()
void ScreenshotControl::performGrab()
{
- snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(), QApplication::desktop()->height() );
+ snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(), QApplication::desktop()->height() );
- if (buttonPushed == 1) {
- qDebug("grabbing screen");
- grabTimer->stop();
- show();
- qApp->processEvents();
- savePixmap();
- } else {
- grabTimer->stop();
+ if (buttonPushed == 1) {
+ 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;
+ struct sockaddr_in raddr;
+ struct hostent *rhost_info;
+ int sock = -1;
+ bool ok = false;
- QString displayEnv = getenv("QWS_DISPLAY");
- qDebug(displayEnv);
+ QString displayEnv = getenv("QWS_DISPLAY");
+ odebug << displayEnv << oendl;
- if(( displayEnv.left(2) != ":0" ) && (!displayEnv.isEmpty())) {
+ 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 (( 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 ) {
+ if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 ) {
+ if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) {
- QString header;
+ QString header;
- QPixmap pix;
+ QPixmap pix;
- QString SCAP_model="";
+ QString SCAP_model="";
#warning FIXME: model string should be filled with actual device model
- if( snapshot.width() > 320)
- SCAP_model ="Corgi";
-
- if(displayEnv == "QVFb:0") {//set this if you plan on using this app in qvfb!!
- pix = snapshot.xForm(QWMatrix().rotate(90));
- } else
- 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);
-
- 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 );
- }
- }
- if ( ok ) {
- QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname ));
- } else {
- QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname ));
- }
- } else {
- QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable."));
- }
- }
-
+ if( snapshot.width() > 320)
+ SCAP_model ="Corgi";
+
+ if(displayEnv == "QVFb:0") {//set this if you plan on using this app in qvfb!!
+ pix = snapshot.xForm(QWMatrix().rotate(90));
+ } else
+ 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 );
+ 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 );
+ }
+ }
+ if ( ok ) {
+ QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname ));
+ } else {
+ QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname ));
+ }
+ } else {
+ QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable."));
+ }
+ }
+
}
@@ -490,7 +492,7 @@ void ScreenshotControl::performGrab()
ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name )
: QWidget( parent, name )
{
- setFixedWidth( AppLnk::smallIconSize());
+ setFixedWidth( AppLnk::smallIconSize());
QImage img = (const char **)snapshot_xpm;
img = img.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize());
@@ -514,19 +516,19 @@ void ScreenshotApplet::mousePressEvent( QMouseEvent *)
// windowPosX is the windows position centered above the applets icon.
// If the icon is near the edge of the screen, the window would leave the visible area
// so we check the position against the screen width and correct the difference if needed
-
+
int screenWidth = qApp->desktop()->width();
int windowPosX = curPos. x ( ) - ( sc-> sizeHint ( ). width ( ) - width ( )) / 2 ;
int ZwindowPosX, XwindowPosX;
-
+
// the window would be placed beyond the screen wich doesn't look tooo good
if ( (windowPosX + sc-> sizeHint ( ). width ( )) > screenWidth ) {
- XwindowPosX = windowPosX + sc-> sizeHint ( ). width ( ) - screenWidth;
- ZwindowPosX = windowPosX - XwindowPosX - 1;
+ XwindowPosX = windowPosX + sc-> sizeHint ( ). width ( ) - screenWidth;
+ ZwindowPosX = windowPosX - XwindowPosX - 1;
} else {
- ZwindowPosX = windowPosX;
+ ZwindowPosX = windowPosX;
}
-
+
sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) );
sc-> show ( );
}
@@ -534,7 +536,7 @@ void ScreenshotApplet::mousePressEvent( QMouseEvent *)
void ScreenshotApplet::paintEvent( QPaintEvent* )
{
QPainter p ( this );
- p.drawPixmap( 0,0, m_icon );
+ p.drawPixmap( 0,0, m_icon );
}
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
@@ -12,6 +12,10 @@
// 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"
}
@@ -29,7 +33,7 @@ typedef struct _waveheader {
u_long length; /* filelen */
u_long chunk_type; /* 'WAVE' */
u_long sub_chunk; /* 'fmt ' */
- u_long sc_len; /* length of sub_chunk, =16
+ u_long sc_len; /* length of sub_chunk, =16
(chunckSize) format len */
u_short format; /* should be 1 for PCM-code (formatTag) */
@@ -198,21 +202,21 @@ 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
+ else
systemZaurus=FALSE;
-
+
myChannel = new QCopChannel( "QPE/VMemo", this );
connect( myChannel, SIGNAL(received(const QCString&,const QByteArray&)),
this, SLOT(receive(const QCString&,const QByteArray&)) );
@@ -245,7 +249,7 @@ int VMemo::position()
}
void VMemo::receive( const QCString &msg, const QByteArray &data ) {
- qDebug("receive");
+ odebug << "receive" << oendl;
QDataStream stream( data, IO_ReadOnly );
if (msg == "toggleRecord()") {
@@ -267,7 +271,7 @@ void VMemo::paintEvent( QPaintEvent* ) {
void VMemo::mousePressEvent( QMouseEvent * me) {
/* No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
mousePressEvent and mouseReleaseEvent with a NULL parameter. */
-
+
// if (!systemZaurus && me != NULL)
// return;
// }
@@ -293,14 +297,14 @@ bool VMemo::startRecording() {
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);
@@ -318,21 +322,21 @@ bool VMemo::startRecording() {
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);
-
+ pointer=tmpnam(NULL);
+ odebug << "Opening tmp file " << pointer << "" << oendl;
+
if(openWAV(pointer ) == -1) {
QString err("Could not open the temp file\n");
@@ -349,12 +353,12 @@ bool VMemo::startRecording() {
cmd.sprintf("mv %s "+fileName, pointer);
// move tmp file to regular file here
-
+
system(cmd.latin1());
QArray<int> cats(1);
cats[0] = config.readNumEntry("Category", 0);
-
+
QString dlName("vm_");
dlName += date;
DocLnk l;
@@ -366,12 +370,12 @@ bool VMemo::startRecording() {
return TRUE;
} else
return FALSE;
-
+
}
void VMemo::stopRecording() {
show();
- qDebug("Stopped recording");
+ odebug << "Stopped recording" << oendl;
recording = FALSE;
if(useAlerts) {
msgLabel->close();
@@ -388,7 +392,7 @@ void VMemo::stopRecording() {
int VMemo::openDSP() {
Config cfg("Vmemo");
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) {
@@ -399,7 +403,7 @@ int VMemo::openDSP() {
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
@@ -407,18 +411,18 @@ int VMemo::openDSP() {
} else {
dsp = open("/dev/dsp", O_RDONLY);
}
-
+
if(dsp == -1) {
msgLabel->close();
msgLabel=0;
delete msgLabel;
-
+
perror("open(\"/dev/dsp\")");
errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno);
QMessageBox::critical(0, "vmemo", errorMsg, "Abort");
return -1;
}
-
+
if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) {
perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
return -1;
@@ -437,7 +441,7 @@ int VMemo::openDSP() {
}
QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; //mute
-
+
return 1;
}
@@ -452,29 +456,29 @@ int VMemo::openWAV(const char *filename) {
Config vmCfg("Vmemo");
vmCfg.setGroup("Defaults");
useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
-
+
WaveHeader wh;
wh.main_chunk = RIFF;
- wh.length=0;
+ wh.length=0;
wh.chunk_type = WAVE;
wh.sub_chunk = FMT;
wh.sc_len = 16;
if(useADPCM)
wh.format = WAVE_FORMAT_DVI_ADPCM;//PCM_CODE;
else
- wh.format = PCM_CODE;
+ wh.format = PCM_CODE;
wh.modus = channels;
wh.sample_fq = speed;
wh.byte_p_sec = speed * channels * resolution/8;
- wh.byte_p_spl = channels * (resolution / 8);
+ wh.byte_p_spl = channels * (resolution / 8);
wh.bit_p_spl = resolution;
wh.data_chunk = DATA;
- wh.data_length= 0;
+ wh.data_length= 0;
// 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;
}
@@ -483,7 +487,7 @@ bool VMemo::record() {
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);
@@ -494,7 +498,7 @@ bool VMemo::record() {
// } else { // 16 bit only capabilities
msg.sprintf("Recording format other");
- qDebug(msg);
+ odebug << msg << oendl;
int bufsize=1024;
int bytesWritten=0;
@@ -513,7 +517,7 @@ bool VMemo::record() {
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;
@@ -540,7 +544,7 @@ bool VMemo::record() {
break;
return FALSE;
}
- // printf("%d\r",length);
+ // odebug << "" << length << "\r" << oendl;
// fflush(stdout);
qApp->processEvents();
}
@@ -559,8 +563,8 @@ bool VMemo::record() {
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\")");
@@ -573,7 +577,7 @@ bool VMemo::record() {
QString currentFileName = fileName;
QString currentFile = "vm_"+ date;
-
+
float numberOfRecordedSeconds=(float) length / (float)speed * (float)2;
cfgO.writeEntry( "NumberofFiles", nFiles + 1);
@@ -583,11 +587,11 @@ bool VMemo::record() {
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");
@@ -602,32 +606,32 @@ int VMemo::setToggleButton(int tog) {
for( int i=0; i < 10;i++) {
switch (tog) {
case 0:
- return -1;
- break;
+ return -1;
+ break;
case 1:
- return 0;
- break;
+ return 0;
+ break;
case 2:
return Key_F24; //was Escape
- break;
+ break;
case 3:
return Key_Space;
- break;
+ break;
case 4:
return Key_F12;
- break;
+ break;
case 5:
return Key_F9;
- break;
+ break;
case 6:
return Key_F10;
- break;
+ break;
case 7:
return Key_F11;
- break;
+ break;
case 8:
return Key_F13;
- break;
+ break;
};
}
return -1;
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,7 +1,5 @@
/**********************************************************************
-** 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
@@ -13,10 +11,17 @@
**
**********************************************************************/
+#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>
@@ -24,10 +29,8 @@
#include <sys/ioctl.h>
#include <linux/vt.h>
-#include "vt.h"
-
VTApplet::VTApplet ( )
- : QObject ( 0, "VTApplet" )
+ : QObject ( 0, "VTApplet" )
{
}
@@ -42,12 +45,12 @@ int VTApplet::position ( ) const
QString VTApplet::name ( ) const
{
- return tr( "VT shortcut" );
+ return tr( "VT shortcut" );
}
QString VTApplet::text ( ) const
{
- return tr( "Terminal" );
+ return tr( "Terminal" );
}
/*
@@ -64,17 +67,17 @@ QString VTApplet::tr( const char* s, const char* p ) const
QIconSet VTApplet::icon ( ) const
{
- QPixmap pix;
- QImage img = Resource::loadImage ( "terminal" );
+ QPixmap pix;
+ QImage img = Resource::loadImage ( "terminal" );
- if ( !img. isNull ( ))
- pix. convertFromImage ( img. smoothScale ( 14, 14 ));
- return pix;
+ 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 );
@@ -99,7 +102,7 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const
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;
@@ -109,7 +112,7 @@ void VTApplet::changeVT( int index )
void VTApplet::updateMenu()
{
- //qDebug( "VTApplet::updateMenu()" );
+ //odebug << "VTApplet::updateMenu()" << oendl;
int fd = ::open( "/dev/console", O_RDONLY );
if ( fd == -1 ) return;
@@ -120,9 +123,9 @@ void VTApplet::updateMenu()
/*
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 );
@@ -134,28 +137,28 @@ void VTApplet::updateMenu()
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;
-
- if ( *iface )
- (*iface)-> addRef ( );
- return QS_OK;
+ *iface = 0;
+ if ( uuid == IID_QUnknown )
+ *iface = this;
+ else if ( uuid == IID_MenuApplet )
+ *iface = this;
+ else
+ return QS_FALSE;
+
+ if ( *iface )
+ (*iface)-> addRef ( );
+ return QS_OK;
}
Q_EXPORT_INTERFACE( )
{
- Q_CREATE_INSTANCE( VTApplet )
+ Q_CREATE_INSTANCE( VTApplet )
}
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,19 +1,20 @@
+#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();
@@ -104,7 +105,7 @@ void SendWidget::send( const QString& file, const QString& desc ) {
}
}
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) );
@@ -123,7 +124,7 @@ void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) {
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() );
@@ -132,7 +133,7 @@ void SendWidget::slotSelectedDevice( int name, int dev ) {
}
}
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;
@@ -147,7 +148,7 @@ 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;
@@ -204,7 +205,7 @@ void DeviceBox::setStatus( int id, const QString& 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() );
}
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,24 +1,27 @@
-#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 */
@@ -75,14 +78,14 @@ void Receiver::tidyUp( QString& _file, const QString& ending) {
(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;
@@ -107,7 +110,7 @@ int Receiver::checkFile( QString& file ) {
*/
tidyUp( file, ending );
- qWarning("check it now %d", ret );
+ owarn << "check it now " << ret << "" << oendl;
return ret;
}
@@ -148,7 +151,7 @@ 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 );
@@ -191,7 +194,7 @@ QString OtherHandler::targetName( const QString& file ) {
/* 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() );