From 1d4158dd755a445fd42f2db7db5abab8084175cd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:05:40 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kpresenter/KPrConfig.cpp | 14 +++++++------- kpresenter/KPrRotationDialogImpl.cpp | 6 +++--- kpresenter/KPrSideBar.cpp | 2 +- kpresenter/KPrSideBar.h | 2 +- kpresenter/KPrTransEffectDia.cpp | 4 ++-- kpresenter/KPrView.cpp | 2 +- kpresenter/autoformEdit/AFChoose.cpp | 6 +++--- kpresenter/autoformEdit/AFChoose.h | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) (limited to 'kpresenter') diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index 5274c357..a8f6ff82 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -87,27 +87,27 @@ KPrConfig::KPrConfig( KPrView* parent ) { m_doc = parent->kPresenterDoc(); TQVBox *page = addVBoxPage( i18n("Interface"), i18n("Interface"), - BarIcon("misc", KIcon::SizeMedium) ); + BarIcon("misc", TDEIcon::SizeMedium) ); _interfacePage=new KPrConfigureInterfacePage( parent, page ); page = addVBoxPage( i18n("Color"), i18n("Color"), - BarIcon("colorize", KIcon::SizeMedium) ); + BarIcon("colorize", TDEIcon::SizeMedium) ); _colorBackground = new KPrConfigureColorBackground( parent, page ); page = addVBoxPage( i18n("Spelling"), i18n("Spellchecker Behavior"), - BarIcon("spellcheck", KIcon::SizeMedium) ); + BarIcon("spellcheck", TDEIcon::SizeMedium) ); _spellPage=new KPrConfigureSpellPage(parent, page); page = addVBoxPage( i18n("Misc"), i18n("Misc"), - BarIcon("misc", KIcon::SizeMedium) ); + BarIcon("misc", TDEIcon::SizeMedium) ); _miscPage=new KPrConfigureMiscPage(parent, page); page = addVBoxPage( i18n("Document"), i18n("Document Settings"), - BarIcon("kpresenter_kpr", KIcon::SizeMedium) ); + BarIcon("kpresenter_kpr", TDEIcon::SizeMedium) ); _defaultDocPage=new KPrConfigureDefaultDocPage(parent, page); page = addVBoxPage( i18n("Tools"), i18n("Default Tools Settings"), - BarIcon("configure", KIcon::SizeMedium) ); + BarIcon("configure", TDEIcon::SizeMedium) ); _toolsPage=new KPrConfigureToolsPage(parent, page); @@ -118,7 +118,7 @@ KPrConfig::KPrConfig( KPrView* parent ) if (KoSpeaker::isKttsdInstalled()) { page = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"), i18n("Text-to-Speech Settings"), - BarIcon("access", KIcon::SizeMedium) ); + BarIcon("access", TDEIcon::SizeMedium) ); m_ttsPage=new KPrConfigureTTSPage(parent, page); } else m_ttsPage = 0; diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp index 4f2d59ca..3e28c748 100644 --- a/kpresenter/KPrRotationDialogImpl.cpp +++ b/kpresenter/KPrRotationDialogImpl.cpp @@ -117,9 +117,9 @@ void KPrRotationDialogImpl::angleMode( int angle ) KPrCircleToggle::KPrCircleToggle( TQWidget *parent, const TQString &image, int id ) : TQLabel( parent ) { - KIconLoader il("kpresenter"); - m_off = il.loadIcon("rotate/" + image, KIcon::NoGroup, 28); - m_on = il.loadIcon("rotate/" + image + "dn", KIcon::NoGroup, 28); + TDEIconLoader il("kpresenter"); + m_off = il.loadIcon("rotate/" + image, TDEIcon::NoGroup, 28); + m_on = il.loadIcon("rotate/" + image + "dn", TDEIcon::NoGroup, 28); m_selected = false; m_id = id; diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index 29d56561..00ee8139 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -234,7 +234,7 @@ void KPrSideBarBase::setViewMasterPage( bool _b ) } KPrThumbBar::KPrThumbBar(TQWidget *parent, KPrDocument *d, KPrView *v) - :KIconView(parent), KPrSideBarBase( d,v) + :TDEIconView(parent), KPrSideBarBase( d,v) { uptodate = false; m_offsetX = 0; diff --git a/kpresenter/KPrSideBar.h b/kpresenter/KPrSideBar.h index a1190bdb..1888cacb 100644 --- a/kpresenter/KPrSideBar.h +++ b/kpresenter/KPrSideBar.h @@ -63,7 +63,7 @@ protected: bool m_viewMasterPage; }; -class KPrThumbBar : public KIconView, public KPrSideBarBase +class KPrThumbBar : public TDEIconView, public KPrSideBarBase { Q_OBJECT diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp index f1306594..b4f9d144 100644 --- a/kpresenter/KPrTransEffectDia.cpp +++ b/kpresenter/KPrTransEffectDia.cpp @@ -290,13 +290,13 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, this, TQT_SLOT( slotSoundFileChanged( const TQString& ) ) ); buttonTestPlaySoundEffect = new TQPushButton( soundgrp ); - buttonTestPlaySoundEffect->setPixmap( BarIcon("1rightarrow", KIcon::SizeSmall) ); + buttonTestPlaySoundEffect->setPixmap( BarIcon("1rightarrow", TDEIcon::SizeSmall) ); TQToolTip::add( buttonTestPlaySoundEffect, i18n("Play") ); connect( buttonTestPlaySoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound() ) ); buttonTestStopSoundEffect = new TQPushButton( soundgrp ); - buttonTestStopSoundEffect->setPixmap( BarIcon("player_stop", KIcon::SizeSmall) ); + buttonTestStopSoundEffect->setPixmap( BarIcon("player_stop", TDEIcon::SizeSmall) ); TQToolTip::add( buttonTestStopSoundEffect, i18n("Stop") ); connect( buttonTestStopSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound() ) ); diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index f96b095d..90e8537e 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -6463,7 +6463,7 @@ void KPrView::documentModified( bool b ) return; if ( b ) - m_sbModifiedLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "action-modified", KIcon::Small ) ); + m_sbModifiedLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "action-modified", TDEIcon::Small ) ); else m_sbModifiedLabel->setText( " " ); } diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp index 5914a621..9c4e2e5e 100644 --- a/kpresenter/autoformEdit/AFChoose.cpp +++ b/kpresenter/autoformEdit/AFChoose.cpp @@ -87,8 +87,8 @@ void AFChoose::setupTabs() { grpPtr->tab = new TQVBox(this); TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined shape by clicking on it then clicking the OK button (or just double-click on the shape). You can then insert the shape onto your slide by drawing the area with the mouse pointer." ) ); - grpPtr->loadWid = new KIconCanvas(grpPtr->tab); - // Changes for the new KIconCanvas (Werner) + grpPtr->loadWid = new TDEIconCanvas(grpPtr->tab); + // Changes for the new TDEIconCanvas (Werner) TQDir d( grpPtr->dir.absFilePath() ); d.setNameFilter( "*.desktop" ); if( d.exists() ) { @@ -111,7 +111,7 @@ void AFChoose::setupTabs() } grpPtr->entries.insert(text, filename); // now load the icon and create the item - // This code is shamelessly borrowed from KIconCanvas::slotLoadFiles + // This code is shamelessly borrowed from TDEIconCanvas::slotLoadFiles TQImage img; img.load(icon); if (img.isNull()) { diff --git a/kpresenter/autoformEdit/AFChoose.h b/kpresenter/autoformEdit/AFChoose.h index 883da064..06575fed 100644 --- a/kpresenter/autoformEdit/AFChoose.h +++ b/kpresenter/autoformEdit/AFChoose.h @@ -27,7 +27,7 @@ #include class TQLabel; -class KIconCanvas; +class TDEIconCanvas; class AFChoose : public TQTabDialog { @@ -48,7 +48,7 @@ private: TQFileInfo dir; TQString name; TQWidget *tab; - KIconCanvas *loadWid; + TDEIconCanvas *loadWid; TQLabel *label; TQMap entries; }; -- cgit v1.2.1