author | llornkcor <llornkcor> | 2004-07-28 04:02:22 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-07-28 04:02:22 (UTC) |
commit | e98e9106df225b9e19a45a6f0e44193b1d018461 (patch) (unidiff) | |
tree | 2f2238d1f9549dd4fb645551abf88480a11d2dc3 /core/obex/receiver.cpp | |
parent | 347acd6001e00d0e57c4917f9a741ab887caf4cd (diff) | |
download | opie-e98e9106df225b9e19a45a6f0e44193b1d018461.zip opie-e98e9106df225b9e19a45a6f0e44193b1d018461.tar.gz opie-e98e9106df225b9e19a45a6f0e44193b1d018461.tar.bz2 |
use copyfile method that doesnt squish filenames into latin1, so copying files with extended characters doesn't fail after ir receive
-rw-r--r-- | core/obex/receiver.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/core/obex/receiver.cpp b/core/obex/receiver.cpp index 8885256..d4ae323 100644 --- a/core/obex/receiver.cpp +++ b/core/obex/receiver.cpp | |||
@@ -1,21 +1,22 @@ | |||
1 | #include "obex.h" | 1 | #include "obex.h" |
2 | #include "receiver.h" | 2 | #include "receiver.h" |
3 | using namespace OpieObex; | 3 | using namespace OpieObex; |
4 | 4 | ||
5 | /* OPIE */ | 5 | /* OPIE */ |
6 | #include <opie2/odebug.h> | 6 | #include <opie2/odebug.h> |
7 | #include <qpe/applnk.h> | 7 | #include <qpe/applnk.h> |
8 | #include <qpe/qpeapplication.h> | 8 | #include <qpe/qpeapplication.h> |
9 | #include <qpe/qcopenvelope_qws.h> | 9 | #include <qpe/qcopenvelope_qws.h> |
10 | #include <qpe/filemanager.h> | ||
10 | using namespace Opie::Core; | 11 | using namespace Opie::Core; |
11 | 12 | ||
12 | /* QT */ | 13 | /* QT */ |
13 | #include <qfileinfo.h> | 14 | #include <qfileinfo.h> |
14 | #include <qlabel.h> | 15 | #include <qlabel.h> |
15 | #include <qtextview.h> | 16 | #include <qtextview.h> |
16 | #include <qpushbutton.h> | 17 | #include <qpushbutton.h> |
17 | 18 | ||
18 | /* STD */ | 19 | /* STD */ |
19 | #include <sys/types.h> | 20 | #include <sys/types.h> |
20 | #include <sys/stat.h> | 21 | #include <sys/stat.h> |
21 | #include <sys/mman.h> | 22 | #include <sys/mman.h> |
@@ -186,17 +187,22 @@ QString OtherHandler::targetName( const QString& file ) { | |||
186 | while (QFile::exists(newFile + "."+info.extension() ) ) { | 187 | while (QFile::exists(newFile + "."+info.extension() ) ) { |
187 | newFile = newFileBase + "_"+QString::number(trie) ; | 188 | newFile = newFileBase + "_"+QString::number(trie) ; |
188 | trie++; | 189 | trie++; |
189 | } | 190 | } |
190 | newFile += "." + info.extension(); | 191 | newFile += "." + info.extension(); |
191 | 192 | ||
192 | return newFile; | 193 | return newFile; |
193 | } | 194 | } |
194 | 195 | ||
195 | /* fast cpy */ | 196 | /* fast cpy */ |
196 | void OtherHandler::copy(const QString& src, const QString& file) { | 197 | void OtherHandler::copy(const QString& src, const QString& file) { |
197 | owarn << "src " << src << ", dest " << file << "" << oendl; | 198 | owarn << "src " << src << ", dest " << file << "" << oendl; |
198 | QString cmd = QString("mv %1 %2").arg( Global::shellQuote( src )). | 199 | FileManager *fm; |
199 | arg( Global::shellQuote( file ) ); | 200 | if(!fm->copyFile(src,file)) { |
200 | ::system( cmd.latin1() ); | 201 | owarn << "Copy failed" << oendl; |
202 | } | ||
203 | |||
204 | // QString cmd = QString("mv %1 %2").arg( Global::shellQuote( src )). | ||
205 | // arg( Global::shellQuote( file ) ); | ||
206 | // ::system( cmd.latin1() ); | ||
201 | // done | 207 | // done |
202 | } | 208 | } |