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 /konqueror/konq_frame.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/konq_frame.cc')
| -rw-r--r-- | konqueror/konq_frame.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index d53c9154c..0764cf0b1 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -232,7 +232,7 @@ void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond ) TQString sizeStr; if ( bytesPerSecond > 0 ) - sizeStr = i18n( "%1/s" ).arg( KIO::convertSize( bytesPerSecond ) ); + sizeStr = i18n( "%1/s" ).arg( TDEIO::convertSize( bytesPerSecond ) ); else sizeStr = i18n( "Stalled" ); @@ -324,7 +324,7 @@ void KonqFrame::listViews( ChildViewList *viewList ) viewList->append( childView() ); } -void KonqFrame::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ ) +void KonqFrame::saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ ) { if (saveURLs) config->writePathEntry( TQString::fromLatin1( "URL" ).prepend( prefix ), @@ -516,7 +516,7 @@ void KonqFrameContainer::listViews( ChildViewList *viewList ) m_pSecondChild->listViews( viewList ); } -void KonqFrameContainer::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) +void KonqFrameContainer::saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) { int idSecond = id + (int)pow( 2.0, depth ); |