diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /konqueror/about | |
| 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/about')
| -rw-r--r-- | konqueror/about/konq_aboutpage.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index 6b573d438..0f026a1ed 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -98,7 +98,7 @@ TQString KonqAboutPageFactory::launch() if ( res.isEmpty() ) return res; - KIconLoader *iconloader = KGlobal::iconLoader(); + KIconLoader *iconloader = TDEGlobal::iconLoader(); int iconSize = iconloader->currentSize(KIcon::Desktop); TQString home_icon_path = iconloader->iconPath("kfm_home", KIcon::Desktop ); TQString storage_icon_path = iconloader->iconPath("system", KIcon::Desktop ); @@ -190,7 +190,7 @@ TQString KonqAboutPageFactory::intro() if ( res.isEmpty() ) return res; - KIconLoader *iconloader = KGlobal::iconLoader(); + KIconLoader *iconloader = TDEGlobal::iconLoader(); TQString back_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("forward", KIcon::Small ):iconloader->iconPath("back", KIcon::Small ); TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small ); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); @@ -244,7 +244,7 @@ TQString KonqAboutPageFactory::specs() if ( s_specs_html ) return *s_specs_html; - KIconLoader *iconloader = KGlobal::iconLoader(); + KIconLoader *iconloader = TDEGlobal::iconLoader(); TQString res = loadFile( locate( "data", "konqueror/about/specs.html" )); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); if ( res.isEmpty() ) @@ -330,7 +330,7 @@ TQString KonqAboutPageFactory::tips() if ( res.isEmpty() ) return res; - KIconLoader *iconloader = KGlobal::iconLoader(); + KIconLoader *iconloader = TDEGlobal::iconLoader(); TQString viewmag_icon_path = iconloader->iconPath("viewmag", KIcon::Small ); TQString history_icon_path = @@ -432,7 +432,7 @@ KonqAboutPage::KonqAboutPage( //KonqMainWindow * : KHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI ) { //m_mainWindow = mainWindow; - TQTextCodec* codec = KGlobal::locale()->codecForEncoding(); + TQTextCodec* codec = TDEGlobal::locale()->codecForEncoding(); if (codec) setCharset(codec->name(), true); else |