| -rw-r--r-- | core/obex/receiver.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/core/obex/receiver.cpp b/core/obex/receiver.cpp index d4ae323..7d9a42a 100644 --- a/core/obex/receiver.cpp +++ b/core/obex/receiver.cpp @@ -78,13 +78,11 @@ void Receiver::tidyUp( QString& _file, const QString& ending) { - (void)::strncat( foo, ending.latin1(), 4 ); - _file = QString::fromLatin1( foo ); + (void)::strncat( foo, QFile::encodeName(ending), 4 ); + _file = QString::fromLocal8Bit( foo ); QString cmd = QString("sed -e \"s/^\\(X-MICROSOFT-BODYINK\\)\\;/\\1:/;\" < %2 > %2 ").arg( Global::shellQuote(file)).arg( Global::shellQuote(_file) ); - owarn << "Executing: " << cmd << "" << oendl; - (void)::system( cmd.latin1() ); + (void)::system( QFile::encodeName(cmd) ); cmd = QString("rm %1").arg( Global::shellQuote(file) ); - (void)::system( cmd.latin1() ); + (void)::system( QFile::encodeName(cmd) ); } int Receiver::checkFile( QString& file ) { - owarn << "check file!! " << file << "" << oendl; int ret; @@ -113,3 +111,2 @@ int Receiver::checkFile( QString& file ) { - owarn << "check it now " << ret << "" << oendl; return ret; @@ -154,3 +151,2 @@ void OtherHandler::handle( const QString& file ) { DocLnk lnk(file); - owarn << " " << lnk.type() << " " << lnk.icon() << "" << oendl; @@ -197,3 +193,2 @@ QString OtherHandler::targetName( const QString& file ) { void OtherHandler::copy(const QString& src, const QString& file) { - owarn << "src " << src << ", dest " << file << "" << oendl; FileManager *fm; @@ -202,7 +197,2 @@ void OtherHandler::copy(const QString& src, const QString& file) { } - -// QString cmd = QString("mv %1 %2").arg( Global::shellQuote( src )). -// arg( Global::shellQuote( file ) ); -// ::system( cmd.latin1() ); - // done } |