summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore 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
@@ -836,3 +836,2 @@ void AdvancedFm::localDelete()
}
-
}
@@ -1142,4 +1141,10 @@ void AdvancedFm::copy()
- 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);
@@ -1156,4 +1161,10 @@ void AdvancedFm::copy()
- 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);
@@ -1178,4 +1189,7 @@ void AdvancedFm::copyAs()
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;
@@ -1186,3 +1200,6 @@ void AdvancedFm::copyAs()
QString filename = fileDlg->LineEdit1->text();
- destFile = currentRemoteDir.canonicalPath()+"/"+destFile;
+ destFile = currentRemoteDir.canonicalPath();
+ if(destFile.right(1).find("/",0,TRUE) == -1)
+ destFile+="/";
+ destFile +=(*it);
@@ -1202,4 +1219,7 @@ void AdvancedFm::copyAs()
- 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);
@@ -1208,3 +1228,6 @@ void AdvancedFm::copyAs()
QString filename = fileDlg->LineEdit1->text();
- destFile = currentDir.canonicalPath()+"/"+destFile;
+ destFile = currentDir.canonicalPath();
+ if(destFile.right(1).find("/",0,TRUE) == -1)
+ destFile+="/";
+ destFile +=(*it);
@@ -1232,5 +1255,11 @@ void AdvancedFm::move() {
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);
@@ -1248,5 +1277,11 @@ void AdvancedFm::move() {
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);