author | zecke <zecke> | 2002-06-13 22:19:26 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-13 22:19:26 (UTC) |
commit | 2002b1a7a8e4122a2e2a02049c2ad584fb511eb9 (patch) (unidiff) | |
tree | eae66dc19f9b79e92a0bbfe7f1684a9cfcd00336 /core/applets/obex/obex.cc | |
parent | 8764c71b50fab1e4dcbc61f23dbd4fd3969e4090 (diff) | |
download | opie-2002b1a7a8e4122a2e2a02049c2ad584fb511eb9.zip opie-2002b1a7a8e4122a2e2a02049c2ad584fb511eb9.tar.gz opie-2002b1a7a8e4122a2e2a02049c2ad584fb511eb9.tar.bz2 |
Fix PPC beaming
-rw-r--r-- | core/applets/obex/obex.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/core/applets/obex/obex.cc b/core/applets/obex/obex.cc index 2218dbc..fc0be3b 100644 --- a/core/applets/obex/obex.cc +++ b/core/applets/obex/obex.cc | |||
@@ -22,12 +22,13 @@ Obex::Obex( QObject *parent, const char* name ) | |||
22 | Obex::~Obex() { | 22 | Obex::~Obex() { |
23 | delete m_rec; | 23 | delete m_rec; |
24 | delete m_send; | 24 | delete m_send; |
25 | } | 25 | } |
26 | void Obex::receive() { | 26 | void Obex::receive() { |
27 | m_receive = true; | 27 | m_receive = true; |
28 | m_outp = QString::null; | ||
28 | qWarning("Receive" ); | 29 | qWarning("Receive" ); |
29 | m_rec = new OProcess(); | 30 | m_rec = new OProcess(); |
30 | *m_rec << "irobex_palm3"; | 31 | *m_rec << "irobex_palm3"; |
31 | // connect to the necessary slots | 32 | // connect to the necessary slots |
32 | connect(m_rec, SIGNAL(processExited(OProcess*) ), | 33 | connect(m_rec, SIGNAL(processExited(OProcess*) ), |
33 | this, SLOT(slotExited(OProcess*) ) ); | 34 | this, SLOT(slotExited(OProcess*) ) ); |
@@ -145,17 +146,25 @@ void Obex::sendEnd() { | |||
145 | QString Obex::parseOut( ){ | 146 | QString Obex::parseOut( ){ |
146 | QString path; | 147 | QString path; |
147 | QStringList list = QStringList::split("\n", m_outp); | 148 | QStringList list = QStringList::split("\n", m_outp); |
148 | QStringList::Iterator it; | 149 | QStringList::Iterator it; |
149 | for (it = list.begin(); it != list.end(); ++it ) { | 150 | for (it = list.begin(); it != list.end(); ++it ) { |
150 | if ( (*it).startsWith("Wrote" ) ) { | 151 | if ( (*it).startsWith("Wrote" ) ) { |
151 | QStringList pathes = QStringList::split(' ', (*it) ); | 152 | int pos = (*it).findRev('(' ); |
152 | path = pathes[1]; | 153 | if ( pos > 0 ) { |
154 | qWarning( "%d %s", pos, (*it).mid(6 ).latin1() ) ; | ||
155 | qWarning("%d %d", (*it).length(), (*it).length()-pos ); | ||
156 | |||
157 | path = (*it).remove( pos, (*it).length() - pos ); | ||
158 | qWarning("%s", path.latin1() ); | ||
159 | path = path.mid(6 ); | ||
160 | path = path.stripWhiteSpace(); | ||
153 | qWarning("path %s", path.latin1() ); | 161 | qWarning("path %s", path.latin1() ); |
154 | } | 162 | } |
155 | } | 163 | } |
164 | } | ||
156 | return path; | 165 | return path; |
157 | } | 166 | } |
158 | /** | 167 | /** |
159 | * when sent is done slotError is called we will start receive again | 168 | * when sent is done slotError is called we will start receive again |
160 | */ | 169 | */ |
161 | void Obex::slotError() { | 170 | void Obex::slotError() { |