summaryrefslogtreecommitdiff
path: root/noncore
authorllornkcor <llornkcor>2002-04-28 13:51:21 (UTC)
committer llornkcor <llornkcor>2002-04-28 13:51:21 (UTC)
commitc55ffe32ced1ecbac991ca2e85c6993cf8a04ee0 (patch) (side-by-side diff)
tree479063624eb052aa80198c157a3acc5ea9e3ccac /noncore
parentcaae6c7deade10081709daa8a0de8ad548b6e30d (diff)
downloadopie-c55ffe32ced1ecbac991ca2e85c6993cf8a04ee0.zip
opie-c55ffe32ced1ecbac991ca2e85c6993cf8a04ee0.tar.gz
opie-c55ffe32ced1ecbac991ca2e85c6993cf8a04ee0.tar.bz2
fixed functions for x86
Diffstat (limited to 'noncore') (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp65
1 files changed, 50 insertions, 15 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index faa03dc..bd513c0 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -834,7 +834,6 @@ void AdvancedFm::localDelete()
break;
};
}
-
}
}
@@ -1140,8 +1139,14 @@ void AdvancedFm::copy()
if (TabWidget->currentPageIndex() == 0) {
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
- QString destFile = currentRemoteDir.canonicalPath()+"/"+(*it);
- curFile = currentDir.canonicalPath()+"/"+(*it);
+ QString destFile = currentRemoteDir.canonicalPath();
+ if(destFile.right(1).find("/",0,TRUE) == -1)
+ destFile+="/";
+ destFile +=(*it);
+ curFile = currentDir.canonicalPath();
+ if(curFile.right(1).find("/",0,TRUE) == -1)
+ curFile +="/";
+ curFile +=(*it);
QFile f(destFile);
if( f.exists())
f.remove();
@@ -1154,8 +1159,14 @@ void AdvancedFm::copy()
} else {
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
- QString destFile = currentDir.canonicalPath()+"/"+(*it);
- curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+ QString destFile = currentDir.canonicalPath();
+ if(destFile.right(1).find("/",0,TRUE) == -1)
+ destFile+="/";
+ destFile +=(*it);
+ curFile = currentRemoteDir.canonicalPath();
+ if(curFile.right(1).find("/",0,TRUE) == -1)
+ curFile +="/";
+ curFile +=(*it);
QFile f(destFile);
if( f.exists())
f.remove();
@@ -1176,15 +1187,21 @@ void AdvancedFm::copyAs()
if (TabWidget->currentPageIndex() == 0) {
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
- QString destFile = *it;
- curFile = currentDir.canonicalPath()+"/"+(*it);
+ QString destFile;
+ curFile = currentDir.canonicalPath();
+ if(curFile.right(1).find("/",0,TRUE) == -1)
+ curFile +="/";
+ curFile+=(*it);
// InputDialog *fileDlg;
// fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
fileDlg->setInputText((const QString &) destFile );
fileDlg->exec();
if( fileDlg->result() == 1 ) {
QString filename = fileDlg->LineEdit1->text();
- destFile = currentRemoteDir.canonicalPath()+"/"+destFile;
+ destFile = currentRemoteDir.canonicalPath();
+ if(destFile.right(1).find("/",0,TRUE) == -1)
+ destFile+="/";
+ destFile +=(*it);
QFile f(destFile);
if( f.exists())
@@ -1200,13 +1217,19 @@ void AdvancedFm::copyAs()
if (TabWidget->currentPageIndex() == 0) {
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
- curFile = currentDir.canonicalPath()+"/"+(*it);
- QString destFile = *it;
+ curFile = currentDir.canonicalPath();
+ if(curFile.right(1).find("/",0,TRUE) == -1)
+ curFile +="/";
+ curFile+=(*it);
+ QString destFile;
fileDlg->setInputText((const QString &) destFile);
fileDlg->exec();
if( fileDlg->result() == 1 ) {
QString filename = fileDlg->LineEdit1->text();
- destFile = currentDir.canonicalPath()+"/"+destFile;
+ destFile = currentDir.canonicalPath();
+ if(destFile.right(1).find("/",0,TRUE) == -1)
+ destFile+="/";
+ destFile +=(*it);
QFile f(destFile);
if( f.exists())
@@ -1230,9 +1253,15 @@ void AdvancedFm::move() {
if (TabWidget->currentPageIndex() == 0) {
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
- QString destFile = currentRemoteDir.canonicalPath() + "/" + *it;
- curFile = currentDir.canonicalPath()+"/"+(*it);
+ QString destFile = currentRemoteDir.canonicalPath();
+ if(destFile.right(1).find("/",0,TRUE) == -1)
+ destFile+="/";
+ destFile +=(*it);
+ curFile = currentDir.canonicalPath();
qDebug("Destination file is "+destFile);
+ if(curFile.right(1).find("/",0,TRUE) == -1)
+ curFile +="/";
+ curFile+=(*it);
QFile f(destFile);
if( f.exists())
@@ -1246,9 +1275,15 @@ void AdvancedFm::move() {
TabWidget->setCurrentPage(1);
} else {
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
- QString destFile = currentRemoteDir.canonicalPath() + "/" + *it;
+ QString destFile = currentRemoteDir.canonicalPath();
+ if(destFile.right(1).find("/",0,TRUE) == -1)
+ destFile+="/";
+ destFile +=(*it);
qDebug("Destination file is "+destFile);
- curFile = currentDir.canonicalPath()+"/"+(*it);
+ curFile = currentDir.canonicalPath();
+ if(curFile.right(1).find("/",0,TRUE) == -1)
+ curFile +="/";
+ curFile+=(*it);
QFile f(destFile);
if( f.exists())