diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /konqueror/listview/konq_listviewitems.cc | |
parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/listview/konq_listviewitems.cc')
-rw-r--r-- | konqueror/listview/konq_listviewitems.cc | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index 616559bad..925f33f8f 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -30,12 +30,12 @@ static TQString retrieveExtraEntry( KFileItem* fileitem, int numExtra ) { /// ######## SLOOOOW - KIO::UDSEntry::ConstIterator it = fileitem->entry().begin(); - const KIO::UDSEntry::ConstIterator end = fileitem->entry().end(); + TDEIO::UDSEntry::ConstIterator it = fileitem->entry().begin(); + const TDEIO::UDSEntry::ConstIterator end = fileitem->entry().end(); int n = 0; for( ; it != end; ++it ) { - if ((*it).m_uds == KIO::UDS_EXTRA) + if ((*it).m_uds == TDEIO::UDS_EXTRA) { ++n; if ( n == numExtra ) @@ -99,36 +99,36 @@ void KonqListViewItem::updateContents() { switch (tmpColumn->udsId) { - case KIO::UDS_USER: + case TDEIO::UDS_USER: setText(tmpColumn->displayInColumn,m_fileitem->user()); break; - case KIO::UDS_GROUP: + case TDEIO::UDS_GROUP: setText(tmpColumn->displayInColumn,m_fileitem->group()); break; - case KIO::UDS_FILE_TYPE: + case TDEIO::UDS_FILE_TYPE: setText(tmpColumn->displayInColumn,m_fileitem->mimeComment()); break; - case KIO::UDS_MIME_TYPE: + case TDEIO::UDS_MIME_TYPE: setText(tmpColumn->displayInColumn,m_fileitem->mimetype()); break; - case KIO::UDS_URL: + case TDEIO::UDS_URL: setText(tmpColumn->displayInColumn,m_fileitem->url().prettyURL()); break; - case KIO::UDS_LINK_DEST: + case TDEIO::UDS_LINK_DEST: setText(tmpColumn->displayInColumn,m_fileitem->linkDest()); break; - case KIO::UDS_SIZE: + case TDEIO::UDS_SIZE: if ( m_pListViewWidget->m_pSettings->fileSizeInBytes() ) setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" "); else - setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" "); + setText(tmpColumn->displayInColumn,TDEIO::convertSize(m_fileitem->size())+" "); break; - case KIO::UDS_ACCESS: + case TDEIO::UDS_ACCESS: setText(tmpColumn->displayInColumn,m_fileitem->permissionsString()); break; - case KIO::UDS_MODIFICATION_TIME: - case KIO::UDS_ACCESS_TIME: - case KIO::UDS_CREATION_TIME: + case TDEIO::UDS_MODIFICATION_TIME: + case TDEIO::UDS_ACCESS_TIME: + case TDEIO::UDS_CREATION_TIME: { TQDateTime dt; time_t _time = m_fileitem->time( tmpColumn->udsId ); @@ -139,7 +139,7 @@ void KonqListViewItem::updateContents() } } break; - case KIO::UDS_EXTRA: + case TDEIO::UDS_EXTRA: { const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra ); if ( tmpColumn->type == TQVariant::DateTime ) @@ -251,27 +251,27 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending for ( unsigned int i=0; i<m_pListViewWidget->NumberOfAtoms; i++ ) { ColumnInfo *cInfo = &m_pListViewWidget->columnConfigInfo()[i]; - if ( cInfo->udsId == KIO::UDS_EXTRA ) + if ( cInfo->udsId == TDEIO::UDS_EXTRA ) ++numExtra; if ( col == cInfo->displayInColumn ) { switch ( cInfo->udsId ) { - case KIO::UDS_MODIFICATION_TIME: - case KIO::UDS_ACCESS_TIME: - case KIO::UDS_CREATION_TIME: + case TDEIO::UDS_MODIFICATION_TIME: + case TDEIO::UDS_ACCESS_TIME: + case TDEIO::UDS_CREATION_TIME: { time_t t1 = m_fileitem->time( cInfo->udsId ); time_t t2 = k->m_fileitem->time( cInfo->udsId ); return ( t1 > t2 ) ? 1 : ( t1 < t2 ) ? -1 : 0; } - case KIO::UDS_SIZE: + case TDEIO::UDS_SIZE: { - KIO::filesize_t s1 = m_fileitem->size(); - KIO::filesize_t s2 = k->m_fileitem->size(); + TDEIO::filesize_t s1 = m_fileitem->size(); + TDEIO::filesize_t s2 = k->m_fileitem->size(); return ( s1 > s2 ) ? 1 : ( s1 < s2 ) ? -1 : 0; } - case KIO::UDS_EXTRA: + case TDEIO::UDS_EXTRA: { if ( cInfo->type & TQVariant::DateTime ) { const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra ); @@ -434,12 +434,12 @@ void KonqBaseListViewItem::mimetypeFound() for (unsigned int i=0; i<m_pListViewWidget->NumberOfAtoms && done < 2; i++) { ColumnInfo *tmpColumn=&lv->columnConfigInfo()[i]; - if (lv->columnConfigInfo()[i].udsId==KIO::UDS_FILE_TYPE && tmpColumn->displayThisOne) + if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_FILE_TYPE && tmpColumn->displayThisOne) { setText(tmpColumn->displayInColumn, m_fileitem->mimeComment()); done++; } - if (lv->columnConfigInfo()[i].udsId==KIO::UDS_MIME_TYPE && tmpColumn->displayThisOne) + if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_MIME_TYPE && tmpColumn->displayThisOne) { setText(tmpColumn->displayInColumn, m_fileitem->mimetype()); done++; |