From 69f1eaa31f6b96de636583c19d283f4e657d5c40 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:20:01 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/kbfxplasmacanvasitem.cpp | 2 +- src/kbfxplasmaindexitem.cpp | 2 +- src/kbfxspinx.cpp | 2 +- src/kbfxspinxtoolbutton.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/kbfxplasmacanvasitem.cpp b/src/kbfxplasmacanvasitem.cpp index 62b75c6..d552578 100644 --- a/src/kbfxplasmacanvasitem.cpp +++ b/src/kbfxplasmacanvasitem.cpp @@ -132,7 +132,7 @@ KbfxPlasmaCanvasItem::setExec ( TQString desktopfile ) void KbfxPlasmaCanvasItem::setIconPath ( TQString str ) { - KIconLoader *iconload = KGlobal::iconLoader (); + KIconLoader *iconload = TDEGlobal::iconLoader (); m_iconPath = iconload->iconPath ( str, KIcon::Desktop, false ); // m_icon.load(m_iconPath); TQImage _img ( m_iconPath ); diff --git a/src/kbfxplasmaindexitem.cpp b/src/kbfxplasmaindexitem.cpp index b7a37fd..55c4642 100644 --- a/src/kbfxplasmaindexitem.cpp +++ b/src/kbfxplasmaindexitem.cpp @@ -44,7 +44,7 @@ KbfxPlasmaIndexItem::~KbfxPlasmaIndexItem() void KbfxPlasmaIndexItem::setIcon ( TQString str ) { - KIconLoader *iconload = KGlobal::iconLoader (); + KIconLoader *iconload = TDEGlobal::iconLoader (); m_iconPath = iconload->iconPath ( str, KIcon::Desktop, false ); m_icon.load ( m_iconPath ); diff --git a/src/kbfxspinx.cpp b/src/kbfxspinx.cpp index 3e7359f..43cef05 100644 --- a/src/kbfxspinx.cpp +++ b/src/kbfxspinx.cpp @@ -317,7 +317,7 @@ extern "C" { KPanelApplet* init ( TQWidget *parent, const TQString& configFile ) { - KGlobal::locale()->insertCatalogue ( "KbfxSpinx" ); + TDEGlobal::locale()->insertCatalogue ( "KbfxSpinx" ); return new KbfxSpinx ( configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, parent, "KbfxSpinx" ); diff --git a/src/kbfxspinxtoolbutton.cpp b/src/kbfxspinxtoolbutton.cpp index 37fcf53..a525435 100644 --- a/src/kbfxspinxtoolbutton.cpp +++ b/src/kbfxspinxtoolbutton.cpp @@ -105,7 +105,7 @@ KbfxSpinxToolButton::setDataSource ( KbfxDataSource * src ) m_exe = src->command(); m_dataSource = new KbfxDataSource(); *m_dataSource = *src; // copy - KIconLoader *iconload = KGlobal::iconLoader (); + KIconLoader *iconload = TDEGlobal::iconLoader (); TQString m_iconPath = iconload->iconPath ( m_icon, KIcon::Desktop, false ); m_iconPixmap = TQPixmap ( m_iconPath ); } -- cgit v1.2.3