author | zecke <zecke> | 2002-11-03 11:03:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-11-03 11:03:20 (UTC) |
commit | 207f7430db6c90e88825ea2bedc9ae1bf68e3d99 (patch) (unidiff) | |
tree | fb69b58f130c0b0a17224989f26aa4af5939b33e /libopie/ofileselector.cc | |
parent | 485fae36510cb42690c9df55fae64312b1e656ae (diff) | |
download | opie-207f7430db6c90e88825ea2bedc9ae1bf68e3d99.zip opie-207f7430db6c90e88825ea2bedc9ae1bf68e3d99.tar.gz opie-207f7430db6c90e88825ea2bedc9ae1bf68e3d99.tar.bz2 |
Patch by Simon Hausmann to suit gcc3 needs
many thanks
-rw-r--r-- | libopie/ofileselector.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc index 9534667..6a6a300 100644 --- a/libopie/ofileselector.cc +++ b/libopie/ofileselector.cc | |||
@@ -372,13 +372,13 @@ QString OFileSelector::directory()const | |||
372 | if( m_selector == NORMAL ) | 372 | if( m_selector == NORMAL ) |
373 | return QPEApplication::documentDir(); | 373 | return QPEApplication::documentDir(); |
374 | 374 | ||
375 | return QDir(m_currentDir).absPath(); | 375 | return QDir(m_currentDir).absPath(); |
376 | } | 376 | } |
377 | 377 | ||
378 | int OFileSelector::fileCount() | 378 | int OFileSelector::fileCount() const |
379 | { | 379 | { |
380 | int count; | 380 | int count; |
381 | switch( m_selector ){ | 381 | switch( m_selector ){ |
382 | case NORMAL: | 382 | case NORMAL: |
383 | count = m_select->fileCount(); | 383 | count = m_select->fileCount(); |
384 | break; | 384 | break; |
@@ -679,13 +679,13 @@ void OFileSelector::initVars() | |||
679 | m_custom = 0; | 679 | m_custom = 0; |
680 | m_edit = 0; | 680 | m_edit = 0; |
681 | m_fnLabel = 0; | 681 | m_fnLabel = 0; |
682 | m_new = 0; | 682 | m_new = 0; |
683 | m_close = 0; | 683 | m_close = 0; |
684 | } | 684 | } |
685 | void OFileSelector::addFile(const QString &mime, QFileInfo *info, bool symlink) | 685 | void OFileSelector::addFile(const QString &/*mime*/, QFileInfo *info, bool symlink) |
686 | { | 686 | { |
687 | if(!m_files) | 687 | if(!m_files) |
688 | return; | 688 | return; |
689 | // if( !compliesMime(info->absFilePath(), mime ) ) | 689 | // if( !compliesMime(info->absFilePath(), mime ) ) |
690 | // return; | 690 | // return; |
691 | MimeType type( info->absFilePath() ); | 691 | MimeType type( info->absFilePath() ); |
@@ -711,13 +711,13 @@ void OFileSelector::addFile(const QString &mime, QFileInfo *info, bool symlink) | |||
711 | } | 711 | } |
712 | new OFileSelectorItem( m_View, pix, name, | 712 | new OFileSelectorItem( m_View, pix, name, |
713 | info->lastModified().toString(), | 713 | info->lastModified().toString(), |
714 | QString::number( info->size() ), | 714 | QString::number( info->size() ), |
715 | dir, locked ); | 715 | dir, locked ); |
716 | } | 716 | } |
717 | void OFileSelector::addDir(const QString &mime, QFileInfo *info, bool symlink ) | 717 | void OFileSelector::addDir(const QString &/*mime*/, QFileInfo *info, bool symlink ) |
718 | { | 718 | { |
719 | if(!m_dir) | 719 | if(!m_dir) |
720 | return; | 720 | return; |
721 | if( m_selector == EXTENDED_ALL || m_selector == EXTENDED ){ | 721 | if( m_selector == EXTENDED_ALL || m_selector == EXTENDED ){ |
722 | bool locked = false; | 722 | bool locked = false; |
723 | QString name; | 723 | QString name; |
@@ -1015,13 +1015,12 @@ bool OFileSelector::compliesMime( const QString& mime ) { | |||
1015 | 1015 | ||
1016 | 1016 | ||
1017 | if ( list.contains(mime) ) return true; | 1017 | if ( list.contains(mime) ) return true; |
1018 | qWarning("list doesn't contain it "); | 1018 | qWarning("list doesn't contain it "); |
1019 | QStringList::Iterator it2; | 1019 | QStringList::Iterator it2; |
1020 | int pos; | 1020 | int pos; |
1021 | int pos2; | ||
1022 | for ( it2 = list.begin(); it2 != list.end(); ++it2 ) { | 1021 | for ( it2 = list.begin(); it2 != list.end(); ++it2 ) { |
1023 | pos = (*it2).findRev("/*"); | 1022 | pos = (*it2).findRev("/*"); |
1024 | if ( pos >= 0 ) { | 1023 | if ( pos >= 0 ) { |
1025 | if ( mime.contains( (*it2).left(pos) ) ) return true; | 1024 | if ( mime.contains( (*it2).left(pos) ) ) return true; |
1026 | } | 1025 | } |
1027 | } | 1026 | } |
@@ -1102,13 +1101,13 @@ void OFileSelector::slotRightButton(int button, QListViewItem *item, const QPoin | |||
1102 | return; | 1101 | return; |
1103 | 1102 | ||
1104 | if( button != Qt::RightButton ) | 1103 | if( button != Qt::RightButton ) |
1105 | return; | 1104 | return; |
1106 | slotContextMenu( item ); | 1105 | slotContextMenu( item ); |
1107 | } | 1106 | } |
1108 | void OFileSelector::slotContextMenu( QListViewItem *item) | 1107 | void OFileSelector::slotContextMenu( QListViewItem * /*item*/) |
1109 | { | 1108 | { |
1110 | 1109 | ||
1111 | } | 1110 | } |
1112 | void OFileSelector::slotChangedDir() | 1111 | void OFileSelector::slotChangedDir() |
1113 | { | 1112 | { |
1114 | OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem(); | 1113 | OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem(); |