-rw-r--r-- | core/launcher/launcher.cpp | 4 | ||||
-rw-r--r-- | core/launcher/packageslave.cpp | 3 | ||||
-rw-r--r-- | core/launcher/transferserver.cpp | 3 | ||||
-rw-r--r-- | core/obex/obex.cc | 47 | ||||
-rw-r--r-- | core/opie-login/loginapplication.cpp | 15 | ||||
-rw-r--r-- | core/pim/addressbook/namelineedit.cpp | 6 | ||||
-rw-r--r-- | core/qws/transferserver.cpp | 6 |
7 files changed, 49 insertions, 35 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index 6afbcd8..779fe54 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -671,4 +671,4 @@ void Launcher::applicationAdded( const QString& type, const AppLnk& app ) | |||
671 | else | 671 | else |
672 | qWarning("addAppLnk: No view for type %s. Can't add app %s!", | 672 | owarn << "addAppLnk: No view for type " << type.latin1() << ". Can't add app " |
673 | type.latin1(),app.name().latin1() ); | 673 | << app.name().latin1() << "!", |
674 | 674 | ||
diff --git a/core/launcher/packageslave.cpp b/core/launcher/packageslave.cpp index a11ac86..0461432 100644 --- a/core/launcher/packageslave.cpp +++ b/core/launcher/packageslave.cpp | |||
@@ -177,4 +177,3 @@ void PackageHandler::addPackageFiles( const QString &location, | |||
177 | if (!CopyFile((TCHAR*)qt_winTchar((location + s), TRUE), (TCHAR*)qt_winTchar(s, TRUE), FALSE)) | 177 | if (!CopyFile((TCHAR*)qt_winTchar((location + s), TRUE), (TCHAR*)qt_winTchar(s, TRUE), FALSE)) |
178 | qWarning("Unable to create symlinkfor %s", | 178 | owarn << "Unable to create symlinkfor " << (location + s).ascii() << oendl; |
179 | (location + s).ascii()); | ||
180 | #endif | 179 | #endif |
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index c3f936e..1d4ca40 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp | |||
@@ -1158,4 +1158,3 @@ void ServerDTP::connected() | |||
1158 | if ( !createTargzProc->start() ) | 1158 | if ( !createTargzProc->start() ) |
1159 | qWarning("Error starting %s", | 1159 | owarn << "Error starting " << createTargzProc->arguments().join(" ").latin1() << oendl; |
1160 | createTargzProc->arguments().join(" ").latin1()); | ||
1161 | break; | 1160 | break; |
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,2 +1,9 @@ | |||
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> |
@@ -4,4 +11,2 @@ | |||
4 | 11 | ||
5 | #include <opie2/oprocess.h> | ||
6 | #include "obex.h" | ||
7 | 12 | ||
@@ -31,3 +36,3 @@ void Obex::receive() { | |||
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(); |
@@ -42,3 +47,3 @@ void Obex::receive() { | |||
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 ); |
@@ -53,8 +58,8 @@ void Obex::send( const QString& fileName) { // if currently receiving stop it se | |||
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; |
@@ -63,3 +68,3 @@ void Obex::send( const QString& fileName) { // if currently receiving stop it se | |||
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 |
@@ -71,3 +76,3 @@ void Obex::send( const QString& fileName) { // if currently receiving stop it se | |||
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 |
@@ -90,3 +95,3 @@ void Obex::sendNow(){ | |||
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; |
@@ -112,3 +117,3 @@ void Obex::slotStdOut(OProcess* proc, char* buf, int 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 ); |
@@ -121,3 +126,3 @@ void Obex::received() { | |||
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 ); |
@@ -137,3 +142,3 @@ void Obex::sendEnd() { | |||
137 | m_send=0; | 142 | m_send=0; |
138 | qWarning("done" ); | 143 | owarn << "done" << oendl; |
139 | emit sent(true); | 144 | emit sent(true); |
@@ -143,3 +148,3 @@ void Obex::sendEnd() { | |||
143 | m_send = 0; | 148 | m_send = 0; |
144 | qWarning("try sending again" ); | 149 | owarn << "try sending again" << oendl; |
145 | sendNow(); | 150 | sendNow(); |
@@ -160,10 +165,10 @@ QString Obex::parseOut( ){ | |||
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 | } |
@@ -177,3 +182,3 @@ QString Obex::parseOut( ){ | |||
177 | void Obex::slotError() { | 182 | void Obex::slotError() { |
178 | qWarning("slotError"); | 183 | owarn << "slotError" << oendl; |
179 | if ( m_receive ) | 184 | if ( m_receive ) |
@@ -190,6 +195,6 @@ 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; |
diff --git a/core/opie-login/loginapplication.cpp b/core/opie-login/loginapplication.cpp index 1facf2d..764b24b 100644 --- a/core/opie-login/loginapplication.cpp +++ b/core/opie-login/loginapplication.cpp | |||
@@ -27,2 +27,10 @@ | |||
27 | 27 | ||
28 | #include "loginapplication.h" | ||
29 | |||
30 | /* OPIE */ | ||
31 | #include <opie2/odebug.h> | ||
32 | |||
33 | /* QT */ | ||
34 | |||
35 | /* STD */ | ||
28 | #include <pwd.h> | 36 | #include <pwd.h> |
@@ -44,3 +52,2 @@ extern "C" { | |||
44 | 52 | ||
45 | #include "loginapplication.h" | ||
46 | 53 | ||
@@ -164,3 +171,3 @@ bool LoginApplication::changeIdentity ( ) | |||
164 | if ( !runRootScript ( "OPIEDIR", "share/opie-login/pre-session", s_username )) | 171 | if ( !runRootScript ( "OPIEDIR", "share/opie-login/pre-session", s_username )) |
165 | qWarning ( "failed to run $OPIEDIR/share/opie-login/pre-session" ); | 172 | owarn << "failed to run $OPIEDIR/share/opie-login/pre-session" << oendl; |
166 | 173 | ||
@@ -189,3 +196,3 @@ bool LoginApplication::login ( ) | |||
189 | 196 | ||
190 | qWarning ( "failed to start an Opie session" ); | 197 | owarn << "failed to start an Opie session" << oendl; |
191 | return false; | 198 | return false; |
@@ -197,3 +204,3 @@ void LoginApplication::logout ( ) | |||
197 | if ( !runRootScript ( "OPIEDIR", "share/opie-login/post-session" )) | 204 | if ( !runRootScript ( "OPIEDIR", "share/opie-login/post-session" )) |
198 | qWarning ( "failed to run $OPIEDIR/scripts/post-session" ); | 205 | owarn << "failed to run $OPIEDIR/scripts/post-session" << oendl; |
199 | } | 206 | } |
diff --git a/core/pim/addressbook/namelineedit.cpp b/core/pim/addressbook/namelineedit.cpp index ba16e2c..81b959b 100644 --- a/core/pim/addressbook/namelineedit.cpp +++ b/core/pim/addressbook/namelineedit.cpp | |||
@@ -2,2 +2,6 @@ | |||
2 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | |||
6 | |||
3 | namespace ABOOK { | 7 | namespace ABOOK { |
@@ -24,3 +28,3 @@ void NameLineEdit::keyPressEvent( QKeyEvent* ev ) { | |||
24 | key != Key_Return && key != Key_Enter ) { | 28 | key != Key_Return && key != Key_Enter ) { |
25 | qWarning( "str " + ev->text() + " %d", m_prevSpace ); | 29 | owarn << "str " << ev->text() << " " << m_prevSpace << oendl; |
26 | 30 | ||
diff --git a/core/qws/transferserver.cpp b/core/qws/transferserver.cpp index 777c384..7bf6719 100644 --- a/core/qws/transferserver.cpp +++ b/core/qws/transferserver.cpp | |||
@@ -23,2 +23,3 @@ | |||
23 | 23 | ||
24 | /* STD */ | ||
24 | #define _XOPEN_SOURCE | 25 | #define _XOPEN_SOURCE |
@@ -1129,5 +1130,4 @@ void ServerDTP::connected() | |||
1129 | if ( !createTargzProc->start(Opie::Core::OProcess::NotifyOnExit, Opie::Core::OProcess::Stdout) ) | 1130 | if ( !createTargzProc->start(Opie::Core::OProcess::NotifyOnExit, Opie::Core::OProcess::Stdout) ) |
1130 | qWarning("Error starting %s or %s", | 1131 | owarn << "Error starting " << createTargzProc->args()[0].data() |
1131 | createTargzProc->args()[0].data(), | 1132 | << " or " << gzipProc->args()[0].data() << oendl; |
1132 | gzipProc->args()[0].data()); | ||
1133 | break; | 1133 | break; |