-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 26 | ||||
-rw-r--r-- | core/applets/clockapplet/clock.cpp | 10 | ||||
-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 4 | ||||
-rw-r--r-- | core/applets/multikeyapplet/multikey.cpp | 2 | ||||
-rw-r--r-- | core/applets/restartapplet/restart.cpp | 2 | ||||
-rw-r--r-- | core/applets/restartapplet/restartappletimpl.cpp | 5 | ||||
-rw-r--r-- | core/applets/rotateapplet/rotate.cpp | 9 | ||||
-rw-r--r-- | core/applets/screenshotapplet/screenshot.cpp | 522 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 108 | ||||
-rw-r--r-- | core/applets/vtapplet/vt.cpp | 65 | ||||
-rw-r--r-- | core/obex/obexsend.cpp | 29 | ||||
-rw-r--r-- | core/obex/receiver.cpp | 41 |
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 | |||
@@ -21,2 +21,3 @@ | |||
21 | /* OPIE */ | 21 | /* OPIE */ |
22 | #include <opie2/odebug.h> | ||
22 | #include <opie2/odevice.h> | 23 | #include <opie2/odevice.h> |
@@ -25,2 +26,4 @@ | |||
25 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
27 | using namespace Opie::Core; | ||
28 | using namespace Opie::Ui; | ||
26 | 29 | ||
@@ -40,3 +43,2 @@ | |||
40 | #include <fcntl.h> | 43 | #include <fcntl.h> |
41 | |||
42 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 44 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
@@ -46,8 +48,2 @@ | |||
46 | 48 | ||
47 | using namespace Opie; | ||
48 | |||
49 | using namespace Opie::Ui; | ||
50 | using namespace Opie::Ui; | ||
51 | using namespace Opie::Core; | ||
52 | |||
53 | CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ), | 49 | CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ), |
@@ -199,3 +195,3 @@ void CardMonitor::cardMessage( const QCString & msg, const QByteArray & ) | |||
199 | { | 195 | { |
200 | // qDebug("Pcmcia: stabchanged"); | 196 | // odebug << "Pcmcia: stabchanged" << oendl; |
201 | getStatusPcmcia(); | 197 | getStatusPcmcia(); |
@@ -204,3 +200,3 @@ void CardMonitor::cardMessage( const QCString & msg, const QByteArray & ) | |||
204 | { | 200 | { |
205 | // qDebug("CARDMONAPPLET: mtabchanged"); | 201 | // odebug << "CARDMONAPPLET: mtabchanged" << oendl; |
206 | getStatusSd(); | 202 | getStatusSd(); |
@@ -212,3 +208,3 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) | |||
212 | 208 | ||
213 | bool cardWas0 = cardInPcmcia0;// remember last state | 209 | bool cardWas0 = cardInPcmcia0; // remember last state |
214 | bool cardWas1 = cardInPcmcia1; | 210 | bool cardWas1 = cardInPcmcia1; |
@@ -333,3 +329,3 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) | |||
333 | // no file found | 329 | // no file found |
334 | qDebug( "no file found" ); | 330 | odebug << "no file found" << oendl; |
335 | cardInPcmcia0 = FALSE; | 331 | cardInPcmcia0 = FALSE; |
@@ -347,3 +343,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) | |||
347 | 343 | ||
348 | bool cardWas = cardInSd;// remember last state | 344 | bool cardWas = cardInSd; // remember last state |
349 | cardInSd = FALSE; | 345 | cardInSd = FALSE; |
@@ -359,3 +355,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) | |||
359 | QString fs = me->mnt_fsname; | 355 | QString fs = me->mnt_fsname; |
360 | //qDebug( fs ); | 356 | //odebug << fs << oendl; |
361 | if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" | 357 | if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" |
@@ -387,3 +383,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) | |||
387 | } | 383 | } |
388 | //qDebug("TEXT: " + text ); | 384 | //odebug << "TEXT: " + text << oendl; |
389 | #ifndef QT_NO_SOUND | 385 | #ifndef QT_NO_SOUND |
@@ -391,3 +387,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) | |||
391 | #endif | 387 | #endif |
392 | popUp( text, "cardmon/ide" );// XX add SD pic | 388 | popUp( text, "cardmon/ide" ); // XX add SD pic |
393 | } | 389 | } |
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 | |||
@@ -22,2 +22,4 @@ | |||
22 | 22 | ||
23 | /* OPIE */ | ||
24 | #include <opie2/odebug.h> | ||
23 | #include <opie2/otaskbarapplet.h> | 25 | #include <opie2/otaskbarapplet.h> |
@@ -27,3 +29,5 @@ | |||
27 | 29 | ||
30 | using namespace Opie::Core; | ||
28 | using namespace Opie::Ui; | 31 | using namespace Opie::Ui; |
32 | |||
29 | LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) | 33 | LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) |
@@ -57,5 +61,5 @@ void LauncherClock::mouseReleaseEvent( QMouseEvent * ) | |||
57 | { | 61 | { |
58 | QCString setTimeApp; | 62 | QCString setTimeApp; |
59 | setTimeApp="systemtime"; | 63 | setTimeApp="systemtime"; |
60 | QCopEnvelope e("QPE/Application/"+setTimeApp, "raise()"); | 64 | QCopEnvelope e("QPE/Application/"+setTimeApp, "raise()"); |
61 | } | 65 | } |
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 | |||
@@ -209,3 +209,3 @@ void IrdaApplet::showDiscovered ( ) | |||
209 | 209 | ||
210 | // qDebug(discoveredDevice + "(" + deviceAddr + ")"); | 210 | // odebug << discoveredDevice + "(" + deviceAddr + ")" << oendl; |
211 | 211 | ||
@@ -221,3 +221,3 @@ void IrdaApplet::showDiscovered ( ) | |||
221 | for ( it = m_devices. begin ( ); it != m_devices. end ( ); ) { | 221 | for ( it = m_devices. begin ( ); it != m_devices. end ( ); ) { |
222 | // qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?"); | 222 | // odebug << "IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?" << oendl; |
223 | 223 | ||
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 | |||
@@ -70,3 +70,3 @@ void Multikey::mouseReleaseEvent(QMouseEvent *ev) | |||
70 | QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)"); | 70 | QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)"); |
71 | //qDebug("Lang=%d, count=%d, lab=%s", lang, sw_maps.count(), labels[lang].ascii()); | 71 | //odebug << "Lang=" << lang << ", count=" << sw_maps.count() << ", lab=" << labels[lang].ascii() << "" << oendl; |
72 | e << sw_maps[lang]; | 72 | e << sw_maps[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 | |||
@@ -55,3 +55,2 @@ RestartApplet::RestartApplet( QWidget *parent, const char *name ) | |||
55 | setFixedWidth( 16 ); | 55 | setFixedWidth( 16 ); |
56 | qDebug("new restartapplet"); | ||
57 | show(); | 56 | show(); |
@@ -68,3 +67,2 @@ void RestartApplet::paintEvent( QPaintEvent* ) { | |||
68 | QPainter p(this); | 67 | QPainter p(this); |
69 | qDebug("paint RESTART pixmap"); | ||
70 | p.drawPixmap( 0, 1, ( const char** ) restart_xpm ); | 68 | 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 | |||
@@ -35,3 +35,2 @@ QWidget *RestartAppletImpl::applet( QWidget *parent ) | |||
35 | { | 35 | { |
36 | qDebug("restart applet"); | ||
37 | if ( !restart ) | 36 | if ( !restart ) |
@@ -54,4 +53,4 @@ QRESULT RestartAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface | |||
54 | else | 53 | else |
55 | return QS_FALSE; | 54 | return QS_FALSE; |
56 | 55 | ||
57 | if ( *iface ) | 56 | if ( *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 | |||
@@ -33,2 +33,3 @@ | |||
33 | /* OPIE */ | 33 | /* OPIE */ |
34 | #include <opie2/odebug.h> | ||
34 | #include <opie2/odevice.h> | 35 | #include <opie2/odevice.h> |
@@ -64,3 +65,3 @@ void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data | |||
64 | { | 65 | { |
65 | qDebug( "RotateApplet::channelReceived( '%s' )", (const char*) msg ); | 66 | odebug << "RotateApplet::channelReceived( '" << msg << "' )" << oendl; |
66 | 67 | ||
@@ -74,3 +75,3 @@ void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data | |||
74 | OHingeStatus status = ODevice::inst()->readHingeSensor(); | 75 | OHingeStatus status = ODevice::inst()->readHingeSensor(); |
75 | qDebug( "RotateApplet::readHingeSensor = %d", (int) status ); | 76 | odebug << "RotateApplet::readHingeSensor = " << (int) status << "" << oendl; |
76 | 77 | ||
@@ -98,3 +99,3 @@ void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data | |||
98 | } | 99 | } |
99 | qDebug( "RotateApplet::switchAction %d performed.", cfg.readNumEntry( "CloseHingeAction", 0 ) ); | 100 | odebug << "RotateApplet::switchAction " << cfg.readNumEntry( "CloseHingeAction" ) << " performed." << oendl; |
100 | } | 101 | } |
@@ -241,3 +242,3 @@ QRESULT RotateApplet::queryInterface( const QUuid &uuid, QUnknownInterface **ifa | |||
241 | else | 242 | else |
242 | return QS_FALSE; | 243 | return QS_FALSE; |
243 | 244 | ||
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 | |||
@@ -18,2 +18,3 @@ | |||
18 | /* OPIE */ | 18 | /* OPIE */ |
19 | #include <opie2/odebug.h> | ||
19 | #include <opie2/otaskbarapplet.h> | 20 | #include <opie2/otaskbarapplet.h> |
@@ -21,2 +22,4 @@ | |||
21 | #include <qpe/applnk.h> | 22 | #include <qpe/applnk.h> |
23 | using namespace Opie::Core; | ||
24 | using namespace Opie::Ui; | ||
22 | 25 | ||
@@ -41,182 +44,181 @@ | |||
41 | /* XPM */ | 44 | /* XPM */ |
42 | using namespace Opie::Ui; | ||
43 | static char * snapshot_xpm[] = { | 45 | static char * snapshot_xpm[] = { |
44 | "32 32 177 2", | 46 | "32 32 177 2", |
45 | " c None", | 47 | " c None", |
46 | ". c #042045", | 48 | ". c #042045", |
47 | "+ c #0D2B47", | 49 | "+ c #0D2B47", |
48 | "@ c #0E325E", | 50 | "@ c #0E325E", |
49 | "# c #0D2E50", | 51 | "# c #0D2E50", |
50 | "$ c #0A1C32", | 52 | "$ c #0A1C32", |
51 | "% c #0F3A69", | 53 | "% c #0F3A69", |
52 | "& c #164680", | 54 | "& c #164680", |
53 | "* c #165EAE", | 55 | "* c #165EAE", |
54 | "= c #134D89", | 56 | "= c #134D89", |
55 | "- c #0A3A6E", | 57 | "- c #0A3A6E", |
56 | "; c #031024", | 58 | "; c #031024", |
57 | "> c #031B36", | 59 | "> c #031B36", |
58 | ", c #1A5EA3", | 60 | ", c #1A5EA3", |
59 | "' c #1862B1", | 61 | "' c #1862B1", |
60 | ") c #1866B9", | 62 | ") c #1866B9", |
61 | "! c #0F5AAC", | 63 | "! c #0F5AAC", |
62 | "~ c #0F56A8", | 64 | "~ c #0F56A8", |
63 | "{ c #0C4C96", | 65 | "{ c #0C4C96", |
64 | "] c #030918", | 66 | "] c #030918", |
65 | "^ c #060206", | 67 | "^ c #060206", |
66 | "/ c #20242C", | 68 | "/ c #20242C", |
67 | "( c #3E3B3B", | 69 | "( c #3E3B3B", |
68 | "_ c #186ABD", | 70 | "_ c #186ABD", |
69 | ": c #115EB3", | 71 | ": c #115EB3", |
70 | "< c #082644", | 72 | "< c #082644", |
71 | "[ c #222C38", | 73 | "[ c #222C38", |
72 | "} c #5A5859", | 74 | "} c #5A5859", |
73 | "| c #091921", | 75 | "| c #091921", |
74 | "1 c #1E7EDE", | 76 | "1 c #1E7EDE", |
75 | "2 c #1A7ADA", | 77 | "2 c #1A7ADA", |
76 | "3 c #1970CD", | 78 | "3 c #1970CD", |
77 | "4 c #1758A1", | 79 | "4 c #1758A1", |
78 | "5 c #0E529A", | 80 | "5 c #0E529A", |
79 | "6 c #094388", | 81 | "6 c #094388", |
80 | "7 c #22364E", | 82 | "7 c #22364E", |
81 | "8 c #384454", | 83 | "8 c #384454", |
82 | "9 c #04162C", | 84 | "9 c #04162C", |
83 | "0 c #123451", | 85 | "0 c #123451", |
84 | "a c #3296B4", | 86 | "a c #3296B4", |
85 | "b c #298AB1", | 87 | "b c #298AB1", |
86 | "c c #2484AC", | 88 | "c c #2484AC", |
87 | "d c #033D86", | 89 | "d c #033D86", |
88 | "e c #033677", | 90 | "e c #033677", |
89 | "f c #072C58", | 91 | "f c #072C58", |
90 | "g c #525862", | 92 | "g c #525862", |
91 | "h c #5E5E5E", | 93 | "h c #5E5E5E", |
92 | "i c #23492A", | 94 | "i c #23492A", |
93 | "j c #4FBD3F", | 95 | "j c #4FBD3F", |
94 | "k c #50B24C", | 96 | "k c #50B24C", |
95 | "l c #51C72E", | 97 | "l c #51C72E", |
96 | "m c #42C64A", | 98 | "m c #42C64A", |
97 | "n c #2686CA", | 99 | "n c #2686CA", |
98 | "o c #0B52A4", | 100 | "o c #0B52A4", |
99 | "p c #054A9A", | 101 | "p c #054A9A", |
100 | "q c #053B7C", | 102 | "q c #053B7C", |
101 | "r c #2B2325", | 103 | "r c #2B2325", |
102 | "s c #6E7070", | 104 | "s c #6E7070", |
103 | "t c #0D240E", | 105 | "t c #0D240E", |
104 | "u c #1E423E", | 106 | "u c #1E423E", |
105 | "v c #468ABE", | 107 | "v c #468ABE", |
106 | "w c #6A8AC2", | 108 | "w c #6A8AC2", |
107 | "x c #7EAA8E", | 109 | "x c #7EAA8E", |
108 | "y c #84BE4E", | 110 | "y c #84BE4E", |
109 | "z c #65C639", | 111 | "z c #65C639", |
110 | "A c #064EA0", | 112 | "A c #064EA0", |
111 | "B c #0A4DA0", | 113 | "B c #0A4DA0", |
112 | "C c #4E5242", | 114 | "C c #4E5242", |
113 | "D c #62362E", | 115 | "D c #62362E", |
114 | "E c #721A1A", | 116 | "E c #721A1A", |
115 | "F c #6E0A0A", | 117 | "F c #6E0A0A", |
116 | "G c #3E0E0E", | 118 | "G c #3E0E0E", |
117 | "H c #6AB85E", | 119 | "H c #6AB85E", |
118 | "I c #7E8ECA", | 120 | "I c #7E8ECA", |
119 | "J c #929CD4", | 121 | "J c #929CD4", |
120 | "K c #9EAECA", | 122 | "K c #9EAECA", |
121 | "L c #9EBEAE", | 123 | "L c #9EBEAE", |
122 | "M c #8EC26A", | 124 | "M c #8EC26A", |
123 | "N c #32A276", | 125 | "N c #32A276", |
124 | "O c #20518C", | 126 | "O c #20518C", |
125 | "P c #46566E", | 127 | "P c #46566E", |
126 | "Q c #614A51", | 128 | "Q c #614A51", |
127 | "R c #AE2A26", | 129 | "R c #AE2A26", |
128 | "S c #C41C1A", | 130 | "S c #C41C1A", |
129 | "T c #CE0A0A", | 131 | "T c #CE0A0A", |
130 | "U c #A60606", | 132 | "U c #A60606", |
131 | "V c #921616", | 133 | "V c #921616", |
132 | "W c #863735", | 134 | "W c #863735", |
133 | "X c #866A66", | 135 | "X c #866A66", |
134 | "Y c #9E9EA2", | 136 | "Y c #9E9EA2", |
135 | "Z c #1E5212", | 137 | "Z c #1E5212", |
136 | "` c #7EC652", | 138 | "` c #7EC652", |
137 | " .c #B2B2F2", | 139 | " . c #B2B2F2", |
138 | "..c #CACAF6", | 140 | ".. c #CACAF6", |
139 | "+.c #AECEC6", | 141 | "+. c #AECEC6", |
140 | "@.c #92CE72", | 142 | "@. c #92CE72", |
141 | "#.c #42AA86", | 143 | "#. c #42AA86", |
142 | "$.c #365E96", | 144 | "$. c #365E96", |
143 | "%.c #B82420", | 145 | "%. c #B82420", |
144 | "&.c #E20E0E", | 146 | "&. c #E20E0E", |
145 | "*.c #EF0E0B", | 147 | "*. c #EF0E0B", |
146 | "=.c #566A86", | 148 | "=. c #566A86", |
147 | "-.c #92929A", | 149 | "-. c #92929A", |
148 | ";.c #16260E", | 150 | ";. c #16260E", |
149 | ">.c #2E571A", | 151 | ">. c #2E571A", |
150 | ",.c #7ED64E", | 152 | ",. c #7ED64E", |
151 | "'.c #9ECEB2", | 153 | "'. c #9ECEB2", |
152 | ").c #C6D5EF", | 154 | "). c #C6D5EF", |
153 | "!.c #E2E0FE", | 155 | "!. c #E2E0FE", |
154 | "~.c #A2DE8A", | 156 | "~. c #A2DE8A", |
155 | "{.c #4AAA5B", | 157 | "{. c #4AAA5B", |
156 | "].c #2A6AB2", | 158 | "]. c #2A6AB2", |
157 | "^.c #9A7A6E", | 159 | "^. c #9A7A6E", |
158 | "/.c #D25A52", | 160 | "/. c #D25A52", |
159 | "(.c #F62626", | 161 | "(. c #F62626", |
160 | "_.c #FA0206", | 162 | "_. c #FA0206", |
161 | ":.c #DE1E16", | 163 | ":. c #DE1E16", |
162 | "<.c #B63A26", | 164 | "<. c #B63A26", |
163 | "[.c #865A2E", | 165 | "[. c #865A2E", |
164 | "}.c #26568E", | 166 | "}. c #26568E", |
165 | "|.c #435F7D", | 167 | "|. c #435F7D", |
166 | "1.c #7AE246", | 168 | "1. c #7AE246", |
167 | "2.c #96EA6E", | 169 | "2. c #96EA6E", |
168 | "3.c #BEEAAE", | 170 | "3. c #BEEAAE", |
169 | "4.c #D0EADC", | 171 | "4. c #D0EADC", |
170 | "5.c #B6CEFE", | 172 | "5. c #B6CEFE", |
171 | "6.c #9ADE8A", | 173 | "6. c #9ADE8A", |
172 | "7.c #2A609A", | 174 | "7. c #2A609A", |
173 | "8.c #7E623E", | 175 | "8. c #7E623E", |
174 | "9.c #CA7A72", | 176 | "9. c #CA7A72", |
175 | "0.c #F26E6E", | 177 | "0. c #F26E6E", |
176 | "a.c #FE5252", | 178 | "a. c #FE5252", |
177 | "b.c #FA3638", | 179 | "b. c #FA3638", |
178 | "c.c #DA2E28", | 180 | "c. c #DA2E28", |
179 | "d.c #9E3E3A", | 181 | "d. c #9E3E3A", |
180 | "e.c #3E7656", | 182 | "e. c #3E7656", |
181 | "f.c #76CB3A", | 183 | "f. c #76CB3A", |
182 | "g.c #90DE44", | 184 | "g. c #90DE44", |
183 | "h.c #A2EE6A", | 185 | "h. c #A2EE6A", |
184 | "i.c #9EEA9A", | 186 | "i. c #9EEA9A", |
185 | "j.c #92BEDE", | 187 | "j. c #92BEDE", |
186 | "k.c #7ADA7E", | 188 | "k. c #7ADA7E", |
187 | "l.c #5ECE52", | 189 | "l. c #5ECE52", |
188 | "m.c #6A5E52", | 190 | "m. c #6A5E52", |
189 | "n.c #A83238", | 191 | "n. c #A83238", |
190 | "o.c #FA5656", | 192 | "o. c #FA5656", |
191 | "p.c #F29A92", | 193 | "p. c #F29A92", |
192 | "q.c #D29E92", | 194 | "q. c #D29E92", |
193 | "r.c #8A7A62", | 195 | "r. c #8A7A62", |
194 | "s.c #05336B", | 196 | "s. c #05336B", |
195 | "t.c #59C631", | 197 | "t. c #59C631", |
196 | "u.c #8AD23A", | 198 | "u. c #8AD23A", |
197 | "v.c #66E242", | 199 | "v. c #66E242", |
198 | "w.c #1D6FC1", | 200 | "w. c #1D6FC1", |
199 | "x.c #E61212", | 201 | "x. c #E61212", |
200 | "y.c #CA261E", | 202 | "y. c #CA261E", |
201 | "z.c #5A763E", | 203 | "z. c #5A763E", |
202 | "A.c #1E6E9A", | 204 | "A. c #1E6E9A", |
203 | "B.c #023272", | 205 | "B. c #023272", |
204 | "C.c #329696", | 206 | "C. c #329696", |
205 | "D.c #2074B6", | 207 | "D. c #2074B6", |
206 | "E.c #3E4E76", | 208 | "E. c #3E4E76", |
207 | "F.c #5A525E", | 209 | "F. c #5A525E", |
208 | "G.c #425868", | 210 | "G. c #425868", |
209 | "H.c #04448E", | 211 | "H. c #04448E", |
210 | "I.c #28828A", | 212 | "I. c #28828A", |
211 | "J.c #2D8593", | 213 | "J. c #2D8593", |
212 | "K.c #12427A", | 214 | "K. c #12427A", |
213 | "L.c #054696", | 215 | "L. c #054696", |
214 | "M.c #042B5E", | 216 | "M. c #042B5E", |
215 | "N.c #134F95", | 217 | "N. c #134F95", |
216 | "O.c #1E6ABB", | 218 | "O. c #1E6ABB", |
217 | "P.c #1A5E96", | 219 | "P. c #1A5E96", |
218 | "Q.c #022E67", | 220 | "Q. c #022E67", |
219 | "R.c #0C3E7C", | 221 | "R. c #0C3E7C", |
220 | "S.c #023E8A", | 222 | "S. c #023E8A", |
221 | "T.c #021A3E", | 223 | "T. c #021A3E", |
222 | " ", | 224 | " ", |
@@ -301,3 +303,3 @@ ScreenshotControl::ScreenshotControl( QWidget *parent, const char *name ) | |||
301 | grabTimer = new QTimer ( this, "grab timer"); | 303 | grabTimer = new QTimer ( this, "grab timer"); |
302 | 304 | ||
303 | connect ( grabTimer, SIGNAL( timeout()), this, SLOT( performGrab())); | 305 | connect ( grabTimer, SIGNAL( timeout()), this, SLOT( performGrab())); |
@@ -364,3 +366,3 @@ void ScreenshotControl::savePixmap() | |||
364 | lnk.setFile(fileName); //sets File property | 366 | lnk.setFile(fileName); //sets File property |
365 | qDebug("saving file " + fileName); | 367 | odebug << "saving file " + fileName << oendl; |
366 | snapshot.save( fileName, "PNG"); | 368 | snapshot.save( fileName, "PNG"); |
@@ -370,3 +372,3 @@ void ScreenshotControl::savePixmap() | |||
370 | if (!lnk.writeLink()) | 372 | if (!lnk.writeLink()) |
371 | qDebug("Writing doclink did not work"); | 373 | odebug << "Writing doclink did not work" << oendl; |
372 | } | 374 | } |
@@ -382,3 +384,3 @@ void ScreenshotControl::savePixmap() | |||
382 | if ( !QDir( dirName).exists() ) { | 384 | if ( !QDir( dirName).exists() ) { |
383 | qDebug("making dir " + dirName); | 385 | odebug << "making dir " + dirName << oendl; |
384 | QString msg = "mkdir -p " + dirName; | 386 | QString msg = "mkdir -p " + dirName; |
@@ -390,3 +392,3 @@ void ScreenshotControl::savePixmap() | |||
390 | lnk.setFile(fileName); //sets File property | 392 | lnk.setFile(fileName); //sets File property |
391 | qDebug("saving file " + fileName); | 393 | odebug << "saving file " + fileName << oendl; |
392 | snapshot.save( fileName, "PNG"); | 394 | snapshot.save( fileName, "PNG"); |
@@ -396,3 +398,3 @@ void ScreenshotControl::savePixmap() | |||
396 | if (!lnk.writeLink()) | 398 | if (!lnk.writeLink()) |
397 | qDebug("Writing doclink did not work"); | 399 | odebug << "Writing doclink did not work" << oendl; |
398 | 400 | ||
@@ -405,80 +407,80 @@ void ScreenshotControl::performGrab() | |||
405 | { | 407 | { |
406 | snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(), QApplication::desktop()->height() ); | 408 | snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(), QApplication::desktop()->height() ); |
407 | 409 | ||
408 | if (buttonPushed == 1) { | 410 | if (buttonPushed == 1) { |
409 | qDebug("grabbing screen"); | 411 | odebug << "grabbing screen" << oendl; |
410 | grabTimer->stop(); | 412 | grabTimer->stop(); |
411 | show(); | 413 | show(); |
412 | qApp->processEvents(); | 414 | qApp->processEvents(); |
413 | savePixmap(); | 415 | savePixmap(); |
414 | } else { | 416 | } else { |
415 | grabTimer->stop(); | 417 | grabTimer->stop(); |
416 | 418 | ||
417 | struct sockaddr_in raddr; | 419 | struct sockaddr_in raddr; |
418 | struct hostent *rhost_info; | 420 | struct hostent *rhost_info; |
419 | int sock = -1; | 421 | int sock = -1; |
420 | bool ok = false; | 422 | bool ok = false; |
421 | 423 | ||
422 | QString displayEnv = getenv("QWS_DISPLAY"); | 424 | QString displayEnv = getenv("QWS_DISPLAY"); |
423 | qDebug(displayEnv); | 425 | odebug << displayEnv << oendl; |
424 | 426 | ||
425 | if(( displayEnv.left(2) != ":0" ) && (!displayEnv.isEmpty())) { | 427 | if(( displayEnv.left(2) != ":0" ) && (!displayEnv.isEmpty())) { |
426 | 428 | ||
427 | if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) { | 429 | if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) { |
428 | ::memset ( &raddr, 0, sizeof (struct sockaddr_in)); | 430 | ::memset ( &raddr, 0, sizeof (struct sockaddr_in)); |
429 | ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length ); | 431 | ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length ); |
430 | raddr. sin_family = rhost_info-> h_addrtype; | 432 | raddr. sin_family = rhost_info-> h_addrtype; |
431 | raddr. sin_port = htons ( SCAP_port ); | 433 | raddr. sin_port = htons ( SCAP_port ); |
432 | 434 | ||
433 | if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 ) { | 435 | if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 ) { |
434 | if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) { | 436 | if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) { |
435 | 437 | ||
436 | QString header; | 438 | QString header; |
437 | 439 | ||
438 | QPixmap pix; | 440 | QPixmap pix; |
439 | 441 | ||
440 | QString SCAP_model=""; | 442 | QString SCAP_model=""; |
441 | #warning FIXME: model string should be filled with actual device model | 443 | #warning FIXME: model string should be filled with actual device model |
442 | if( snapshot.width() > 320) | 444 | if( snapshot.width() > 320) |
443 | SCAP_model ="Corgi"; | 445 | SCAP_model ="Corgi"; |
444 | 446 | ||
445 | if(displayEnv == "QVFb:0") {//set this if you plan on using this app in qvfb!! | 447 | if(displayEnv == "QVFb:0") {//set this if you plan on using this app in qvfb!! |
446 | pix = snapshot.xForm(QWMatrix().rotate(90)); | 448 | pix = snapshot.xForm(QWMatrix().rotate(90)); |
447 | } else | 449 | } else |
448 | pix = ( snapshot.width() > snapshot.height() ) ? snapshot : snapshot.xForm( QWMatrix().rotate(90) ); | 450 | pix = ( snapshot.width() > snapshot.height() ) ? snapshot : snapshot.xForm( QWMatrix().rotate(90) ); |
449 | 451 | ||
450 | QImage img = pix.convertToImage().convertDepth( 16 ); // could make that also depth independent, if hh.org/scap can handle it | 452 | QImage img = pix.convertToImage().convertDepth( 16 ); // could make that also depth independent, if hh.org/scap can handle it |
451 | 453 | ||
452 | header = "POST /scap/capture.cgi?%1+%2 HTTP/1.1\n" // 1: model / 2: user | 454 | header = "POST /scap/capture.cgi?%1+%2 HTTP/1.1\n" // 1: model / 2: user |
453 | "Content-length: %3\n" // 3: content length | 455 | "Content-length: %3\n" // 3: content length |
454 | "Content-Type: image/png\n" | 456 | "Content-Type: image/png\n" |
455 | "Host: %4\n" // 4: scap host | 457 | "Host: %4\n" // 4: scap host |
456 | "\n"; | 458 | "\n"; |
457 | 459 | ||
458 | 460 | ||
459 | header = header.arg( SCAP_model).arg( ::getenv( "USER" ) ).arg( img.numBytes() ).arg( SCAP_hostname ); | 461 | header = header.arg( SCAP_model).arg( ::getenv( "USER" ) ).arg( img.numBytes() ).arg( SCAP_hostname ); |
460 | qDebug(header); | 462 | odebug << header << oendl; |
461 | 463 | ||
462 | if ( !pix.isNull() ) { | 464 | if ( !pix.isNull() ) { |
463 | const char *ascii = header.latin1( ); | 465 | const char *ascii = header.latin1( ); |
464 | uint ascii_len = ::strlen( ascii ); | 466 | uint ascii_len = ::strlen( ascii ); |
465 | ::write ( sock, ascii, ascii_len ); | 467 | ::write ( sock, ascii, ascii_len ); |
466 | ::write ( sock, img.bits(), img.numBytes() ); | 468 | ::write ( sock, img.bits(), img.numBytes() ); |
467 | 469 | ||
468 | ok = true; | 470 | ok = true; |
469 | } | 471 | } |
470 | } | 472 | } |
471 | ::close ( sock ); | 473 | ::close ( sock ); |
472 | } | 474 | } |
473 | } | 475 | } |
474 | if ( ok ) { | 476 | if ( ok ) { |
475 | QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname )); | 477 | QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname )); |
476 | } else { | 478 | } else { |
477 | QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname )); | 479 | QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname )); |
478 | } | 480 | } |
479 | } else { | 481 | } else { |
480 | QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable.")); | 482 | QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable.")); |
481 | } | 483 | } |
482 | } | 484 | } |
483 | 485 | ||
484 | } | 486 | } |
@@ -492,3 +494,3 @@ ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name ) | |||
492 | { | 494 | { |
493 | setFixedWidth( AppLnk::smallIconSize()); | 495 | setFixedWidth( AppLnk::smallIconSize()); |
494 | 496 | ||
@@ -516,3 +518,3 @@ void ScreenshotApplet::mousePressEvent( QMouseEvent *) | |||
516 | // so we check the position against the screen width and correct the difference if needed | 518 | // so we check the position against the screen width and correct the difference if needed |
517 | 519 | ||
518 | int screenWidth = qApp->desktop()->width(); | 520 | int screenWidth = qApp->desktop()->width(); |
@@ -520,11 +522,11 @@ void ScreenshotApplet::mousePressEvent( QMouseEvent *) | |||
520 | int ZwindowPosX, XwindowPosX; | 522 | int ZwindowPosX, XwindowPosX; |
521 | 523 | ||
522 | // the window would be placed beyond the screen wich doesn't look tooo good | 524 | // the window would be placed beyond the screen wich doesn't look tooo good |
523 | if ( (windowPosX + sc-> sizeHint ( ). width ( )) > screenWidth ) { | 525 | if ( (windowPosX + sc-> sizeHint ( ). width ( )) > screenWidth ) { |
524 | XwindowPosX = windowPosX + sc-> sizeHint ( ). width ( ) - screenWidth; | 526 | XwindowPosX = windowPosX + sc-> sizeHint ( ). width ( ) - screenWidth; |
525 | ZwindowPosX = windowPosX - XwindowPosX - 1; | 527 | ZwindowPosX = windowPosX - XwindowPosX - 1; |
526 | } else { | 528 | } else { |
527 | ZwindowPosX = windowPosX; | 529 | ZwindowPosX = windowPosX; |
528 | } | 530 | } |
529 | 531 | ||
530 | sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) ); | 532 | sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) ); |
@@ -536,3 +538,3 @@ void ScreenshotApplet::paintEvent( QPaintEvent* ) | |||
536 | QPainter p ( this ); | 538 | QPainter p ( this ); |
537 | p.drawPixmap( 0,0, m_icon ); | 539 | p.drawPixmap( 0,0, m_icon ); |
538 | } | 540 | } |
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 | |||
@@ -14,2 +14,6 @@ | |||
14 | 14 | ||
15 | /* OPIE */ | ||
16 | #include <opie2/odebug.h> | ||
17 | using namespace Opie::Core; | ||
18 | |||
15 | extern "C" { | 19 | extern "C" { |
@@ -31,3 +35,3 @@ typedef struct _waveheader { | |||
31 | u_long sub_chunk; /* 'fmt ' */ | 35 | u_long sub_chunk; /* 'fmt ' */ |
32 | u_long sc_len; /* length of sub_chunk, =16 | 36 | u_long sc_len; /* length of sub_chunk, =16 |
33 | (chunckSize) format len */ | 37 | (chunckSize) format len */ |
@@ -200,6 +204,6 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
200 | setFixedWidth( 14 ); | 204 | setFixedWidth( 14 ); |
201 | 205 | ||
202 | t_timer = new QTimer( this ); | 206 | t_timer = new QTimer( this ); |
203 | connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) ); | 207 | connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) ); |
204 | 208 | ||
205 | Config vmCfg("Vmemo"); | 209 | Config vmCfg("Vmemo"); |
@@ -209,8 +213,8 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
209 | 213 | ||
210 | qDebug("toggleKey %d", toggleKey); | 214 | odebug << "toggleKey " << toggleKey << "" << oendl; |
211 | if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" )) | 215 | if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" )) |
212 | systemZaurus=TRUE; | 216 | systemZaurus=TRUE; |
213 | else | 217 | else |
214 | systemZaurus=FALSE; | 218 | systemZaurus=FALSE; |
215 | 219 | ||
216 | myChannel = new QCopChannel( "QPE/VMemo", this ); | 220 | myChannel = new QCopChannel( "QPE/VMemo", this ); |
@@ -247,3 +251,3 @@ int VMemo::position() | |||
247 | void VMemo::receive( const QCString &msg, const QByteArray &data ) { | 251 | void VMemo::receive( const QCString &msg, const QByteArray &data ) { |
248 | qDebug("receive"); | 252 | odebug << "receive" << oendl; |
249 | QDataStream stream( data, IO_ReadOnly ); | 253 | QDataStream stream( data, IO_ReadOnly ); |
@@ -269,3 +273,3 @@ void VMemo::mousePressEvent( QMouseEvent * me) { | |||
269 | mousePressEvent and mouseReleaseEvent with a NULL parameter. */ | 273 | mousePressEvent and mouseReleaseEvent with a NULL parameter. */ |
270 | 274 | ||
271 | // if (!systemZaurus && me != NULL) | 275 | // if (!systemZaurus && me != NULL) |
@@ -295,3 +299,3 @@ bool VMemo::startRecording() { | |||
295 | 299 | ||
296 | qDebug("Start recording engines"); | 300 | odebug << "Start recording engines" << oendl; |
297 | recording = TRUE; | 301 | recording = TRUE; |
@@ -302,3 +306,3 @@ bool VMemo::startRecording() { | |||
302 | } | 306 | } |
303 | 307 | ||
304 | config.setGroup("Defaults"); | 308 | config.setGroup("Defaults"); |
@@ -320,3 +324,3 @@ bool VMemo::startRecording() { | |||
320 | fileName=fileName.right(fileName.length()-s-2); | 324 | fileName=fileName.right(fileName.length()-s-2); |
321 | qDebug("pathname will be "+fileName); | 325 | odebug << "pathname will be "+fileName << oendl; |
322 | 326 | ||
@@ -327,10 +331,10 @@ bool VMemo::startRecording() { | |||
327 | fName = "vm_"+ date+ ".wav"; | 331 | fName = "vm_"+ date+ ".wav"; |
328 | 332 | ||
329 | fileName+=fName; | 333 | fileName+=fName; |
330 | qDebug("filename is "+fileName); | 334 | odebug << "filename is "+fileName << oendl; |
331 | // open tmp file here | 335 | // open tmp file here |
332 | char *pointer; | 336 | char *pointer; |
333 | pointer=tmpnam(NULL); | 337 | pointer=tmpnam(NULL); |
334 | qDebug("Opening tmp file %s",pointer); | 338 | odebug << "Opening tmp file " << pointer << "" << oendl; |
335 | 339 | ||
336 | if(openWAV(pointer ) == -1) { | 340 | if(openWAV(pointer ) == -1) { |
@@ -351,3 +355,3 @@ bool VMemo::startRecording() { | |||
351 | // move tmp file to regular file here | 355 | // move tmp file to regular file here |
352 | 356 | ||
353 | system(cmd.latin1()); | 357 | system(cmd.latin1()); |
@@ -356,3 +360,3 @@ bool VMemo::startRecording() { | |||
356 | cats[0] = config.readNumEntry("Category", 0); | 360 | cats[0] = config.readNumEntry("Category", 0); |
357 | 361 | ||
358 | QString dlName("vm_"); | 362 | QString dlName("vm_"); |
@@ -368,3 +372,3 @@ bool VMemo::startRecording() { | |||
368 | return FALSE; | 372 | return FALSE; |
369 | 373 | ||
370 | } | 374 | } |
@@ -373,3 +377,3 @@ void VMemo::stopRecording() { | |||
373 | show(); | 377 | show(); |
374 | qDebug("Stopped recording"); | 378 | odebug << "Stopped recording" << oendl; |
375 | recording = FALSE; | 379 | recording = FALSE; |
@@ -390,3 +394,3 @@ int VMemo::openDSP() { | |||
390 | cfg.setGroup("Record"); | 394 | cfg.setGroup("Record"); |
391 | 395 | ||
392 | speed = cfg.readNumEntry("SampleRate", 22050); | 396 | speed = cfg.readNumEntry("SampleRate", 22050); |
@@ -401,3 +405,3 @@ int VMemo::openDSP() { | |||
401 | 405 | ||
402 | qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); | 406 | odebug << "samplerate: " << speed << ", channels " << channels << ", resolution " << resolution << "" << oendl; |
403 | 407 | ||
@@ -409,3 +413,3 @@ int VMemo::openDSP() { | |||
409 | } | 413 | } |
410 | 414 | ||
411 | if(dsp == -1) { | 415 | if(dsp == -1) { |
@@ -414,3 +418,3 @@ int VMemo::openDSP() { | |||
414 | delete msgLabel; | 418 | delete msgLabel; |
415 | 419 | ||
416 | perror("open(\"/dev/dsp\")"); | 420 | perror("open(\"/dev/dsp\")"); |
@@ -420,3 +424,3 @@ int VMemo::openDSP() { | |||
420 | } | 424 | } |
421 | 425 | ||
422 | if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { | 426 | if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { |
@@ -439,3 +443,3 @@ int VMemo::openDSP() { | |||
439 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; //mute | 443 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; //mute |
440 | 444 | ||
441 | return 1; | 445 | return 1; |
@@ -454,3 +458,3 @@ int VMemo::openWAV(const char *filename) { | |||
454 | useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0); | 458 | useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0); |
455 | 459 | ||
456 | WaveHeader wh; | 460 | WaveHeader wh; |
@@ -458,3 +462,3 @@ int VMemo::openWAV(const char *filename) { | |||
458 | wh.main_chunk = RIFF; | 462 | wh.main_chunk = RIFF; |
459 | wh.length=0; | 463 | wh.length=0; |
460 | wh.chunk_type = WAVE; | 464 | wh.chunk_type = WAVE; |
@@ -465,3 +469,3 @@ int VMemo::openWAV(const char *filename) { | |||
465 | else | 469 | else |
466 | wh.format = PCM_CODE; | 470 | wh.format = PCM_CODE; |
467 | wh.modus = channels; | 471 | wh.modus = channels; |
@@ -469,6 +473,6 @@ int VMemo::openWAV(const char *filename) { | |||
469 | wh.byte_p_sec = speed * channels * resolution/8; | 473 | wh.byte_p_sec = speed * channels * resolution/8; |
470 | wh.byte_p_spl = channels * (resolution / 8); | 474 | wh.byte_p_spl = channels * (resolution / 8); |
471 | wh.bit_p_spl = resolution; | 475 | wh.bit_p_spl = resolution; |
472 | wh.data_chunk = DATA; | 476 | wh.data_chunk = DATA; |
473 | wh.data_length= 0; | 477 | wh.data_length= 0; |
474 | // qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d" | 478 | // qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d" |
@@ -476,3 +480,3 @@ int VMemo::openWAV(const char *filename) { | |||
476 | write (wav, &wh, sizeof(WaveHeader)); | 480 | write (wav, &wh, sizeof(WaveHeader)); |
477 | 481 | ||
478 | return 1; | 482 | return 1; |
@@ -485,3 +489,3 @@ bool VMemo::record() { | |||
485 | msg.sprintf("Recording format %d", format); | 489 | msg.sprintf("Recording format %d", format); |
486 | qDebug(msg); | 490 | odebug << msg << oendl; |
487 | Config config("Vmemo"); | 491 | Config config("Vmemo"); |
@@ -496,3 +500,3 @@ bool VMemo::record() { | |||
496 | msg.sprintf("Recording format other"); | 500 | msg.sprintf("Recording format other"); |
497 | qDebug(msg); | 501 | odebug << msg << oendl; |
498 | 502 | ||
@@ -515,3 +519,3 @@ bool VMemo::record() { | |||
515 | perror("recording error "); | 519 | perror("recording error "); |
516 | // qDebug(currentFileName); | 520 | // odebug << currentFileName << oendl; |
517 | QMessageBox::message(tr("Note"),tr("error recording")); | 521 | QMessageBox::message(tr("Note"),tr("error recording")); |
@@ -542,3 +546,3 @@ bool VMemo::record() { | |||
542 | } | 546 | } |
543 | // printf("%d\r",length); | 547 | // odebug << "" << length << "\r" << oendl; |
544 | // fflush(stdout); | 548 | // fflush(stdout); |
@@ -561,4 +565,4 @@ bool VMemo::record() { | |||
561 | track.close(); | 565 | track.close(); |
562 | qDebug("Track closed"); | 566 | odebug << "Track closed" << oendl; |
563 | 567 | ||
564 | if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) | 568 | if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) |
@@ -575,3 +579,3 @@ bool VMemo::record() { | |||
575 | QString currentFile = "vm_"+ date; | 579 | QString currentFile = "vm_"+ date; |
576 | 580 | ||
577 | float numberOfRecordedSeconds=(float) length / (float)speed * (float)2; | 581 | float numberOfRecordedSeconds=(float) length / (float)speed * (float)2; |
@@ -585,3 +589,3 @@ bool VMemo::record() { | |||
585 | cfgO.writeEntry( currentFileName, time ); | 589 | cfgO.writeEntry( currentFileName, time ); |
586 | // qDebug("writing config numberOfRecordedSeconds "+time); | 590 | // odebug << "writing config numberOfRecordedSeconds "+time << oendl; |
587 | 591 | ||
@@ -589,3 +593,3 @@ bool VMemo::record() { | |||
589 | 593 | ||
590 | qDebug("done recording "+fileName); | 594 | odebug << "done recording "+fileName << oendl; |
591 | 595 | ||
@@ -604,28 +608,28 @@ int VMemo::setToggleButton(int tog) { | |||
604 | case 0: | 608 | case 0: |
605 | return -1; | 609 | return -1; |
606 | break; | 610 | break; |
607 | case 1: | 611 | case 1: |
608 | return 0; | 612 | return 0; |
609 | break; | 613 | break; |
610 | case 2: | 614 | case 2: |
611 | return Key_F24; //was Escape | 615 | return Key_F24; //was Escape |
612 | break; | 616 | break; |
613 | case 3: | 617 | case 3: |
614 | return Key_Space; | 618 | return Key_Space; |
615 | break; | 619 | break; |
616 | case 4: | 620 | case 4: |
617 | return Key_F12; | 621 | return Key_F12; |
618 | break; | 622 | break; |
619 | case 5: | 623 | case 5: |
620 | return Key_F9; | 624 | return Key_F9; |
621 | break; | 625 | break; |
622 | case 6: | 626 | case 6: |
623 | return Key_F10; | 627 | return Key_F10; |
624 | break; | 628 | break; |
625 | case 7: | 629 | case 7: |
626 | return Key_F11; | 630 | return Key_F11; |
627 | break; | 631 | break; |
628 | case 8: | 632 | case 8: |
629 | return Key_F13; | 633 | return Key_F13; |
630 | break; | 634 | break; |
631 | }; | 635 | }; |
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,5 +1,3 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2003 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2003-2004 Michael 'Mickey' Lauer <mickey@Vanille.de> |
3 | ** | ||
4 | ** Contact me @ mickeyl@handhelds.org | ||
5 | ** | 3 | ** |
@@ -15,6 +13,13 @@ | |||
15 | 13 | ||
14 | #include "vt.h" | ||
15 | |||
16 | /* OPIE */ | ||
17 | #include <opie2/odebug.h> | ||
16 | #include <qpe/resource.h> | 18 | #include <qpe/resource.h> |
19 | using namespace Opie::Core; | ||
17 | 20 | ||
21 | /* QT */ | ||
18 | #include <qpopupmenu.h> | 22 | #include <qpopupmenu.h> |
19 | 23 | ||
24 | /* STD */ | ||
20 | #include <fcntl.h> | 25 | #include <fcntl.h> |
@@ -26,6 +31,4 @@ | |||
26 | 31 | ||
27 | #include "vt.h" | ||
28 | |||
29 | VTApplet::VTApplet ( ) | 32 | VTApplet::VTApplet ( ) |
30 | : QObject ( 0, "VTApplet" ) | 33 | : QObject ( 0, "VTApplet" ) |
31 | { | 34 | { |
@@ -44,3 +47,3 @@ QString VTApplet::name ( ) const | |||
44 | { | 47 | { |
45 | return tr( "VT shortcut" ); | 48 | return tr( "VT shortcut" ); |
46 | } | 49 | } |
@@ -49,3 +52,3 @@ QString VTApplet::text ( ) const | |||
49 | { | 52 | { |
50 | return tr( "Terminal" ); | 53 | return tr( "Terminal" ); |
51 | } | 54 | } |
@@ -66,8 +69,8 @@ QIconSet VTApplet::icon ( ) const | |||
66 | { | 69 | { |
67 | QPixmap pix; | 70 | QPixmap pix; |
68 | QImage img = Resource::loadImage ( "terminal" ); | 71 | QImage img = Resource::loadImage ( "terminal" ); |
69 | 72 | ||
70 | if ( !img. isNull ( )) | 73 | if ( !img. isNull ( )) |
71 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); | 74 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); |
72 | return pix; | 75 | return pix; |
73 | } | 76 | } |
@@ -76,3 +79,3 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const | |||
76 | { | 79 | { |
77 | qDebug( "VTApplet::popup" ); | 80 | odebug << "VTApplet::popup" << oendl; |
78 | 81 | ||
@@ -101,3 +104,3 @@ void VTApplet::changeVT( int index ) | |||
101 | { | 104 | { |
102 | //qDebug( "VTApplet::changeVT( %d )", index-500 ); | 105 | //odebug << "VTApplet::changeVT( " << index-500 << " )" << oendl; |
103 | 106 | ||
@@ -111,3 +114,3 @@ void VTApplet::updateMenu() | |||
111 | { | 114 | { |
112 | //qDebug( "VTApplet::updateMenu()" ); | 115 | //odebug << "VTApplet::updateMenu()" << oendl; |
113 | 116 | ||
@@ -122,5 +125,5 @@ void VTApplet::updateMenu() | |||
122 | if ( result == -1 ) | 125 | if ( result == -1 ) |
123 | qDebug( "VT %d disallocated == free", i ); | 126 | odebug << "VT " << i << " disallocated == free" << oendl; |
124 | else | 127 | else |
125 | qDebug( "VT %d _not_ disallocated == busy", i ); | 128 | odebug << "VT " << i << " _not_ disallocated == busy" << oendl; |
126 | */ | 129 | */ |
@@ -136,3 +139,3 @@ void VTApplet::activated() | |||
136 | { | 139 | { |
137 | qDebug( "VTApplet::activated()" ); | 140 | odebug << "VTApplet::activated()" << oendl; |
138 | } | 141 | } |
@@ -142,13 +145,13 @@ QRESULT VTApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface | |||
142 | { | 145 | { |
143 | *iface = 0; | 146 | *iface = 0; |
144 | if ( uuid == IID_QUnknown ) | 147 | if ( uuid == IID_QUnknown ) |
145 | *iface = this; | 148 | *iface = this; |
146 | else if ( uuid == IID_MenuApplet ) | 149 | else if ( uuid == IID_MenuApplet ) |
147 | *iface = this; | 150 | *iface = this; |
148 | else | 151 | else |
149 | return QS_FALSE; | 152 | return QS_FALSE; |
150 | 153 | ||
151 | if ( *iface ) | 154 | if ( *iface ) |
152 | (*iface)-> addRef ( ); | 155 | (*iface)-> addRef ( ); |
153 | return QS_OK; | 156 | return QS_OK; |
154 | } | 157 | } |
@@ -157,3 +160,3 @@ Q_EXPORT_INTERFACE( ) | |||
157 | { | 160 | { |
158 | Q_CREATE_INSTANCE( VTApplet ) | 161 | Q_CREATE_INSTANCE( VTApplet ) |
159 | } | 162 | } |
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 +1,11 @@ | |||
1 | #include "obex.h" | ||
2 | #include "obexsend.h" | ||
3 | using namespace OpieObex; | ||
4 | |||
5 | /* OPIE */ | ||
6 | #include <opie2/odebug.h> | ||
7 | #include <qpe/qcopenvelope_qws.h> | ||
8 | using namespace Opie::Core; | ||
9 | |||
10 | /* QT */ | ||
1 | #include <qpushbutton.h> | 11 | #include <qpushbutton.h> |
@@ -5,13 +15,4 @@ | |||
5 | 15 | ||
6 | |||
7 | #include <qpe/qcopenvelope_qws.h> | ||
8 | |||
9 | #include "obex.h" | ||
10 | #include "obexsend.h" | ||
11 | |||
12 | using namespace OpieObex; | ||
13 | |||
14 | /* TRANSLATOR OpieObex::SendWidget */ | 16 | /* TRANSLATOR OpieObex::SendWidget */ |
15 | 17 | ||
16 | |||
17 | SendWidget::SendWidget( QWidget* parent, const char* name ) | 18 | SendWidget::SendWidget( QWidget* parent, const char* name ) |
@@ -106,3 +107,3 @@ void SendWidget::send( const QString& file, const QString& desc ) { | |||
106 | void SendWidget::slotIrDaDevices( const QStringList& list) { | 107 | void SendWidget::slotIrDaDevices( const QStringList& list) { |
107 | qWarning("slot it irda devices "); | 108 | owarn << "slot it irda devices " << oendl; |
108 | for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { | 109 | for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { |
@@ -125,3 +126,3 @@ void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) { | |||
125 | void SendWidget::slotSelectedDevice( int name, int dev ) { | 126 | void SendWidget::slotSelectedDevice( int name, int dev ) { |
126 | qWarning("Start beam? %d %d", name, dev ); | 127 | owarn << "Start beam? " << name << " " << dev << "" << oendl; |
127 | if ( name == m_irDeSearch ) { | 128 | if ( name == m_irDeSearch ) { |
@@ -134,3 +135,3 @@ void SendWidget::slotSelectedDevice( int name, int dev ) { | |||
134 | void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) { | 135 | void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) { |
135 | qWarning("dispatch irda %s", str.data() ); | 136 | owarn << "dispatch irda " << str.data() << "" << oendl; |
136 | if ( str == "devices(QStringList)" ) { | 137 | if ( str == "devices(QStringList)" ) { |
@@ -149,3 +150,3 @@ void SendWidget::slotIrError( int ) { | |||
149 | void SendWidget::slotIrSent( bool b) { | 150 | void SendWidget::slotIrSent( bool b) { |
150 | qWarning("irda sent!!"); | 151 | owarn << "irda sent!!" << oendl; |
151 | QString text = b ? tr("Sent") : tr("Failure"); | 152 | QString text = b ? tr("Sent") : tr("Failure"); |
@@ -206,3 +207,3 @@ void DeviceBox::setStatus( int id, const QString& status ) { | |||
206 | void DeviceBox::setSource( const QString& str ) { | 207 | void DeviceBox::setSource( const QString& str ) { |
207 | qWarning("SetSource:%d", str.toInt() ); | 208 | owarn << "SetSource:" << str.toInt() << "" << oendl; |
208 | int id = str.toInt(); | 209 | int id = str.toInt(); |
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,9 +1,13 @@ | |||
1 | #include <sys/types.h> | 1 | #include "obex.h" |
2 | #include <sys/stat.h> | 2 | #include "receiver.h" |
3 | #include <sys/mman.h> | 3 | using namespace OpieObex; |
4 | #include <stdlib.h> // int system | ||
5 | #include <unistd.h> | ||
6 | 4 | ||
7 | #include <fcntl.h> | 5 | /* OPIE */ |
6 | #include <opie2/odebug.h> | ||
7 | #include <qpe/applnk.h> | ||
8 | #include <qpe/qpeapplication.h> | ||
9 | #include <qpe/qcopenvelope_qws.h> | ||
10 | using namespace Opie::Core; | ||
8 | 11 | ||
12 | /* QT */ | ||
9 | #include <qfileinfo.h> | 13 | #include <qfileinfo.h> |
@@ -13,10 +17,9 @@ | |||
13 | 17 | ||
14 | #include <qpe/applnk.h> | 18 | /* STD */ |
15 | #include <qpe/qpeapplication.h> | 19 | #include <sys/types.h> |
16 | #include <qpe/qcopenvelope_qws.h> | 20 | #include <sys/stat.h> |
17 | 21 | #include <sys/mman.h> | |
18 | #include "obex.h" | 22 | #include <stdlib.h> // int system |
19 | #include "receiver.h" | 23 | #include <unistd.h> |
20 | 24 | #include <fcntl.h> | |
21 | using namespace OpieObex; | ||
22 | 25 | ||
@@ -77,3 +80,3 @@ void Receiver::tidyUp( QString& _file, const QString& ending) { | |||
77 | QString cmd = QString("sed -e \"s/^\\(X-MICROSOFT-BODYINK\\)\\;/\\1:/;\" < %2 > %2 ").arg( Global::shellQuote(file)).arg( Global::shellQuote(_file) ); | 80 | QString cmd = QString("sed -e \"s/^\\(X-MICROSOFT-BODYINK\\)\\;/\\1:/;\" < %2 > %2 ").arg( Global::shellQuote(file)).arg( Global::shellQuote(_file) ); |
78 | qWarning("Executing: %s", cmd.latin1() ); | 81 | owarn << "Executing: " << cmd << "" << oendl; |
79 | (void)::system( cmd.latin1() ); | 82 | (void)::system( cmd.latin1() ); |
@@ -84,3 +87,3 @@ void Receiver::tidyUp( QString& _file, const QString& ending) { | |||
84 | int Receiver::checkFile( QString& file ) { | 87 | int Receiver::checkFile( QString& file ) { |
85 | qWarning("check file!! %s", file.latin1() ); | 88 | owarn << "check file!! " << file << "" << oendl; |
86 | int ret; | 89 | int ret; |
@@ -109,3 +112,3 @@ int Receiver::checkFile( QString& file ) { | |||
109 | 112 | ||
110 | qWarning("check it now %d", ret ); | 113 | owarn << "check it now " << ret << "" << oendl; |
111 | return ret; | 114 | return ret; |
@@ -150,3 +153,3 @@ void OtherHandler::handle( const QString& file ) { | |||
150 | DocLnk lnk(file); | 153 | DocLnk lnk(file); |
151 | qWarning(" %s %s", lnk.type().latin1(), lnk.icon().latin1() ); | 154 | owarn << " " << lnk.type() << " " << lnk.icon() << "" << oendl; |
152 | 155 | ||
@@ -193,3 +196,3 @@ QString OtherHandler::targetName( const QString& file ) { | |||
193 | void OtherHandler::copy(const QString& src, const QString& file) { | 196 | void OtherHandler::copy(const QString& src, const QString& file) { |
194 | qWarning("src %s, dest %s", src.latin1(),file.latin1() ); | 197 | owarn << "src " << src << ", dest " << file << "" << oendl; |
195 | QString cmd = QString("mv %1 %2").arg( Global::shellQuote( src )). | 198 | QString cmd = QString("mv %1 %2").arg( Global::shellQuote( src )). |