author | llornkcor <llornkcor> | 2004-07-07 21:05:21 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-07-07 21:05:21 (UTC) |
commit | 8ff360bd5e136aba5a9c1b340040ecaf0fc6e0d4 (patch) (unidiff) | |
tree | 6fb3a67204a063e5031d1b4d98707b960ca2d806 /noncore | |
parent | 30d8a50aba298e26a3d3cc1d5b6a0c69c1d2783d (diff) | |
download | opie-8ff360bd5e136aba5a9c1b340040ecaf0fc6e0d4.zip opie-8ff360bd5e136aba5a9c1b340040ecaf0fc6e0d4.tar.gz opie-8ff360bd5e136aba5a9c1b340040ecaf0fc6e0d4.tar.bz2 |
fix combo filling with real QString instead of QDir object
-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 817943b..58ffe3a 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -710,13 +710,13 @@ void OpieFtp::populateLocalView() | |||
710 | } | 710 | } |
711 | isDir=FALSE; | 711 | isDir=FALSE; |
712 | ++it; | 712 | ++it; |
713 | } | 713 | } |
714 | Local_View->setSorting( 3,FALSE); | 714 | Local_View->setSorting( 3,FALSE); |
715 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() ); | 715 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() ); |
716 | // fillCombo( (const QString &)currentDir); | 716 | fillCombo( (const QString &)currentDir.canonicalPath()); |
717 | } | 717 | } |
718 | 718 | ||
719 | bool OpieFtp::populateRemoteView( ) | 719 | bool OpieFtp::populateRemoteView( ) |
720 | { | 720 | { |
721 | // odebug << "populate remoteview" << oendl; | 721 | // odebug << "populate remoteview" << oendl; |
722 | QString sfile=QDir::homeDirPath(); | 722 | QString sfile=QDir::homeDirPath(); |
@@ -1137,13 +1137,12 @@ void OpieFtp::currentPathComboActivated(const QString & currentPath) { | |||
1137 | // update(); | 1137 | // update(); |
1138 | 1138 | ||
1139 | } | 1139 | } |
1140 | } | 1140 | } |
1141 | 1141 | ||
1142 | void OpieFtp::fillCombo(const QString ¤tPath) { | 1142 | void OpieFtp::fillCombo(const QString ¤tPath) { |
1143 | qDebug("Fill Combo "+currentPath); | ||
1144 | currentPathCombo->lineEdit()->setText(currentPath); | 1143 | currentPathCombo->lineEdit()->setText(currentPath); |
1145 | 1144 | ||
1146 | if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { | 1145 | if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { |
1147 | qDebug("Clearing local"); | 1146 | qDebug("Clearing local"); |
1148 | currentPathCombo->clear(); | 1147 | currentPathCombo->clear(); |
1149 | localDirPathStringList.prepend(currentPath ); | 1148 | localDirPathStringList.prepend(currentPath ); |