diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:01 -0600 |
| commit | 69f1eaa31f6b96de636583c19d283f4e657d5c40 (patch) | |
| tree | 02370f7430cfbfd3fe35250bede9bd07651aac9d /src | |
| parent | 5fb97907dcc15645d95f5ad0a987cd4f5e52a68f (diff) | |
| download | kbfx-69f1eaa31f6b96de636583c19d283f4e657d5c40.tar.gz kbfx-69f1eaa31f6b96de636583c19d283f4e657d5c40.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/kbfxplasmacanvasitem.cpp | 2 | ||||
| -rw-r--r-- | src/kbfxplasmaindexitem.cpp | 2 | ||||
| -rw-r--r-- | src/kbfxspinx.cpp | 2 | ||||
| -rw-r--r-- | src/kbfxspinxtoolbutton.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
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 ); } |