diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /libkonq/konq_dirpart.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 'libkonq/konq_dirpart.cc')
| -rw-r--r-- | libkonq/konq_dirpart.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index 472ea1dbb..86f945742 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -430,7 +430,7 @@ void KonqDirPart::slotClipboardDataChanged() void KonqDirPart::updatePasteAction() // KDE4: merge into method above { - TQString actionText = KIO::pasteActionText(); + TQString actionText = TDEIO::pasteActionText(); bool paste = !actionText.isEmpty(); if ( paste ) emit m_extension->setActionText( "paste", actionText ); @@ -476,7 +476,7 @@ void KonqDirPart::emitTotalCount() } TQString summary = - KIO::itemsSummaryString(m_lFileCount + m_lDirCount, + TDEIO::itemsSummaryString(m_lFileCount + m_lDirCount, m_lFileCount, m_lDirCount, m_lDirSize, @@ -513,7 +513,7 @@ void KonqDirPart::emitCounts( const KFileItemList & lst ) } } - emit setStatusBarText( KIO::itemsSummaryString( fileCount + dirCount, + emit setStatusBarText( TDEIO::itemsSummaryString( fileCount + dirCount, fileCount, dirCount, fileSizeSum, true ) ); } |