-rw-r--r-- | libopie/ofileselector.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc index 3c3a6c4..b3aacd6 100644 --- a/libopie/ofileselector.cc +++ b/libopie/ofileselector.cc | |||
@@ -185,13 +185,9 @@ void OFileSelector::reread() | |||
185 | 185 | ||
186 | const DocLnk *OFileSelector::selected() | 186 | const DocLnk *OFileSelector::selected() |
187 | { | 187 | { |
188 | if( m_selector == NORMAL ){ | ||
189 | return m_select->selected(); | ||
190 | }else{ | ||
191 | DocLnk *lnk = new DocLnk(selectedDocument() ); | 188 | DocLnk *lnk = new DocLnk(selectedDocument() ); |
192 | return lnk; | 189 | return lnk; |
193 | } | 190 | } |
194 | } | ||
195 | 191 | ||
196 | void OFileSelector::setYesCancelVisible( bool show ) | 192 | void OFileSelector::setYesCancelVisible( bool show ) |
197 | { | 193 | { |
@@ -326,9 +322,8 @@ QString OFileSelector::selectedName() const | |||
326 | { | 322 | { |
327 | QString name; | 323 | QString name; |
328 | if( m_selector == NORMAL ){ | 324 | if( m_selector == NORMAL ){ |
329 | const DocLnk *lnk = m_select->selected(); | 325 | DocLnk lnk = m_select->selectedDocument(); |
330 | name = lnk->file(); | 326 | name = lnk.file(); |
331 | delete lnk; | ||
332 | }else if( m_selector == EXTENDED || m_selector == EXTENDED_ALL ){ | 327 | }else if( m_selector == EXTENDED || m_selector == EXTENDED_ALL ){ |
333 | if ( m_shLne ) { | 328 | if ( m_shLne ) { |
334 | name = m_currentDir + "/" +m_edit->text(); | 329 | name = m_currentDir + "/" +m_edit->text(); |
@@ -401,9 +396,7 @@ DocLnk OFileSelector::selectedDocument() const | |||
401 | DocLnk lnk; | 396 | DocLnk lnk; |
402 | switch( m_selector ){ | 397 | switch( m_selector ){ |
403 | case NORMAL:{ | 398 | case NORMAL:{ |
404 | const DocLnk *lnk2 = m_select->selected(); | 399 | lnk = m_select->selectedDocument(); |
405 | lnk = DocLnk(*lnk2 ); // copy | ||
406 | delete lnk2; | ||
407 | break; | 400 | break; |
408 | } | 401 | } |
409 | case EXTENDED: | 402 | case EXTENDED: |