diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /konqueror/konq_viewmgr.cc | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_viewmgr.cc')
| -rw-r--r-- | konqueror/konq_viewmgr.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index 8fce3f146..4413416fb 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -1078,7 +1078,7 @@ void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString { TQString path = locateLocal( "data", TQString::fromLatin1( "konqueror/profiles/" ) + - fileName, KGlobal::instance() ); + fileName, TDEGlobal::instance() ); if ( TQFile::exists( path ) ) TQFile::remove( path ); @@ -1299,7 +1299,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename, if( resetWindow ) { // force default settings for the GUI - m_pMainWindow->applyMainWindowSettings( KGlobal::config(), "KonqMainWindow", true ); + m_pMainWindow->applyMainWindowSettings( TDEGlobal::config(), "KonqMainWindow", true ); } // Apply menu/toolbar settings saved in profile. Read from a separate group @@ -1411,7 +1411,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget ) int width = -1; int height = -1; - TQRect geom = KGlobalSettings::desktopGeometry(widget); + TQRect geom = TDEGlobalSettings::desktopGeometry(widget); if ( widthStr.contains( '%' ) == 1 ) { @@ -1755,15 +1755,15 @@ void KonqViewManager::setLoading( KonqView *view, bool loading ) TQColor color; KonqFrameTabs* konqframetabs = static_cast<KonqFrameTabs*>( parentContainer ); if ( loading ) - color = TQColor( (KGlobalSettings::linkColor().red() + KGlobalSettings::inactiveTextColor().red())/2, - (KGlobalSettings::linkColor().green()+ KGlobalSettings::inactiveTextColor().green())/2, - (KGlobalSettings::linkColor().blue() + KGlobalSettings::inactiveTextColor().blue())/2 ); + color = TQColor( (TDEGlobalSettings::linkColor().red() + TDEGlobalSettings::inactiveTextColor().red())/2, + (TDEGlobalSettings::linkColor().green()+ TDEGlobalSettings::inactiveTextColor().green())/2, + (TDEGlobalSettings::linkColor().blue() + TDEGlobalSettings::inactiveTextColor().blue())/2 ); else { if ( konqframetabs->currentPage() != view->frame() ) - color = KGlobalSettings::linkColor(); + color = TDEGlobalSettings::linkColor(); else - color = KGlobalSettings::textColor(); + color = TDEGlobalSettings::textColor(); } konqframetabs->setTabColor( view->frame(), color ); } |