author | ar <ar> | 2004-05-02 21:32:48 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-02 21:32:48 (UTC) |
commit | 0a4cac124105a5732e55cb34c6b37be75083a395 (patch) (unidiff) | |
tree | 33b4d2cab08c9b58893540b4ddee089b69fc9c61 /core/obex | |
parent | 109ed5f2a1cdfeb3680c9ec057a1083fcf8fab95 (diff) | |
download | opie-0a4cac124105a5732e55cb34c6b37be75083a395.zip opie-0a4cac124105a5732e55cb34c6b37be75083a395.tar.gz opie-0a4cac124105a5732e55cb34c6b37be75083a395.tar.bz2 |
- convert qWarning to owarn
-rw-r--r-- | core/obex/obex.cc | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/core/obex/obex.cc b/core/obex/obex.cc index 3c99af6..7c40b90 100644 --- a/core/obex/obex.cc +++ b/core/obex/obex.cc | |||
@@ -1,9 +1,14 @@ | |||
1 | 1 | ||
2 | #include "obex.h" | ||
3 | |||
4 | /* OPIE */ | ||
5 | #include <opie2/oprocess.h> | ||
6 | #include <opie2/odebug.h> | ||
7 | |||
8 | /* QT */ | ||
2 | #include <qfileinfo.h> | 9 | #include <qfileinfo.h> |
3 | 10 | ||
4 | 11 | ||
5 | #include <opie2/oprocess.h> | ||
6 | #include "obex.h" | ||
7 | 12 | ||
8 | using namespace OpieObex; | 13 | using namespace OpieObex; |
9 | 14 | ||
@@ -29,7 +34,7 @@ Obex::~Obex() { | |||
29 | void Obex::receive() { | 34 | void Obex::receive() { |
30 | m_receive = true; | 35 | m_receive = true; |
31 | m_outp = QString::null; | 36 | m_outp = QString::null; |
32 | qWarning("Receive" ); | 37 | owarn << "Receive" << oendl; |
33 | m_rec = new OProcess(); | 38 | m_rec = new OProcess(); |
34 | *m_rec << "irobex_palm3"; | 39 | *m_rec << "irobex_palm3"; |
35 | // connect to the necessary slots | 40 | // connect to the necessary slots |
@@ -40,7 +45,7 @@ void Obex::receive() { | |||
40 | this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) ); | 45 | this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) ); |
41 | 46 | ||
42 | if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 47 | if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
43 | qWarning("could not start :("); | 48 | owarn << "could not start :(" oendl; |
44 | emit done( false ); | 49 | emit done( false ); |
45 | delete m_rec; | 50 | delete m_rec; |
46 | m_rec = 0; | 51 | m_rec = 0; |
@@ -51,17 +56,17 @@ void Obex::receive() { | |||
51 | void Obex::send( const QString& fileName) { // if currently receiving stop it send receive | 56 | void Obex::send( const QString& fileName) { // if currently receiving stop it send receive |
52 | m_count = 0; | 57 | m_count = 0; |
53 | m_file = fileName; | 58 | m_file = fileName; |
54 | qWarning("send %s", fileName.latin1() ); | 59 | owarn << "send " << fileName.latin1() << oendl; |
55 | if (m_rec != 0 ) { | 60 | if (m_rec != 0 ) { |
56 | qWarning("running"); | 61 | owarn << "running" oendl; |
57 | if (m_rec->isRunning() ) { | 62 | if (m_rec->isRunning() ) { |
58 | emit error(-1 ); | 63 | emit error(-1 ); |
59 | qWarning("is running"); | 64 | owarn << "is running" << oendl; |
60 | delete m_rec; | 65 | delete m_rec; |
61 | m_rec = 0; | 66 | m_rec = 0; |
62 | 67 | ||
63 | }else{ | 68 | }else{ |
64 | qWarning("is not running"); | 69 | owarn << "is not running" << oendl; |
65 | emit error( -1 ); // we did not delete yet but it's not running slotExited is pending | 70 | emit error( -1 ); // we did not delete yet but it's not running slotExited is pending |
66 | return; | 71 | return; |
67 | } | 72 | } |
@@ -69,7 +74,7 @@ void Obex::send( const QString& fileName) { // if currently receiving stop it se | |||
69 | sendNow(); | 74 | sendNow(); |
70 | } | 75 | } |
71 | void Obex::sendNow(){ | 76 | void Obex::sendNow(){ |
72 | qWarning("sendNow"); | 77 | owarn << "sendNow" << oendl; |
73 | if ( m_count >= 25 ) { // could not send | 78 | if ( m_count >= 25 ) { // could not send |
74 | emit error(-1 ); | 79 | emit error(-1 ); |
75 | emit sent(false); | 80 | emit sent(false); |
@@ -88,7 +93,7 @@ void Obex::sendNow(){ | |||
88 | 93 | ||
89 | // now start it | 94 | // now start it |
90 | if (!m_send->start(/*OProcess::NotifyOnExit, OProcess::AllOutput*/ ) ) { | 95 | if (!m_send->start(/*OProcess::NotifyOnExit, OProcess::AllOutput*/ ) ) { |
91 | qWarning("could not send" ); | 96 | owarn << "could not send" << oendl; |
92 | m_count = 25; | 97 | m_count = 25; |
93 | emit error(-1 ); | 98 | emit error(-1 ); |
94 | delete m_send; | 99 | delete m_send; |
@@ -110,7 +115,7 @@ void Obex::slotStdOut(OProcess* proc, char* buf, int len){ | |||
110 | if ( proc == m_rec ) { // only receive | 115 | if ( proc == m_rec ) { // only receive |
111 | QByteArray ar( len ); | 116 | QByteArray ar( len ); |
112 | memcpy( ar.data(), buf, len ); | 117 | memcpy( ar.data(), buf, len ); |
113 | qWarning("parsed: %s", ar.data() ); | 118 | owarn << "parsed: " << ar.data() << oendl; |
114 | m_outp.append( ar ); | 119 | m_outp.append( ar ); |
115 | } | 120 | } |
116 | } | 121 | } |
@@ -119,7 +124,7 @@ void Obex::received() { | |||
119 | if (m_rec->normalExit() ) { | 124 | if (m_rec->normalExit() ) { |
120 | if ( m_rec->exitStatus() == 0 ) { // we got one | 125 | if ( m_rec->exitStatus() == 0 ) { // we got one |
121 | QString filename = parseOut(); | 126 | QString filename = parseOut(); |
122 | qWarning("ACHTUNG %s", filename.latin1() ); | 127 | owarn << "ACHTUNG " << filename.latin1() << oendl; |
123 | emit receivedFile( filename ); | 128 | emit receivedFile( filename ); |
124 | } | 129 | } |
125 | }else{ | 130 | }else{ |
@@ -135,13 +140,13 @@ void Obex::sendEnd() { | |||
135 | if ( m_send->exitStatus() == 0 ) { | 140 | if ( m_send->exitStatus() == 0 ) { |
136 | delete m_send; | 141 | delete m_send; |
137 | m_send=0; | 142 | m_send=0; |
138 | qWarning("done" ); | 143 | owarn << "done" << oendl; |
139 | emit sent(true); | 144 | emit sent(true); |
140 | }else if (m_send->exitStatus() == 255 ) { // it failed maybe the other side wasn't ready | 145 | }else if (m_send->exitStatus() == 255 ) { // it failed maybe the other side wasn't ready |
141 | // let's try it again | 146 | // let's try it again |
142 | delete m_send; | 147 | delete m_send; |
143 | m_send = 0; | 148 | m_send = 0; |
144 | qWarning("try sending again" ); | 149 | owarn << "try sending again" << oendl; |
145 | sendNow(); | 150 | sendNow(); |
146 | } | 151 | } |
147 | }else { | 152 | }else { |
@@ -158,14 +163,14 @@ QString Obex::parseOut( ){ | |||
158 | if ( (*it).startsWith("Wrote" ) ) { | 163 | if ( (*it).startsWith("Wrote" ) ) { |
159 | int pos = (*it).findRev('(' ); | 164 | int pos = (*it).findRev('(' ); |
160 | if ( pos > 0 ) { | 165 | if ( pos > 0 ) { |
161 | qWarning( "%d %s", pos, (*it).mid(6 ).latin1() ) ; | 166 | owarn << pos << " " << (*it).mid(6 ).latin1() << oendl; |
162 | qWarning("%d %d", (*it).length(), (*it).length()-pos ); | 167 | owarn << (*it).length() << " " << (*it).length()-pos << oendl; |
163 | 168 | ||
164 | path = (*it).remove( pos, (*it).length() - pos ); | 169 | path = (*it).remove( pos, (*it).length() - pos ); |
165 | qWarning("%s", path.latin1() ); | 170 | owarn << path.latin1() << oendl; |
166 | path = path.mid(6 ); | 171 | path = path.mid(6 ); |
167 | path = path.stripWhiteSpace(); | 172 | path = path.stripWhiteSpace(); |
168 | qWarning("path %s", path.latin1() ); | 173 | owarn << "path " << path.latin1() << oendl; |
169 | } | 174 | } |
170 | } | 175 | } |
171 | } | 176 | } |
@@ -175,7 +180,7 @@ QString Obex::parseOut( ){ | |||
175 | * when sent is done slotError is called we will start receive again | 180 | * when sent is done slotError is called we will start receive again |
176 | */ | 181 | */ |
177 | void Obex::slotError() { | 182 | void Obex::slotError() { |
178 | qWarning("slotError"); | 183 | owarn << "slotError" << oendl; |
179 | if ( m_receive ) | 184 | if ( m_receive ) |
180 | receive(); | 185 | receive(); |
181 | }; | 186 | }; |
@@ -188,10 +193,10 @@ void Obex::setReceiveEnabled( bool receive ) { | |||
188 | 193 | ||
189 | void Obex::shutDownReceive() { | 194 | void Obex::shutDownReceive() { |
190 | if (m_rec != 0 ) { | 195 | if (m_rec != 0 ) { |
191 | qWarning("running"); | 196 | owarn << "running" << oendl; |
192 | if (m_rec->isRunning() ) { | 197 | if (m_rec->isRunning() ) { |
193 | emit error(-1 ); | 198 | emit error(-1 ); |
194 | qWarning("is running"); | 199 | owarn << "is running" << oendl; |
195 | delete m_rec; | 200 | delete m_rec; |
196 | m_rec = 0; | 201 | m_rec = 0; |
197 | } | 202 | } |