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 /libkonq/konq_propsview.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 'libkonq/konq_propsview.cc')
| -rw-r--r-- | libkonq/konq_propsview.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc index e1cee86d7..84d6fa5c5 100644 --- a/libkonq/konq_propsview.cc +++ b/libkonq/konq_propsview.cc @@ -121,15 +121,15 @@ KonqPropsView::KonqPropsView( TDEInstance * instance, KonqPropsView * defaultPro // So now we read the settings from the app global file, if this is the default props if (!defaultProps) { - KConfigGroupSaver cgs2(KGlobal::config(), "Settings"); - m_textColor = KGlobal::config()->readColorEntry( "TextColor", &m_textColor ); - m_bgColor = KGlobal::config()->readColorEntry( "BgColor", &m_bgColor ); - m_bgPixmapFile = KGlobal::config()->readPathEntry( "BgImage", m_bgPixmapFile ); - //kdDebug(1203) << "KonqPropsView::KonqPropsView from KGlobal : BgImage=" << m_bgPixmapFile << endl; + KConfigGroupSaver cgs2(TDEGlobal::config(), "Settings"); + m_textColor = TDEGlobal::config()->readColorEntry( "TextColor", &m_textColor ); + m_bgColor = TDEGlobal::config()->readColorEntry( "BgColor", &m_bgColor ); + m_bgPixmapFile = TDEGlobal::config()->readPathEntry( "BgImage", m_bgPixmapFile ); + //kdDebug(1203) << "KonqPropsView::KonqPropsView from TDEGlobal : BgImage=" << m_bgPixmapFile << endl; } - KGlobal::dirs()->addResourceType("tiles", - KGlobal::dirs()->kde_default("data") + "konqueror/tiles/"); + TDEGlobal::dirs()->addResourceType("tiles", + TDEGlobal::dirs()->kde_default("data") + "konqueror/tiles/"); } bool KonqPropsView::isCaseInsensitiveSort() const @@ -169,7 +169,7 @@ KConfigBase * KonqPropsView::currentColorConfig() return currentConfig(); // Will create it if necessary else // Save color settings in app's file, not in view's file - return KGlobal::config(); + return TDEGlobal::config(); } KonqPropsView::~KonqPropsView() |