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_viewmgr.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_viewmgr.cc')
-rw-r--r-- | konqueror/konq_viewmgr.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index 4413416fb..f765006b5 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -420,7 +420,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag KTempFile tempFile; tempFile.setAutoDelete( true ); - KConfig config( tempFile.name() ); + TDEConfig config( tempFile.name() ); config.setGroup( "View Profile" ); TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); @@ -490,7 +490,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab ) KTempFile tempFile; tempFile.setAutoDelete( true ); - KConfig config( tempFile.name() ); + TDEConfig config( tempFile.name() ); config.setGroup( "View Profile" ); TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); @@ -1092,7 +1092,7 @@ void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString } -void KonqViewManager::saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWindowSize ) +void KonqViewManager::saveViewProfile( TDEConfig & cfg, bool saveURLs, bool saveWindowSize ) { //kdDebug(1202) << "KonqViewManager::saveViewProfile" << endl; if( m_pMainWindow->childFrame() != 0L ) { @@ -1126,13 +1126,13 @@ void KonqViewManager::loadViewProfile( const TQString & path, const TQString & f const KURL & forcedURL, const KonqOpenURLRequest &req, bool resetWindow, bool openURL ) { - KConfig cfg( path, true ); + TDEConfig cfg( path, true ); cfg.setDollarExpansion( true ); cfg.setGroup( "Profile" ); loadViewProfile( cfg, filename, forcedURL, req, resetWindow, openURL ); } -void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename, +void KonqViewManager::loadViewProfile( TDEConfig &cfg, const TQString & filename, const KURL & forcedURL, const KonqOpenURLRequest &req, bool resetWindow, bool openURL ) { @@ -1401,7 +1401,7 @@ void KonqViewManager::emitActivePartChanged() } -TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget ) +TQSize KonqViewManager::readConfigSize( TDEConfig &cfg, TQWidget *widget ) { bool ok; @@ -1446,7 +1446,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget ) return TQSize( width, height ); } -void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, +void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage ) { TQString prefix; |