summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:18:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:18:14 -0600
commitb97ee238f88e9578da228388210cd8cab5360778 (patch)
tree8bf3ab88929af70826ebe3b84434c3403dc71c7d
parent656055dae6f13ee65d66fabf9041b288d81710af (diff)
downloadtdepim-b97ee238f88e9578da228388210cd8cab5360778.tar.gz
tdepim-b97ee238f88e9578da228388210cd8cab5360778.zip
Rename KIcon to enhance compatibility with KDE4
-rw-r--r--akregator/src/addfeeddialog.cpp2
-rw-r--r--akregator/src/akregator_view.cpp4
-rw-r--r--akregator/src/feeditem.cpp4
-rw-r--r--akregator/src/feedlistview.cpp4
-rw-r--r--akregator/src/folderitem.cpp2
-rw-r--r--akregator/src/searchbar.cpp2
-rw-r--r--akregator/src/tabwidget.cpp2
-rw-r--r--akregator/src/tagnodeitem.cpp4
-rw-r--r--akregator/src/tagpropertieswidgetbase.ui2
-rw-r--r--akregator/src/trayicon.cpp4
-rw-r--r--certmanager/lib/ui/cryptoconfigmodule.cpp2
-rw-r--r--certmanager/lib/ui/directoryserviceswidget.cpp4
-rw-r--r--certmanager/lib/ui/keyselectiondialog.cpp2
-rw-r--r--certmanager/lib/ui/passphrasedialog.cpp2
-rw-r--r--kaddressbook/addresseeeditorwidget.cpp26
-rw-r--r--kaddressbook/distributionlistentryview.cpp2
-rw-r--r--kaddressbook/features/resourceselection.cpp4
-rw-r--r--kaddressbook/geowidget.cpp2
-rw-r--r--kaddressbook/imagewidget.cpp2
-rw-r--r--kaddressbook/kcmconfigs/ldapoptionswidget.cpp4
-rw-r--r--kaddressbook/soundwidget.cpp2
-rw-r--r--kaddressbook/viewconfigurewidget.cpp4
-rw-r--r--kaddressbook/viewmanager.cpp2
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp2
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp10
-rw-r--r--kaddressbook/views/kaddressbookiconview.h4
-rw-r--r--kalarm/messagewin.cpp6
-rw-r--r--kandy/src/kandyprefsdialog.cpp6
-rw-r--r--karm/preferences.cpp6
-rw-r--r--karm/task.cpp4
-rw-r--r--kgantt/kgantt/xQGanttBarViewPort.cpp30
-rw-r--r--kgantt/kgantt/xQGanttBarViewPort.h2
-rw-r--r--kitchensync/src/aboutpage.cpp10
-rw-r--r--kitchensync/src/groupconfig.cpp4
-rw-r--r--kitchensync/src/groupitem.cpp2
-rw-r--r--kitchensync/src/memberinfo.cpp4
-rw-r--r--kitchensync/src/pluginpicker.cpp2
-rw-r--r--kmail/accountdialog.cpp10
-rw-r--r--kmail/configuredialog_p.h2
-rw-r--r--kmail/customtemplates.cpp10
-rw-r--r--kmail/folderpropertiesdialog.ui4
-rw-r--r--kmail/folderrequester.cpp2
-rw-r--r--kmail/kmfawidgets.cpp2
-rw-r--r--kmail/kmfilterdlg.cpp18
-rw-r--r--kmail/kmfilterdlg.h4
-rw-r--r--kmail/kmfolderdia.cpp10
-rw-r--r--kmail/kmfolderdia.h6
-rw-r--r--kmail/kmfoldertree.cpp30
-rw-r--r--kmail/kmheaders.cpp4
-rw-r--r--kmail/kmmimeparttree.cpp2
-rw-r--r--kmail/kmmsgpart.h2
-rw-r--r--kmail/kmmsgpartdlg.cpp2
-rw-r--r--kmail/kmstartup.cpp2
-rw-r--r--kmail/kmsystemtray.cpp4
-rw-r--r--kmail/objecttreeparser.cpp6
-rw-r--r--kmail/partNode.cpp2
-rw-r--r--kmail/recipientspicker.cpp8
-rw-r--r--kmail/redirectdialog.cpp2
-rw-r--r--kmail/searchwindow.cpp4
-rw-r--r--kmail/simplestringlisteditor.cpp4
-rw-r--r--kmail/urlhandlermanager.cpp2
-rw-r--r--kmobile/kmobile.cpp2
-rw-r--r--kmobile/kmobileitem.cpp2
-rw-r--r--kmobile/systemtray.cpp4
-rw-r--r--knode/articlewidget.cpp2
-rw-r--r--knode/knconfig.cpp8
-rw-r--r--knode/knconfigwidgets.cpp2
-rw-r--r--knotes/ChangeLog2
-rw-r--r--knotes/knote.cpp12
-rw-r--r--knotes/knotebutton.cpp2
-rw-r--r--knotes/knotesapp.cpp4
-rw-r--r--kontact/TODO2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp4
-rw-r--r--kontact/plugins/knotes/knotes_part.h4
-rw-r--r--kontact/plugins/knotes/knotes_part_p.h18
-rw-r--r--kontact/plugins/knotes/knotetip.cpp2
-rw-r--r--kontact/plugins/knotes/knotetip.h6
-rw-r--r--kontact/plugins/knotes/summarywidget.cpp6
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp12
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp10
-rw-r--r--kontact/plugins/kpilot/summarywidget.cpp2
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp2
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp10
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp2
-rw-r--r--kontact/plugins/weather/summarywidget.cpp2
-rw-r--r--kontact/src/aboutdialog.cpp4
-rw-r--r--kontact/src/iconsidepane.cpp6
-rw-r--r--kontact/src/mainwindow.cpp14
-rw-r--r--korganizer/koeditorattachments.cpp10
-rw-r--r--korganizer/koeditorattachments.h2
-rw-r--r--korganizer/kowhatsnextview.cpp12
-rw-r--r--korganizer/urihandler.cpp2
-rw-r--r--korn/boxcontaineritem.cpp4
-rw-r--r--korn/kornboxcfg.ui4
-rw-r--r--ktnef/gui/attachpropertydialog.cpp2
-rw-r--r--ktnef/gui/ktnefview.cpp2
-rw-r--r--libkcal/incidenceformatter.cpp22
-rw-r--r--libtdepim/addresseeemailselection.cpp4
-rw-r--r--libtdepim/addresseeselector.cpp4
-rw-r--r--libtdepim/addresseeview.cpp4
-rw-r--r--libtdepim/addressesdialog.cpp6
-rw-r--r--libtdepim/completionordereditor.cpp4
-rw-r--r--libtdepim/kscoringeditor.cpp12
-rw-r--r--libtdepim/ksubscription.cpp2
-rw-r--r--libtdepim/progressdialog.cpp2
-rw-r--r--tdeioslaves/imap4/mimeheader.cc4
-rw-r--r--tderesources/scalix/scalixadmin/mainwindow.cpp8
-rw-r--r--wizards/overviewpage.cpp2
108 files changed, 290 insertions, 290 deletions
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp
index bb37d26e0..f81bc1d7b 100644
--- a/akregator/src/addfeeddialog.cpp
+++ b/akregator/src/addfeeddialog.cpp
@@ -42,7 +42,7 @@ namespace Akregator {
AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name)
: AddFeedWidgetBase(parent, name)
{
- pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "package_network",KIcon::Desktop,KIcon::SizeHuge, KIcon::DefaultState, 0, true));
+ pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "package_network",TDEIcon::Desktop,TDEIcon::SizeHuge, TDEIcon::DefaultState, 0, true));
statusLabel->setText(TQString());
}
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 07507383f..3ec31e9e5 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -247,7 +247,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
m_listTabWidget->setViewMode(ListTabWidget::single);
m_feedListView = new NodeListView( this, "feedtree" );
- m_listTabWidget->addView(m_feedListView, i18n("Feeds"), TDEGlobal::iconLoader()->loadIcon("folder", KIcon::Small));
+ m_listTabWidget->addView(m_feedListView, i18n("Feeds"), TDEGlobal::iconLoader()->loadIcon("folder", TDEIcon::Small));
connect(m_feedListView, TQT_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&)));
@@ -256,7 +256,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
TreeNode*, Folder*)));
m_tagNodeListView = new NodeListView(this);
- m_listTabWidget->addView(m_tagNodeListView, i18n("Tags"), TDEGlobal::iconLoader()->loadIcon("rss_tag", KIcon::Small));
+ m_listTabWidget->addView(m_tagNodeListView, i18n("Tags"), TDEGlobal::iconLoader()->loadIcon("rss_tag", TDEIcon::Small));
connect(m_tagNodeListView, TQT_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&)));
diff --git a/akregator/src/feeditem.cpp b/akregator/src/feeditem.cpp
index 6571977e6..b2bb86bbc 100644
--- a/akregator/src/feeditem.cpp
+++ b/akregator/src/feeditem.cpp
@@ -84,12 +84,12 @@ void FeedItem::nodeChanged()
TQPixmap FeedItem::errorPixmap()
{
- return TDEGlobal::iconLoader()->loadIcon("error", KIcon::Small);
+ return TDEGlobal::iconLoader()->loadIcon("error", TDEIcon::Small);
}
TQPixmap FeedItem::defaultPixmap()
{
- return TDEGlobal::iconLoader()->loadIcon("txt", KIcon::Small);
+ return TDEGlobal::iconLoader()->loadIcon("txt", TDEIcon::Small);
}
void FeedItem::initialize(Feed* node)
diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp
index 2bb1cbfc0..6147f4d2a 100644
--- a/akregator/src/feedlistview.cpp
+++ b/akregator/src/feedlistview.cpp
@@ -892,8 +892,8 @@ void NodeListView::slotFeedFetchStarted(Feed* feed)
TreeNodeItem* item = findNodeItem(feed);
if (item)
{
- KIconEffect iconEffect;
- TQPixmap tempIcon = iconEffect.apply(feed->favicon(), KIcon::Small, KIcon::DisabledState);
+ TDEIconEffect iconEffect;
+ TQPixmap tempIcon = iconEffect.apply(feed->favicon(), TDEIcon::Small, TDEIcon::DisabledState);
item->setPixmap(0, tempIcon);
}
}
diff --git a/akregator/src/folderitem.cpp b/akregator/src/folderitem.cpp
index 166811853..eb77e245e 100644
--- a/akregator/src/folderitem.cpp
+++ b/akregator/src/folderitem.cpp
@@ -56,7 +56,7 @@ FolderItem::FolderItem(TDEListView* parent, TreeNodeItem* after, Folder* node) :
void FolderItem::initialize(Folder* node)
{
setOpen(node->isOpen());
- setPixmap ( 0, TDEGlobal::iconLoader()->loadIcon("folder", KIcon::Small) );
+ setPixmap ( 0, TDEGlobal::iconLoader()->loadIcon("folder", TDEIcon::Small) );
if (node)
setText(0, node->title());
}
diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp
index 58f6c2f78..9d2341866 100644
--- a/akregator/src/searchbar.cpp
+++ b/akregator/src/searchbar.cpp
@@ -84,7 +84,7 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name),
statusLabel->setText( i18n("Status:") );
d->searchCombo = new KComboBox(this, "searchcombo");
- TQPixmap iconAll = TDEGlobal::iconLoader()->loadIcon("exec", KIcon::Small);
+ TQPixmap iconAll = TDEGlobal::iconLoader()->loadIcon("exec", TDEIcon::Small);
TQPixmap iconNew(locate("data", "akregator/pics/kmmsgnew.png"));
TQPixmap iconUnread(locate("data", "akregator/pics/kmmsgunseen.png"));
TQPixmap iconKeep(locate("data", "akregator/pics/kmmsgflag.png"));
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index 6940acee1..d4f4bd4f1 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -316,7 +316,7 @@ void TabWidget::initiateDrag(int tab)
KURL::List lst;
lst.append( frame->part()->url() );
KURLDrag* drag = new KURLDrag( lst, this );
- drag->setPixmap( KMimeType::pixmapForURL( lst.first(), 0, KIcon::Small ) );
+ drag->setPixmap( KMimeType::pixmapForURL( lst.first(), 0, TDEIcon::Small ) );
drag->dragCopy();
}
}
diff --git a/akregator/src/tagnodeitem.cpp b/akregator/src/tagnodeitem.cpp
index 1152935c4..f5aa6eae3 100644
--- a/akregator/src/tagnodeitem.cpp
+++ b/akregator/src/tagnodeitem.cpp
@@ -62,13 +62,13 @@ void TagNodeItem::initialize(TagNode* node)
if (node)
{
setText(0, node->title());
- setPixmap ( 0, TDEGlobal::iconLoader()->loadIcon(node->icon(), KIcon::Small) );
+ setPixmap ( 0, TDEGlobal::iconLoader()->loadIcon(node->icon(), TDEIcon::Small) );
}
}
void TagNodeItem::nodeChanged()
{
- setPixmap ( 0, TDEGlobal::iconLoader()->loadIcon(node()->icon(), KIcon::Small));
+ setPixmap ( 0, TDEGlobal::iconLoader()->loadIcon(node()->icon(), TDEIcon::Small));
TreeNodeItem::nodeChanged();
}
diff --git a/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui
index e6b4c34be..b7f56db56 100644
--- a/akregator/src/tagpropertieswidgetbase.ui
+++ b/akregator/src/tagpropertieswidgetbase.ui
@@ -79,7 +79,7 @@
<cstring>iconButton</cstring>
</property>
</widget>
- <widget class="KIconButton">
+ <widget class="TDEIconButton">
<property name="name">
<cstring>iconButton</cstring>
</property>
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 093306f61..cdbec1626 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -63,7 +63,7 @@ TrayIcon::TrayIcon(TQWidget *parent, const char *name)
m_defaultIcon=KSystemTray::loadIcon("akregator");
TQPixmap m_unreadIcon=KSystemTray::loadIcon("akregator_empty");
m_lightIconImage=m_unreadIcon.convertToImage();
- KIconEffect::deSaturate(m_lightIconImage, 0.60);
+ TDEIconEffect::deSaturate(m_lightIconImage, 0.60);
setPixmap(m_defaultIcon);
TQToolTip::add(this, i18n("Akregator - RSS Feed Reader"));
}
@@ -167,7 +167,7 @@ void TrayIcon::slotSetUnread(int unread)
// overlay
TQImage overlayImg=m_lightIconImage.copy();
- KIconEffect::overlay(overlayImg, img);
+ TDEIconEffect::overlay(overlayImg, img);
TQPixmap icon;
icon.convertFromImage(overlayImg);
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index cb6e37a8f..c1c710d2a 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -59,7 +59,7 @@ using namespace Kleo;
static inline TQPixmap loadIcon( TQString s ) {
return TDEGlobal::instance()->iconLoader()
- ->loadIcon( s.replace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium );
+ ->loadIcon( s.replace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), TDEIcon::NoGroup, TDEIcon::SizeMedium );
}
static unsigned int num_components_with_options( const Kleo::CryptoConfig * config ) {
diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp
index 7c576aa86..029a5cc37 100644
--- a/certmanager/lib/ui/directoryserviceswidget.cpp
+++ b/certmanager/lib/ui/directoryserviceswidget.cpp
@@ -99,10 +99,10 @@ Kleo::DirectoryServicesWidget::DirectoryServicesWidget(
x500LV->setSorting( -1 );
// taken from kmail's configuredialog.cpp
- upButton->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) );
+ upButton->setIconSet( BarIconSet( "up", TDEIcon::SizeSmall ) );
upButton->setEnabled( false ); // b/c no item is selected yet
- downButton->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) );
+ downButton->setIconSet( BarIconSet( "down", TDEIcon::SizeSmall ) );
downButton->setEnabled( false ); // b/c no item is selected yet
}
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index b785137d7..2aaf84768 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -396,7 +396,7 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
le->setText( initialQuery );
TQToolButton *clearButton = new TQToolButton( page );
clearButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet(
- TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
+ TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", TDEIcon::Small, 0 ) );
hlay->addWidget( clearButton );
hlay->addWidget( new TQLabel( le, i18n("&Search for:"), page ) );
hlay->addWidget( le, 1 );
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index c97493d31..5c7c44bd8 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -77,7 +77,7 @@ Kleo::PassphraseDialog::PassphraseDialog( const TQString & msg, const TQString &
TQHBoxLayout * hlay = new TQHBoxLayout( w, 0, spacingHint() );
TQLabel * label = new TQLabel( w );
- label->setPixmap( DesktopIcon( "pgp-keys", KIcon::SizeMedium ) );
+ label->setPixmap( DesktopIcon( "pgp-keys", TDEIcon::SizeMedium ) );
hlay->addWidget( label, 0, AlignTop );
TQVBoxLayout * vlay = new TQVBoxLayout( hlay ); // inherits spacing
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 8cffb0c32..8c98da740 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -157,8 +157,8 @@ void AddresseeEditorWidget::setupTab1()
// Person icon
label = new TQLabel( tab1 );
- label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop,
- KIcon::SizeMedium ) );
+ label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop,
+ TDEIcon::SizeMedium ) );
layout->addMultiCellWidget( label, 0, 1, 0, 0 );
// First name
@@ -213,7 +213,7 @@ void AddresseeEditorWidget::setupTab1()
// Phone numbers (upper right)
label = new TQLabel( tab1 );
label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "kaddressbook",
- KIcon::Desktop, KIcon::SizeMedium ) );
+ TDEIcon::Desktop, TDEIcon::SizeMedium ) );
layout->addMultiCellWidget( label, 0, 1, 3, 3 );
mPhoneEditWidget = new PhoneEditWidget( tab1 );
@@ -226,8 +226,8 @@ void AddresseeEditorWidget::setupTab1()
//////////////////////////////////////
// Addresses (lower left)
label = new TQLabel( tab1 );
- label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop,
- KIcon::SizeMedium ) );
+ label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "kfm_home", TDEIcon::Desktop,
+ TDEIcon::SizeMedium ) );
layout->addMultiCellWidget( label, 5, 6, 0, 0 );
mAddressEditWidget = new AddressEditWidget( tab1 );
@@ -237,8 +237,8 @@ void AddresseeEditorWidget::setupTab1()
//////////////////////////////////////
// Email / Web (lower right)
label = new TQLabel( tab1 );
- label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop,
- KIcon::SizeMedium ) );
+ label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "email", TDEIcon::Desktop,
+ TDEIcon::SizeMedium ) );
layout->addMultiCellWidget( label, 5, 6, 3, 3 );
mEmailWidget = new EmailEditWidget( tab1 );
@@ -252,8 +252,8 @@ void AddresseeEditorWidget::setupTab1()
TQHBoxLayout *homePageLayout = new TQHBoxLayout( 0, 11, 7 );
label = new TQLabel( tab1 );
- label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop,
- KIcon::SizeMedium ) );
+ label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "homepage", TDEIcon::Desktop,
+ TDEIcon::SizeMedium ) );
homePageLayout->addWidget( label );
label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 );
@@ -325,8 +325,8 @@ void AddresseeEditorWidget::setupTab2()
// Department
label = new TQLabel( tab2 );
- label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop,
- KIcon::SizeMedium ) );
+ label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "folder", TDEIcon::Desktop,
+ TDEIcon::SizeMedium ) );
layout->addMultiCellWidget( label, 0, 1, 0, 0 );
label = new TQLabel( i18n( "Department:" ), tab2 );
@@ -384,8 +384,8 @@ void AddresseeEditorWidget::setupTab2()
// Personal info
label = new TQLabel( tab2 );
- label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop,
- KIcon::SizeMedium ) );
+ label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop,
+ TDEIcon::SizeMedium ) );
layout->addMultiCellWidget( label, 4, 5, 0, 0 );
label = new TQLabel( i18n( "Nickname:" ), tab2 );
diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp
index 3fc16142e..3d50f730e 100644
--- a/kaddressbook/distributionlistentryview.cpp
+++ b/kaddressbook/distributionlistentryview.cpp
@@ -105,7 +105,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis
TQPixmap pixmap;
pixmap.convertFromImage( m_entry.addressee.photo().data() );
- m_imageLabel->setPixmap( pixmap.isNull() ? TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) : pixmap );
+ m_imageLabel->setPixmap( pixmap.isNull() ? TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop ) : pixmap );
m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>" ).arg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) );
m_distListLabel->setURL( m_list.name() );
m_distListLabel->setText( m_list.name() );
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index 3534bcdb3..d812c4803 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -64,7 +64,7 @@ class ResourceItem : public TQCheckListItem
mResourceIdentifier()
{
setOn( resource->isActive() );
- setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) );
+ setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", TDEIcon::Small ) );
mChecked = isOn();
}
@@ -77,7 +77,7 @@ class ResourceItem : public TQCheckListItem
{
KPIM::ResourceABC* res = dynamic_cast<KPIM::ResourceABC *>( mResource );
setOn( res->subresourceActive( mResourceIdentifier ) );
- setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) );
+ setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", TDEIcon::Small ) );
mChecked = isOn();
}
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 27333bf99..8bad2129e 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -55,7 +55,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name
label = new TQLabel( this );
label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "package_network",
- KIcon::Desktop, KIcon::SizeMedium ) );
+ TDEIcon::Desktop, TDEIcon::SizeMedium ) );
label->setAlignment( TQt::AlignTop );
topLayout->addMultiCellWidget( label, 0, 3, 0, 0 );
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 9ba87d46c..a302f1a29 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -144,7 +144,7 @@ void ImageButton::startDrag()
void ImageButton::updateGUI()
{
if ( mPicture.data().isNull() )
- setPixmap( TDEGlobal::iconLoader()->iconPath( "personal", KIcon::Desktop ) );
+ setPixmap( TDEGlobal::iconLoader()->iconPath( "personal", TDEIcon::Desktop ) );
else
setPixmap( mPicture.data() );
}
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index edd805cae..3225b0a2e 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -275,11 +275,11 @@ void LDAPOptionsWidget::initGUI()
TQVBox* upDownBox = new TQVBox( hBox );
upDownBox->setSpacing( 6 );
mUpButton = new TQToolButton( upDownBox, "mUpButton" );
- mUpButton->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) );
+ mUpButton->setIconSet( BarIconSet( "up", TDEIcon::SizeSmall ) );
mUpButton->setEnabled( false ); // b/c no item is selected yet
mDownButton = new TQToolButton( upDownBox, "mDownButton" );
- mDownButton->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) );
+ mDownButton->setIconSet( BarIconSet( "down", TDEIcon::SizeSmall ) );
mDownButton->setEnabled( false ); // b/c no item is selected yet
TQWidget* spacer = new TQWidget( upDownBox );
diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp
index f7beaf202..9a110e258 100644
--- a/kaddressbook/soundwidget.cpp
+++ b/kaddressbook/soundwidget.cpp
@@ -47,7 +47,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n
TQLabel *label = new TQLabel( this );
label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "multimedia",
- KIcon::Desktop, KIcon::SizeMedium ) );
+ TDEIcon::Desktop, TDEIcon::SizeMedium ) );
label->setAlignment( TQt::AlignTop );
topLayout->addMultiCellWidget( label, 0, 1, 0, 0 );
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index f2153f828..5dfe4084b 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -49,7 +49,7 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *paren
// Add the first page, the attributes
TQVBox *page = addPage( i18n( "Fields" ), TQString(),
TDEGlobal::iconLoader()->loadIcon( "view_detailed",
- KIcon::Panel ) );
+ TDEIcon::Panel ) );
// Add the select fields page
mFieldsPage = new ViewConfigureFieldsPage( addressBook(), page );
@@ -57,7 +57,7 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *paren
// Add the second page, the filter selection
page = addPage( i18n( "Default Filter" ), TQString(),
TDEGlobal::iconLoader()->loadIcon( "filter",
- KIcon::Panel ) );
+ TDEIcon::Panel ) );
mFilterPage = new ViewConfigureFilterPage( page );
}
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 51ed14d87..77608225d 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -497,7 +497,7 @@ void ViewManager::startDrag()
}
}
- drag->setPixmap( TDEGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) );
+ drag->setPixmap( TDEGlobal::iconLoader()->loadIcon( "vcard", TDEIcon::Desktop ) );
drag->dragCopy();
}
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index 2551be98e..4e478e255 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -47,7 +47,7 @@ ConfigureTableViewWidget::ConfigureTableViewWidget( KABC::AddressBook *ab,
{
TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(),
TDEGlobal::iconLoader()->loadIcon( "looknfeel",
- KIcon::Panel ) );
+ TDEIcon::Panel ) );
mPage = new LookAndFeelPage( page );
}
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 60bae788c..e5f4ab259 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -60,7 +60,7 @@ extern "C" {
}
AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name )
- : KIconView( parent, name )
+ : TDEIconView( parent, name )
{
setSelectionMode( TQIconView::Extended );
setResizeMode( TQIconView::Adjust );
@@ -68,7 +68,7 @@ AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name )
setGridX( 100 );
setItemsMovable( false );
setSorting( true, true );
- setMode( KIconView::Select );
+ setMode( TDEIconView::Select );
connect( this, TQT_SIGNAL( dropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ),
this, TQT_SLOT( itemDropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ) );
@@ -92,12 +92,12 @@ TQDragObject *AddresseeIconView::dragObject()
}
-class AddresseeIconViewItem : public KIconViewItem
+class AddresseeIconViewItem : public TDEIconViewItem
{
public:
AddresseeIconViewItem( const KABC::Field::List&, KABC::AddressBook *doc,
const KABC::Addressee &addr, TQIconView *parent )
- : KIconViewItem( parent ), mDocument( doc ), mAddressee( addr )
+ : TDEIconViewItem( parent ), mDocument( doc ), mAddressee( addr )
{
refresh();
}
@@ -112,7 +112,7 @@ class AddresseeIconViewItem : public KIconViewItem
setText( mAddressee.givenName() + " " + mAddressee.familyName() );
TQPixmap icon;
- TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) );
+ TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", TDEIcon::Desktop ) );
KABC::Picture pic = mAddressee.photo();
if ( pic.data().isNull() )
pic = mAddressee.logo();
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index 56984cfc5..4cf585b35 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -36,7 +36,7 @@ class AddresseeIconViewItem;
namespace KABC { class AddressBook; }
/** This is an example kaddressbook view that is implemented using
-* KIconView. This view is not the most useful view, but it displays
+* TDEIconView. This view is not the most useful view, but it displays
* how simple implementing a new view can be.
*/
class KAddressBookIconView : public KAddressBookView
@@ -73,7 +73,7 @@ class KAddressBookIconView : public KAddressBookView
};
-class AddresseeIconView : public KIconView
+class AddresseeIconView : public TDEIconView
{
Q_OBJECT
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index bbc6303ba..297e5149c 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -559,11 +559,11 @@ void MessageWin::initView()
}
#endif
- KIconLoader iconLoader;
+ TDEIconLoader iconLoader;
if (mKMailSerialNumber)
{
// KMail button
- TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1("kmail"), KIcon::MainToolbar);
+ TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1("kmail"), TDEIcon::MainToolbar);
mKMailButton = new TQPushButton(topWidget);
mKMailButton->setPixmap(pixmap);
mKMailButton->setFixedSize(mKMailButton->sizeHint());
@@ -576,7 +576,7 @@ void MessageWin::initView()
mKMailButton = 0;
// KAlarm button
- TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1(kapp->aboutData()->appName()), KIcon::MainToolbar);
+ TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1(kapp->aboutData()->appName()), TDEIcon::MainToolbar);
mKAlarmButton = new TQPushButton(topWidget);
mKAlarmButton->setPixmap(pixmap);
mKAlarmButton->setFixedSize(mKAlarmButton->sizeHint());
diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp
index 76dfb8008..c9af96308 100644
--- a/kandy/src/kandyprefsdialog.cpp
+++ b/kandy/src/kandyprefsdialog.cpp
@@ -75,7 +75,7 @@ KandyPrefsDialog::~KandyPrefsDialog()
void KandyPrefsDialog::setupSerialTab()
{
TQFrame *topFrame = addPage(i18n("Serial Interface"),0,
- DesktopIcon("connect_no",KIcon::SizeMedium));
+ DesktopIcon("connect_no",TDEIcon::SizeMedium));
TQGridLayout *topLayout = new TQGridLayout(topFrame,6,2);
topLayout->setSpacing(spacingHint());
@@ -114,7 +114,7 @@ void KandyPrefsDialog::setupSerialTab()
void KandyPrefsDialog::setupAddressbookTab()
{
TQFrame *topFrame = addPage(i18n("Address Book"), 0,
- DesktopIcon("kaddressbook", KIcon::SizeMedium));
+ DesktopIcon("kaddressbook", TDEIcon::SizeMedium));
TQGridLayout *topLayout = new TQGridLayout(topFrame, 13, 4);
topLayout->setSpacing(spacingHint());
@@ -351,7 +351,7 @@ void KandyPrefsDialog::setupAddressbookTab()
void KandyPrefsDialog::setupWindowsTab()
{
TQFrame *topFrame = addPage(i18n("Windows"),0,
- DesktopIcon("window_list",KIcon::SizeMedium));
+ DesktopIcon("window_list",TDEIcon::SizeMedium));
TQGridLayout *topLayout = new TQGridLayout(topFrame,6,2);
topLayout->setSpacing(spacingHint());
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index 005243ce4..1ccf46a3f 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -46,7 +46,7 @@ Preferences *Preferences::instance( const TQString &icsfile )
void Preferences::makeBehaviorPage()
{
- TQPixmap icon = SmallIcon( "kcmsystem", KIcon::SizeMedium);
+ TQPixmap icon = SmallIcon( "kcmsystem", TDEIcon::SizeMedium);
TQFrame* behaviorPage = addPage( i18n("Behavior"), i18n("Behavior Settings"),
icon );
@@ -74,7 +74,7 @@ void Preferences::makeBehaviorPage()
void Preferences::makeDisplayPage()
{
- TQPixmap icon = SmallIcon( "viewmag", KIcon::SizeMedium );
+ TQPixmap icon = SmallIcon( "viewmag", TDEIcon::SizeMedium );
TQFrame* displayPage = addPage( i18n("Display"), i18n("Display Settings"),
icon );
@@ -104,7 +104,7 @@ void Preferences::makeDisplayPage()
void Preferences::makeStoragePage()
{
- TQPixmap icon = SmallIcon( "kfm", KIcon::SizeMedium );
+ TQPixmap icon = SmallIcon( "kfm", TDEIcon::SizeMedium );
TQFrame* storagePage = addPage( i18n("Storage"), i18n("Storage Settings"),
icon );
diff --git a/karm/task.cpp b/karm/task.cpp
index 7d84bcd2c..20e9c5118 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -62,13 +62,13 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime,
if (icons == 0) {
icons = new TQPtrVector<TQPixmap>(8);
- KIconLoader kil("karm"); // always load icons from the KArm application
+ TDEIconLoader kil("karm"); // always load icons from the KArm application
for (int i=0; i<8; i++)
{
TQPixmap *icon = new TQPixmap();
TQString name;
name.sprintf("watch-%d.xpm",i);
- *icon = kil.loadIcon( name, KIcon::User );
+ *icon = kil.loadIcon( name, TDEIcon::User );
icons->insert(i,icon);
}
}
diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp
index 1abf46d70..1a3c8a7da 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort.cpp
@@ -55,7 +55,7 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem,
connect(_itemTextEdit, TQT_SIGNAL(returnPressed ()),
this, TQT_SLOT(textEdited()));
- _iconloader = new KIconLoader();
+ _iconloader = new TDEIconLoader();
initMenu();
@@ -112,7 +112,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
mw->addToolBar(_toolbar);
- // KIconLoader* iconloader = new KIconLoader("kgantt");
+ // TDEIconLoader* iconloader = new TDEIconLoader("kgantt");
_toolbar->insertButton("ganttSelect.png", 0,
@@ -126,7 +126,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
/*
select all items
*/
- TQPixmap pix = _iconloader->loadIcon("ganttSelecttask.png", KIcon::Toolbar , 16 );
+ TQPixmap pix = _iconloader->loadIcon("ganttSelecttask.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttSelecttask.png not found !\n");
selectMenu->insertItem(pix, i18n("Select All"), TQT_TQOBJECT(this), TQT_SLOT(selectAll()) );
@@ -134,7 +134,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
/*
unselect all items
*/
- pix = _iconloader->loadIcon("ganttUnselecttask", KIcon::Toolbar , 16 );
+ pix = _iconloader->loadIcon("ganttUnselecttask", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttUnselecttask.png not found !\n");
selectMenu->insertItem(pix, i18n("Unselect All"), TQT_TQOBJECT(this), TQT_SLOT(unselectAll()) );
@@ -150,16 +150,16 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
TDEPopupMenu* zoomMenu = new TDEPopupMenu(_toolbar);
- pix = _iconloader->loadIcon("viewmag.png", KIcon::Toolbar , 16 );
+ pix = _iconloader->loadIcon("viewmag.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag.png not found !\n");
zoomMenu->insertItem(pix, i18n("Zoom All"), TQT_TQOBJECT(this), TQT_SLOT(zoomAll()) );
zoomMenu->insertSeparator();
- pix = _iconloader->loadIcon("viewmag+.png", KIcon::Toolbar , 16 );
+ pix = _iconloader->loadIcon("viewmag+.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag+.png not found !\n");
zoomMenu->insertItem(pix, i18n("Zoom In +"), TQT_TQOBJECT(this), TQT_SLOT(zoomIn()) );
- pix = _iconloader->loadIcon("viewmag-.png", KIcon::Toolbar , 16 );
+ pix = _iconloader->loadIcon("viewmag-.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag-.png not found !\n");
zoomMenu->insertItem(pix, i18n("Zoom Out -"), TQT_TQOBJECT(this), TQT_SLOT(zoomOut()) );
@@ -189,17 +189,17 @@ xQGanttBarViewPort::initMenu()
_selectMenu = new TDEPopupMenu(_menu);
- TQPixmap pix = _iconloader->loadIcon("ganttSelect.png", KIcon::Toolbar , 16 );
+ TQPixmap pix = _iconloader->loadIcon("ganttSelect.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttSelect.png not found !\n");
_selectMenu->insertItem(pix, i18n("Select Mode"), this, TQT_SLOT(setSelect()));
_selectMenu->insertSeparator();
- pix = _iconloader->loadIcon("ganttSelecttask.png", KIcon::Toolbar , 16 );
+ pix = _iconloader->loadIcon("ganttSelecttask.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttSelecttask.png not found !\n");
_selectMenu->insertItem(pix, i18n("Select All"), this, TQT_SLOT(selectAll()) );
- pix = _iconloader->loadIcon("ganttUnselecttask", KIcon::Toolbar , 16 );
+ pix = _iconloader->loadIcon("ganttUnselecttask", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttUnselecttask.png not found !\n");
_selectMenu->insertItem(pix, i18n("Unselect All"), this, TQT_SLOT(unselectAll()) );
@@ -212,7 +212,7 @@ xQGanttBarViewPort::initMenu()
TDEPopupMenu* _zoomMenu = new TDEPopupMenu(_menu);
- pix = _iconloader->loadIcon("viewmag.png", KIcon::Toolbar , 16 );
+ pix = _iconloader->loadIcon("viewmag.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag.png not found !\n");
_zoomMenu->insertItem(i18n("Zoom Mode"), this, TQT_SLOT(setZoom()) );
@@ -221,23 +221,23 @@ xQGanttBarViewPort::initMenu()
_zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQT_SLOT(zoomAll()) );
_zoomMenu->insertSeparator();
- pix = _iconloader->loadIcon("viewmag+.png", KIcon::Toolbar , 16 );
+ pix = _iconloader->loadIcon("viewmag+.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag+.png not found !\n");
_zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQT_SLOT(zoomIn()) );
- pix = _iconloader->loadIcon("viewmag-.png", KIcon::Toolbar , 16 );
+ pix = _iconloader->loadIcon("viewmag-.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag-.png not found !\n");
_zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQT_SLOT(zoomOut()) );
_menu->insertItem( "Zoom", _zoomMenu);
- pix = _iconloader->loadIcon("move.png", KIcon::Toolbar , 16 );
+ pix = _iconloader->loadIcon("move.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("move.png not found !\n");
_menu->insertItem(pix, i18n("Move Mode"), this, TQT_SLOT(setMove()) );
_menu->insertSeparator();
- pix = _iconloader->loadIcon("configure.png", KIcon::Toolbar , 16 );
+ pix = _iconloader->loadIcon("configure.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("configure.png not found !\n");
_menu->insertItem(pix, i18n("Configure Gantt..."), _parent, TQT_SLOT(showConfig()));
diff --git a/kgantt/kgantt/xQGanttBarViewPort.h b/kgantt/kgantt/xQGanttBarViewPort.h
index 66f44be98..c78ffd5a7 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.h
+++ b/kgantt/kgantt/xQGanttBarViewPort.h
@@ -272,7 +272,7 @@ private:
TDEPopupMenu* _menu;
TDEPopupMenu* _selectMenu;
- KIconLoader* _iconloader;
+ TDEIconLoader* _iconloader;
TDEToolBar* _toolbar;
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index b337fbbaf..674af0b18 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -94,12 +94,12 @@ void AboutPage::handleUrl( const KURL &url )
TQString AboutPage::htmlText() const
{
- KIconLoader *iconloader = TDEGlobal::iconLoader();
- int iconSize = iconloader->currentSize( KIcon::Desktop );
+ TDEIconLoader *iconloader = TDEGlobal::iconLoader();
+ int iconSize = iconloader->currentSize( TDEIcon::Desktop );
- TQString handbook_icon_path = iconloader->iconPath( "contents2", KIcon::Desktop );
- TQString html_icon_path = iconloader->iconPath( "html", KIcon::Desktop );
- TQString wizard_icon_path = iconloader->iconPath( "wizard", KIcon::Desktop );
+ TQString handbook_icon_path = iconloader->iconPath( "contents2", TDEIcon::Desktop );
+ TQString html_icon_path = iconloader->iconPath( "html", TDEIcon::Desktop );
+ TQString wizard_icon_path = iconloader->iconPath( "wizard", TDEIcon::Desktop );
TQString info = i18n( "<h2 style='text-align:center; margin-top: 0px;'>Welcome to KitchenSync %1</h2>"
"<p>%1</p>"
diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp
index 4159fd1b6..3be369642 100644
--- a/kitchensync/src/groupconfig.cpp
+++ b/kitchensync/src/groupconfig.cpp
@@ -57,7 +57,7 @@ GroupConfig::GroupConfig( TQWidget *parent )
nameLayout->setMargin( 4 );
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary",
- KIcon::Desktop );
+ TDEIcon::Desktop );
TQLabel *iconLabel = new TQLabel( titleFrame );
iconLabel->setPixmap( icon );
@@ -92,7 +92,7 @@ GroupConfig::GroupConfig( TQWidget *parent )
buttonLayout->addStretch( 1 );
- icon = TDEGlobal::iconLoader()->loadIcon( "bookmark", KIcon::Desktop );
+ icon = TDEGlobal::iconLoader()->loadIcon( "bookmark", TDEIcon::Desktop );
TQFrame *page = mMemberView->addPage( i18n("Group"),
i18n("General Group Settings"), icon );
TQBoxLayout *pageLayout = new TQVBoxLayout( page );
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index 023f91a01..e9fa56213 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -67,7 +67,7 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
static TQPixmap icon;
if ( icon.isNull() )
- icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary", KIcon::Desktop );
+ icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary", TDEIcon::Desktop );
mIcon = new TQLabel( hbox );
mIcon->setPixmap( icon );
diff --git a/kitchensync/src/memberinfo.cpp b/kitchensync/src/memberinfo.cpp
index b93721ac6..39bb0098a 100644
--- a/kitchensync/src/memberinfo.cpp
+++ b/kitchensync/src/memberinfo.cpp
@@ -32,12 +32,12 @@ MemberInfo::MemberInfo( const QSync::Member &member )
TQPixmap MemberInfo::smallIcon() const
{
- return TDEGlobal::iconLoader()->loadIcon( iconName(), KIcon::Small );
+ return TDEGlobal::iconLoader()->loadIcon( iconName(), TDEIcon::Small );
}
TQPixmap MemberInfo::desktopIcon() const
{
- return TDEGlobal::iconLoader()->loadIcon( iconName(), KIcon::Desktop );
+ return TDEGlobal::iconLoader()->loadIcon( iconName(), TDEIcon::Desktop );
}
TQString MemberInfo::iconName() const
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index b50027f43..a88689d3c 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -41,7 +41,7 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
TQLabel *icon = new TQLabel( this );
- icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) );
+ icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( iconName, TDEIcon::Desktop ) );
icon->setFixedSize( icon->sizeHint() );
TQLabel *name = new TQLabel( plugin.longName(), this );
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index b1856bee5..47184b730 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -908,7 +908,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
button->setFixedSize( 22, 22 );
button->setIconSet(
- TDEGlobal::iconLoader()->loadIconSet( "reload", KIcon::Small, 0 ) );
+ TDEGlobal::iconLoader()->loadIconSet( "reload", TDEIcon::Small, 0 ) );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadNamespaces()) );
TQWhatsThis::add( button,
i18n("Reload the namespaces from the server. This overwrites any changes.") );
@@ -922,7 +922,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
mImap.personalNS->setReadOnly( true );
mImap.editPNS = new TQToolButton( listbox );
mImap.editPNS->setIconSet(
- TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) );
+ TDEGlobal::iconLoader()->loadIconSet( "edit", TDEIcon::Small, 0 ) );
mImap.editPNS->setAutoRaise( true );
mImap.editPNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
mImap.editPNS->setFixedSize( 22, 22 );
@@ -934,7 +934,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
mImap.otherUsersNS->setReadOnly( true );
mImap.editONS = new TQToolButton( listbox );
mImap.editONS->setIconSet(
- TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) );
+ TDEGlobal::iconLoader()->loadIconSet( "edit", TDEIcon::Small, 0 ) );
mImap.editONS->setAutoRaise( true );
mImap.editONS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
mImap.editONS->setFixedSize( 22, 22 );
@@ -946,7 +946,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
mImap.sharedNS->setReadOnly( true );
mImap.editSNS = new TQToolButton( listbox );
mImap.editSNS->setIconSet(
- TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) );
+ TDEGlobal::iconLoader()->loadIconSet( "edit", TDEIcon::Small, 0 ) );
mImap.editSNS->setAutoRaise( true );
mImap.editSNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
mImap.editSNS->setFixedSize( 22, 22 );
@@ -2305,7 +2305,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
edit->setText( it.key() );
TQToolButton* button = new TQToolButton( grid );
button->setIconSet(
- TDEGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small, 0 ) );
+ TDEGlobal::iconLoader()->loadIconSet( "editdelete", TDEIcon::Small, 0 ) );
button->setAutoRaise( true );
button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
button->setFixedSize( 22, 22 );
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 596e8c6bd..439393d36 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -55,7 +55,7 @@ class KMMsgTagDesc;
class TDEListBox;
class KColorCombo;
class TDEFontRequester;
-class KIconButton;
+class TDEIconButton;
class KKeyButton;
class TQSpinBox;
class KComboBox;
diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp
index 30b3dcf92..bbbd0aec7 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -60,8 +60,8 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name )
TQFont f = TDEGlobalSettings::fixedFont();
mEdit->setFont( f );
- mAdd->setIconSet( BarIconSet( "add", KIcon::SizeSmall ) );
- mRemove->setIconSet( BarIconSet( "remove", KIcon::SizeSmall ) );
+ mAdd->setIconSet( BarIconSet( "add", TDEIcon::SizeSmall ) );
+ mRemove->setIconSet( BarIconSet( "remove", TDEIcon::SizeSmall ) );
mList->setColumnWidth( 0, 50 );
mList->setColumnWidth( 1, 100 );
@@ -92,9 +92,9 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name )
connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
this, TQT_SLOT( slotShortcutCaptured( const TDEShortcut& ) ) );
- mReplyPix = KIconLoader().loadIcon( "mail_reply", KIcon::Small );
- mReplyAllPix = KIconLoader().loadIcon( "mail_replyall", KIcon::Small );
- mForwardPix = KIconLoader().loadIcon( "mail_forward", KIcon::Small );
+ mReplyPix = TDEIconLoader().loadIcon( "mail_reply", TDEIcon::Small );
+ mReplyAllPix = TDEIconLoader().loadIcon( "mail_replyall", TDEIcon::Small );
+ mForwardPix = TDEIconLoader().loadIcon( "mail_forward", TDEIcon::Small );
mType->clear();
mType->insertItem( TQPixmap(), i18n( "Message->", "Universal" ), TUniversal );
diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui
index c21b2d4b7..1428a54b5 100644
--- a/kmail/folderpropertiesdialog.ui
+++ b/kmail/folderpropertiesdialog.ui
@@ -125,7 +125,7 @@
<cstring>mNormalIconButton</cstring>
</property>
</widget>
- <widget class="KIconButton" row="2" column="3">
+ <widget class="TDEIconButton" row="2" column="3">
<property name="name">
<cstring>mNormalIconButton</cstring>
</property>
@@ -173,7 +173,7 @@
</size>
</property>
</spacer>
- <widget class="KIconButton" row="2" column="6">
+ <widget class="TDEIconButton" row="2" column="6">
<property name="name">
<cstring>mUnreadIconButton</cstring>
</property>
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index 177e8caf1..f2f7ec162 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -52,7 +52,7 @@ FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree )
edit->setReadOnly( true );
TQToolButton* button = new TQToolButton( this );
- button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "folder", KIcon::Small, 0 ) );
+ button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "folder", TDEIcon::Small, 0 ) );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenDialog()) );
setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp
index f5fa9f9a5..493fa6c54 100644
--- a/kmail/kmfawidgets.cpp
+++ b/kmail/kmfawidgets.cpp
@@ -34,7 +34,7 @@ KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* pare
mLineEdit->setName( "addressEdit" );
hbl->addWidget( mLineEdit, 1 /*stretch*/ );
mBtn = new TQPushButton( TQString() ,this );
- mBtn->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) );
+ mBtn->setPixmap( BarIcon( "contents", TDEIcon::SizeSmall ) );
mBtn->setFixedHeight( mLineEdit->sizeHint().height() );
TQToolTip::add( mBtn, i18n( "Open Address Book" ) );
hbl->addWidget( mBtn );
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index 304219b91..9441b63d0 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -248,9 +248,9 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
hbox );
mFilterActionLabel->setEnabled( false );
- mFilterActionIconButton = new KIconButton( hbox );
+ mFilterActionIconButton = new TDEIconButton( hbox );
mFilterActionLabel->setBuddy( mFilterActionIconButton );
- mFilterActionIconButton->setIconType( KIcon::NoGroup, KIcon::Any, true );
+ mFilterActionIconButton->setIconType( TDEIcon::NoGroup, TDEIcon::Any, true );
mFilterActionIconButton->setIconSize( 16 );
mFilterActionIconButton->setIcon( "gear" );
mFilterActionIconButton->setEnabled( false );
@@ -594,19 +594,19 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
hb->setSpacing(4);
mBtnTop = new KPushButton( TQString(), hb );
mBtnTop->setAutoRepeat( true );
- mBtnTop->setIconSet( BarIconSet( "top", KIcon::SizeSmall ) );
+ mBtnTop->setIconSet( BarIconSet( "top", TDEIcon::SizeSmall ) );
mBtnTop->setMinimumSize( mBtnTop->sizeHint() * 1.2 );
mBtnUp = new KPushButton( TQString(), hb );
mBtnUp->setAutoRepeat( true );
- mBtnUp->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) );
+ mBtnUp->setIconSet( BarIconSet( "up", TDEIcon::SizeSmall ) );
mBtnUp->setMinimumSize( mBtnUp->sizeHint() * 1.2 );
mBtnDown = new KPushButton( TQString(), hb );
mBtnDown->setAutoRepeat( true );
- mBtnDown->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) );
+ mBtnDown->setIconSet( BarIconSet( "down", TDEIcon::SizeSmall ) );
mBtnDown->setMinimumSize( mBtnDown->sizeHint() * 1.2 );
mBtnBot = new KPushButton( TQString(), hb );
mBtnBot->setAutoRepeat( true );
- mBtnBot->setIconSet( BarIconSet( "bottom", KIcon::SizeSmall ) );
+ mBtnBot->setIconSet( BarIconSet( "bottom", TDEIcon::SizeSmall ) );
mBtnBot->setMinimumSize( mBtnBot->sizeHint() * 1.2 );
TQToolTip::add( mBtnTop, i18n("Top") );
TQToolTip::add( mBtnUp, i18n("Up") );
@@ -621,13 +621,13 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
hb = new TQHBox(this);
hb->setSpacing(4);
mBtnNew = new TQPushButton( TQString(), hb );
- mBtnNew->setPixmap( BarIcon( "filenew", KIcon::SizeSmall ) );
+ mBtnNew->setPixmap( BarIcon( "filenew", TDEIcon::SizeSmall ) );
mBtnNew->setMinimumSize( mBtnNew->sizeHint() * 1.2 );
mBtnCopy = new TQPushButton( TQString(), hb );
- mBtnCopy->setIconSet( BarIconSet( "editcopy", KIcon::SizeSmall ) );
+ mBtnCopy->setIconSet( BarIconSet( "editcopy", TDEIcon::SizeSmall ) );
mBtnCopy->setMinimumSize( mBtnCopy->sizeHint() * 1.2 );
mBtnDelete = new TQPushButton( TQString(), hb );
- mBtnDelete->setIconSet( BarIconSet( "editdelete", KIcon::SizeSmall ) );
+ mBtnDelete->setIconSet( BarIconSet( "editdelete", TDEIcon::SizeSmall ) );
mBtnDelete->setMinimumSize( mBtnDelete->sizeHint() * 1.2 );
mBtnRename = new TQPushButton( i18n("Rename..."), hb );
TQToolTip::add( mBtnNew, i18n("New") );
diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h
index 3801d8be9..e2d414b96 100644
--- a/kmail/kmfilterdlg.h
+++ b/kmail/kmfilterdlg.h
@@ -28,7 +28,7 @@ class TQPushButton;
class TQComboBox;
class TQWidgetStack;
class TQCheckBox;
-class KIconButton;
+class TDEIconButton;
class KKeyButton;
class TDEListView;
@@ -414,7 +414,7 @@ protected:
TQCheckBox *mConfigureShortcut;
TQCheckBox *mConfigureToolbar;
TQLabel *mFilterActionLabel;
- KIconButton *mFilterActionIconButton;
+ TDEIconButton *mFilterActionIconButton;
KKeyButton *mKeyButton;
TQGroupBox *mAdvOptsGroup;
TQVGroupBox *mGlobalsBox;
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index f2a32f6ea..4bbfa8e66 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -362,9 +362,9 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
mNormalIconLabel->setEnabled( false );
ihl->addWidget( mNormalIconLabel );
- mNormalIconButton = new KIconButton( this );
+ mNormalIconButton = new TDEIconButton( this );
mNormalIconLabel->setBuddy( mNormalIconButton );
- mNormalIconButton->setIconType( KIcon::NoGroup , KIcon::Any, true );
+ mNormalIconButton->setIconType( TDEIcon::NoGroup , TDEIcon::Any, true );
mNormalIconButton->setIconSize( 16 );
mNormalIconButton->setStrictIconSize( true );
mNormalIconButton->setFixedSize( 28, 28 );
@@ -377,9 +377,9 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
mUnreadIconLabel->setEnabled( false );
ihl->addWidget( mUnreadIconLabel );
- mUnreadIconButton = new KIconButton( this );
+ mUnreadIconButton = new TDEIconButton( this );
mUnreadIconLabel->setBuddy( mUnreadIconButton );
- mUnreadIconButton->setIconType( KIcon::NoGroup, KIcon::Any, true );
+ mUnreadIconButton->setIconType( TDEIcon::NoGroup, TDEIcon::Any, true );
mUnreadIconButton->setIconSize( 16 );
mUnreadIconButton->setStrictIconSize( true );
mUnreadIconButton->setFixedSize( 28, 28 );
@@ -789,7 +789,7 @@ bool FolderDiaGeneralTab::save()
return true;
}
-void FolderDiaGeneralTab::slotChangeIcon( TQString icon ) // can't use a const-ref here, due to KIconButton's signal
+void FolderDiaGeneralTab::slotChangeIcon( TQString icon ) // can't use a const-ref here, due to TDEIconButton's signal
{
mUnreadIconButton->setIcon( icon );
}
diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index 95f7b31bf..764ea8978 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -45,7 +45,7 @@ class KMFolder;
class KMFolderTreeItem;
class KMFolderDir;
class KIntNumInput;
-class KIconButton;
+class TDEIconButton;
class KEditListBox;
namespace KPIM { class IdentityCombo; }
class KMFolderDialog;
@@ -141,9 +141,9 @@ private:
TQCheckBox *mAlarmsBlockedCheckBox;
TQCheckBox *mSharedSeenFlagsCheckBox;
TQLabel *mNormalIconLabel;
- KIconButton *mNormalIconButton;
+ TDEIconButton *mNormalIconButton;
TQLabel *mUnreadIconLabel;
- KIconButton *mUnreadIconButton;
+ TDEIconButton *mUnreadIconButton;
TQCheckBox *mIconsCheckBox;
TQCheckBox *mNewMailCheckBox;
TQCheckBox *mNotifyOnNewMailCheckBox;
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 067568a1c..ae340e7fe 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -149,12 +149,12 @@ TQPixmap KMFolderTreeItem::normalIcon(int size) const
if (mFolder && mFolder->useCustomIcons() ) {
icon = mFolder->normalIconPath();
}
- KIconLoader * il = TDEGlobal::instance()->iconLoader();
- TQPixmap pm = il->loadIcon( icon, KIcon::Small, size,
- KIcon::DefaultState, 0, true );
+ TDEIconLoader * il = TDEGlobal::instance()->iconLoader();
+ TQPixmap pm = il->loadIcon( icon, TDEIcon::Small, size,
+ TDEIcon::DefaultState, 0, true );
if ( mFolder && pm.isNull() ) {
- pm = il->loadIcon( mFolder->normalIconPath(), KIcon::Small, size,
- KIcon::DefaultState, 0, true );
+ pm = il->loadIcon( mFolder->normalIconPath(), TDEIcon::Small, size,
+ TDEIcon::DefaultState, 0, true );
}
return pm;
@@ -170,25 +170,25 @@ TQPixmap KMFolderTreeItem::unreadIcon(int size) const
kmkernel->folderIsDraftOrOutbox( mFolder ) )
pm = normalIcon( size );
- KIconLoader * il = TDEGlobal::instance()->iconLoader();
+ TDEIconLoader * il = TDEGlobal::instance()->iconLoader();
if ( mFolder && mFolder->useCustomIcons() ) {
- pm = il->loadIcon( mFolder->unreadIconPath(), KIcon::Small, size,
- KIcon::DefaultState, 0, true );
+ pm = il->loadIcon( mFolder->unreadIconPath(), TDEIcon::Small, size,
+ TDEIcon::DefaultState, 0, true );
if ( pm.isNull() )
- pm = il->loadIcon( mFolder->normalIconPath(), KIcon::Small, size,
- KIcon::DefaultState, 0, true );
+ pm = il->loadIcon( mFolder->normalIconPath(), TDEIcon::Small, size,
+ TDEIcon::DefaultState, 0, true );
}
if ( pm.isNull() ) {
if ( mFolder && mFolder->noContent() ) {
- pm = il->loadIcon( "folder_grey_open", KIcon::Small, size,
- KIcon::DefaultState, 0, true );
+ pm = il->loadIcon( "folder_grey_open", TDEIcon::Small, size,
+ TDEIcon::DefaultState, 0, true );
} else {
if( kmkernel->iCalIface().isResourceFolder( mFolder ) )
pm = il->loadIcon( kmkernel->iCalIface().folderPixmap( type() ),
- KIcon::Small, size, KIcon::DefaultState, 0, true );
+ TDEIcon::Small, size, TDEIcon::DefaultState, 0, true );
if ( pm.isNull() )
- pm = il->loadIcon( "folder_open", KIcon::Small, size,
- KIcon::DefaultState, 0, true );
+ pm = il->loadIcon( "folder_open", TDEIcon::Small, size,
+ TDEIcon::DefaultState, 0, true );
}
}
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 990918564..432c02131 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -2399,9 +2399,9 @@ void KMHeaders::contentsMouseMoveEvent( TQMouseEvent* e )
// Set pixmap
TQPixmap pixmap;
if( count == 1 )
- pixmap = TQPixmap( DesktopIcon("message", KIcon::SizeSmall) );
+ pixmap = TQPixmap( DesktopIcon("message", TDEIcon::SizeSmall) );
else
- pixmap = TQPixmap( DesktopIcon("tdemultiple", KIcon::SizeSmall) );
+ pixmap = TQPixmap( DesktopIcon("tdemultiple", TDEIcon::SizeSmall) );
// Calculate hotspot (as in Konqueror)
if( !pixmap.isNull() ) {
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 3b17b16dd..29d4b8f7a 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -370,7 +370,7 @@ void KMMimePartTreeItem::setIconAndTextForType( const TQString & mime )
} else {
KMimeType::Ptr mtp = KMimeType::mimeType( mimetype );
setText( 1, (mtp && !mtp->comment().isEmpty()) ? mtp->comment() : mimetype );
- setPixmap( 0, mtp ? mtp->pixmap( KIcon::Small) : SmallIcon("unknown") );
+ setPixmap( 0, mtp ? mtp->pixmap( TDEIcon::Small) : SmallIcon("unknown") );
}
}
diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h
index b49b5a30e..4994800b3 100644
--- a/kmail/kmmsgpart.h
+++ b/kmail/kmmsgpart.h
@@ -159,7 +159,7 @@ public:
/** Tries to find a good icon for the 'Content-Type' by scanning
the installed mimelnk files. Returns the found icon. If no matching
icon is found, the one for application/octet-stream is returned. */
- TQString iconName( int size = KIcon::Desktop ) const;
+ TQString iconName( int size = TDEIcon::Desktop ) const;
/** Get or set the 'Content-Transfer-Encoding' header field
The member functions that involve enumerated types (ints)
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index dc0815f81..dd92e8634 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -323,7 +323,7 @@ void KMMsgPartDialog::slotMimeTypeChanged( const TQString & mimeType ) {
TQString tmp = mimeType; // get rid of const'ness
if ( mMimeType->validator() && mMimeType->validator()->validate( tmp, dummy )
== TQValidator::Acceptable )
- mIcon->setPixmap( KMimeType::mimeType( mimeType )->pixmap( KIcon::Desktop ) );
+ mIcon->setPixmap( KMimeType::mimeType( mimeType )->pixmap( TDEIcon::Desktop ) );
else
mIcon->setPixmap( DesktopIcon("unknown") );
}
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index 2473c8712..c96a576d2 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -251,7 +251,7 @@ void insertLibraryCataloguesAndIcons() {
};
TDELocale * l = TDEGlobal::locale();
- KIconLoader * il = TDEGlobal::iconLoader();
+ TDEIconLoader * il = TDEGlobal::iconLoader();
for ( unsigned int i = 0 ; i < sizeof catalogues / sizeof *catalogues ; ++i ) {
l->insertCatalogue( catalogues[i] );
il->addAppDir( catalogues[i] );
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 1eb9f467f..2a3bd975a 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -218,7 +218,7 @@ void KMSystemTray::updateCount()
// "This function is slow because it involves transformation to a TQImage,
// non-trivial computations and a transformation back to a TQBitmap."). Then
// I have to convert the resulting TQPixmap to a TQImage in order to overlay
- // the light KMail icon with the number (because KIconEffect::overlay only
+ // the light KMail icon with the number (because TDEIconEffect::overlay only
// works with TQImage). Finally the resulting TQImage has to be converted
// back to a TQPixmap.
// That's a lot of work for overlaying the KMail icon with the number of
@@ -235,7 +235,7 @@ void KMSystemTray::updateCount()
// Overlay the light KMail icon with the number image
TQImage iconWithNumberImage = mLightIconImage.copy();
- KIconEffect::overlay( iconWithNumberImage, numberImage );
+ TDEIconEffect::overlay( iconWithNumberImage, numberImage );
TQPixmap iconWithNumber;
iconWithNumber.convertFromImage( iconWithNumberImage );
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index 7051542bb..a5c862b91 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -733,7 +733,7 @@ namespace KMail {
void ObjectTreeParser::writeDecryptionInProgressBlock() {
assert( mReader );
// PENDING(marc) find an animated icon here:
- //const TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small );
+ //const TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( "decrypted", TDEIcon::Small );
const TQString decryptedData = i18n("Encrypted data not shown");
PartMetaData messagePart;
messagePart.isDecryptable = true;
@@ -749,7 +749,7 @@ void ObjectTreeParser::writeDecryptionInProgressBlock() {
void ObjectTreeParser::writeDeferredDecryptionBlock() {
assert( mReader );
- const TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small );
+ const TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( "decrypted", TDEIcon::Small );
const TQString decryptedData =
"<div style=\"font-size:large; text-align:center;padding-top:20pt;\">" +
i18n("This message is encrypted.") +
@@ -2010,7 +2010,7 @@ bool ObjectTreeParser::processApplicationMsTnefSubtype( partNode *node, ProcessR
TQString href = "file:" + KURL::encode_string( dir + TQDir::separator() + att->name() );
KMimeType::Ptr mimeType = KMimeType::mimeType( att->mimeTag() );
- TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( mimeType->icon( TQString(), false ), KIcon::Desktop );
+ TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( mimeType->icon( TQString(), false ), TDEIcon::Desktop );
htmlWriter()->queue( "<div><a href=\"" + href + "\"><img src=\"" +
iconName + "\" border=\"0\" style=\"max-width: 100%\">" + label +
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index 9bfe46b90..576a1c179 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -752,7 +752,7 @@ TQString partNode::asHREF( const TQString &place ) const
partNode::AttachmentDisplayInfo partNode::attachmentDisplayInfo() const
{
AttachmentDisplayInfo info;
- info.icon = msgPart().iconName( KIcon::Small );
+ info.icon = msgPart().iconName( TDEIcon::Small );
info.label = msgPart().name().stripWhiteSpace();
if ( info.label.isEmpty() )
info.label = msgPart().fileName();
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index 3ae2ad81d..2e851272e 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -63,7 +63,7 @@ void RecipientItem::setDistributionList( KPIM::DistributionList &list )
{
mDistributionList = list;
- mIcon = TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small );
+ mIcon = TDEGlobal::iconLoader()->loadIcon( "tdmconfig", TDEIcon::Small );
mName = list.name();
mKey = list.name();
@@ -80,7 +80,7 @@ void RecipientItem::setDistributionList( KABC::DistributionList *list )
{
mDistributionList = list;
- mIcon = TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small );
+ mIcon = TDEGlobal::iconLoader()->loadIcon( "tdmconfig", TDEIcon::Small );
mName = list->name();
mKey = list->name();
@@ -105,7 +105,7 @@ void RecipientItem::setAddressee( const KABC::Addressee &a,
if ( !img.isNull() )
mIcon = img.smoothScale( 20, 20, TQ_ScaleMin );
else
- mIcon = TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Small );
+ mIcon = TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Small );
mName = mAddressee.realName();
mKey = mAddressee.realName() + '|' + mEmail;
@@ -373,7 +373,7 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent )
TQToolButton *button = new TQToolButton( this );
button->setIconSet( TDEGlobal::iconLoader()->loadIconSet(
- TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
+ TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", TDEIcon::Small, 0 ) );
searchLayout->addWidget( button );
connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( resetSearch() ) );
diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp
index 4cd26be0c..c6585a5a9 100644
--- a/kmail/redirectdialog.cpp
+++ b/kmail/redirectdialog.cpp
@@ -67,7 +67,7 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name,
mEditTo->setMinimumWidth( 300 );
mBtnTo = new TQPushButton( TQString(), hbox, "toBtn" );
- mBtnTo->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) );
+ mBtnTo->setPixmap( BarIcon( "contents", TDEIcon::SizeSmall ) );
mBtnTo->setMinimumSize( mBtnTo->sizeHint() * 1.2 );
TQToolTip::add( mBtnTo, i18n("Use the Address-Selection Dialog") );
TQWhatsThis::add( mBtnTo, i18n("This button opens a separate dialog "
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index e5c009516..796cc8c0c 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -93,9 +93,9 @@ class MatchListView : public TDEListView
TQPixmap pixmap;
if( mailList.count() == 1 )
- pixmap = TQPixmap( DesktopIcon("message", KIcon::SizeSmall) );
+ pixmap = TQPixmap( DesktopIcon("message", TDEIcon::SizeSmall) );
else
- pixmap = TQPixmap( DesktopIcon("tdemultiple", KIcon::SizeSmall) );
+ pixmap = TQPixmap( DesktopIcon("tdemultiple", TDEIcon::SizeSmall) );
d->setPixmap( pixmap );
return d;
diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp
index 8520af848..cf58f98ce 100644
--- a/kmail/simplestringlisteditor.cpp
+++ b/kmail/simplestringlisteditor.cpp
@@ -122,7 +122,7 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent,
kdDebug(5006) << "Are you sure you want to use an Up button "
"without a Down button??" << endl;
mUpButton = new KPushButton( TQString(), this );
- mUpButton->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) );
+ mUpButton->setIconSet( BarIconSet( "up", TDEIcon::SizeSmall ) );
mUpButton->setAutoDefault( false );
mUpButton->setEnabled( false ); // no selection yet
vlay->addWidget( mUpButton );
@@ -135,7 +135,7 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent,
kdDebug(5006) << "Are you sure you want to use a Down button "
"without an Up button??" << endl;
mDownButton = new KPushButton( TQString(), this );
- mDownButton->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) );
+ mDownButton->setIconSet( BarIconSet( "down", TDEIcon::SizeSmall ) );
mDownButton->setAutoDefault( false );
mDownButton->setEnabled( false ); // no selection yet
vlay->addWidget( mDownButton );
diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp
index 1627cec62..7ce10ce1d 100644
--- a/kmail/urlhandlermanager.cpp
+++ b/kmail/urlhandlermanager.cpp
@@ -654,7 +654,7 @@ namespace {
KURL file = window->tempFileUrlFromPartNode( node ).path();
if ( !file.isEmpty() ) {
- TQString icon = node->msgPart().iconName( KIcon::Small );
+ TQString icon = node->msgPart().iconName( TDEIcon::Small );
KURLDrag* urlDrag = new KURLDrag( file, window );
if ( !icon.isEmpty() ) {
TQPixmap iconMap( icon );
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp
index 5e8ac37c1..70ec163bf 100644
--- a/kmobile/kmobile.cpp
+++ b/kmobile/kmobile.cpp
@@ -278,7 +278,7 @@ void KMobile::addDevice()
TQString iconName = ptr->icon();
if (iconName.isEmpty())
iconName = KMOBILE_ICON_UNKNOWN;
- TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(iconName, KIcon::Desktop );
+ TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(iconName, TDEIcon::Desktop );
TQIconViewItem *item;
item = new TQIconViewItem( dialog->iconView, ptr->name(), pm );
diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp
index 8c249b768..aa44cb937 100644
--- a/kmobile/kmobileitem.cpp
+++ b/kmobile/kmobileitem.cpp
@@ -98,7 +98,7 @@ bool KMobileItem::configLoad(int idx)
TQPixmap KMobileItem::getIcon() const
{
- return TDEGlobal::instance()->iconLoader()->loadIcon(m_iconName, KIcon::Desktop );
+ return TDEGlobal::instance()->iconLoader()->loadIcon(m_iconName, TDEIcon::Desktop );
}
TQString KMobileItem::config_SectionName(int idx) const
diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp
index a7cef5b8e..e5324e9ed 100644
--- a/kmobile/systemtray.cpp
+++ b/kmobile/systemtray.cpp
@@ -38,7 +38,7 @@
SystemTray::SystemTray(TDEMainWindow *parent, const char *name) : KSystemTray(parent, name)
{
- m_appPix = TDEGlobal::instance()->iconLoader()->loadIcon("kmobile", KIcon::Small);
+ m_appPix = TDEGlobal::instance()->iconLoader()->loadIcon("kmobile", TDEIcon::Small);
setPixmap(m_appPix);
setToolTip();
@@ -72,7 +72,7 @@ void SystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
for (unsigned int no=0; no<list.count(); no++) {
TQString devName = list[no];
TQString iconName = main->mainView()->iconFileName(devName);
- TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(iconName, KIcon::Small);
+ TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(iconName, TDEIcon::Small);
menu->insertItem(pm, devName, SYSTEMTRAY_STARTID+no, 3+no);
menu->connectItem(SYSTEMTRAY_STARTID+no, this, TQT_SLOT(menuItemSelected()));
}
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index dfe1a7cc5..8e8c10e85 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -883,7 +883,7 @@ void ArticleWidget::displayAttachment( KMime::Content *att, int partNum )
TQCString mimetype = ct->mimeType();
KPIM::kAsciiToLower( mimetype.data() );
TQString iconName = KMimeType::mimeType( mimetype )->icon( TQString(), false );
- TQString iconFile = TDEGlobal::instance()->iconLoader()->iconPath( iconName, KIcon::Desktop );
+ TQString iconFile = TDEGlobal::instance()->iconLoader()->iconPath( iconName, TDEIcon::Desktop );
html += "<div><a href=\"" + href + "\"><img src=\"" +
iconFile + "\" border=\"0\">" + label +
"</a></div><div>" + comment + "</div><br>";
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index 7214f2505..b0b909138 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -510,21 +510,21 @@ void KNConfig::Appearance::recreateLVIcons()
TQPixmap tempPix = UserIcon("greyball");
TQImage tempImg=tempPix.convertToImage();
- KIconEffect::colorize(tempImg, readArticleColor(), 1.0);
+ TDEIconEffect::colorize(tempImg, readArticleColor(), 1.0);
i_cons[greyBall].convertFromImage(tempImg);
tempImg=tempPix.convertToImage();
- KIconEffect::colorize(tempImg, unreadArticleColor(), 1.0);
+ TDEIconEffect::colorize(tempImg, unreadArticleColor(), 1.0);
i_cons[redBall].convertFromImage(tempImg);
tempPix = UserIcon("greyballchk");
tempImg=tempPix.convertToImage();
- KIconEffect::colorize(tempImg, readArticleColor(), 1.0);
+ TDEIconEffect::colorize(tempImg, readArticleColor(), 1.0);
i_cons[greyBallChkd].convertFromImage(tempImg);
tempImg=tempPix.convertToImage();
- KIconEffect::colorize(tempImg, unreadArticleColor(), 1.0);
+ TDEIconEffect::colorize(tempImg, unreadArticleColor(), 1.0);
i_cons[redBallChkd].convertFromImage(tempImg);
}
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index c8f849eaf..2ae1e1f01 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -1706,7 +1706,7 @@ KNConfig::FilterListWidget::FilterListWidget( TQWidget *p, const char *n ) :
topL->setRowStretch(11,1);
a_ctive = SmallIcon("filter",16);
- d_isabled = SmallIcon("filter",16,KIcon::DisabledState);
+ d_isabled = SmallIcon("filter",16,TDEIcon::DisabledState);
load();
diff --git a/knotes/ChangeLog b/knotes/ChangeLog
index dfe1fc951..1ad18cac9 100644
--- a/knotes/ChangeLog
+++ b/knotes/ChangeLog
@@ -486,7 +486,7 @@ ChangeLog for KNotes
outdated config files
* fixed some bugs I found while rewriting the config stuff
* newNote and newNoteFromClipboard now take a "const QString& name"
- * new subdirectory "icons" to make KIconLoader apply its effects to all
+ * new subdirectory "icons" to make TDEIconLoader apply its effects to all
KNotes icons
2002/10/17 Michael Brade <brade@kde.org>
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index c19b1ec10..07ab136fd 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -359,9 +359,9 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
slotUpdateKeepAboveBelow();
// HACK: update the icon color - again after showing the note, to make kicker aware of the new colors
- KIconEffect effect;
- TQPixmap icon = effect.apply( kapp->icon(), KIconEffect::Colorize, 1, m_config->bgColor(), false );
- TQPixmap miniIcon = effect.apply( kapp->miniIcon(), KIconEffect::Colorize, 1, m_config->bgColor(), false );
+ TDEIconEffect effect;
+ TQPixmap icon = effect.apply( kapp->icon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false );
+ TQPixmap miniIcon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false );
KWin::setIcons( winId(), icon, miniIcon );
}
@@ -552,9 +552,9 @@ void KNote::setColor( const TQColor& fg, const TQColor& bg )
m_button->setPalette( darker );
// update the icon color
- KIconEffect effect;
- TQPixmap icon = effect.apply( kapp->icon(), KIconEffect::Colorize, 1, bg, false );
- TQPixmap miniIcon = effect.apply( kapp->miniIcon(), KIconEffect::Colorize, 1, bg, false );
+ TDEIconEffect effect;
+ TQPixmap icon = effect.apply( kapp->icon(), TDEIconEffect::Colorize, 1, bg, false );
+ TQPixmap miniIcon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1, bg, false );
KWin::setIcons( winId(), icon, miniIcon );
// set the color for the selection used to highlight the find stuff
diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp
index d3e571c02..006b1e9c5 100644
--- a/knotes/knotebutton.cpp
+++ b/knotes/knotebutton.cpp
@@ -39,7 +39,7 @@ KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *na
m_flat = true;
if ( !icon.isEmpty() )
- setIconSet( TDEGlobal::iconLoader()->loadIconSet( icon, KIcon::Small, 10 ) );
+ setIconSet( TDEGlobal::iconLoader()->loadIconSet( icon, TDEIcon::Small, 10 ) );
}
KNoteButton::~KNoteButton()
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index c31be4803..f3b2ae158 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -707,8 +707,8 @@ void KNotesApp::updateNoteActions()
TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()),
(TQObject *)0,
it.current()->noteId().utf8() );
- KIconEffect effect;
- TQPixmap icon = effect.apply( kapp->miniIcon(), KIconEffect::Colorize, 1,
+ TDEIconEffect effect;
+ TQPixmap icon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1,
it.current()->paletteBackgroundColor(), false );
action->setIconSet( icon );
m_noteActions.append( action );
diff --git a/kontact/TODO b/kontact/TODO
index a24083c30..4ff91f8e9 100644
--- a/kontact/TODO
+++ b/kontact/TODO
@@ -14,7 +14,7 @@ UNTIL KDE 3.2
- move plugins to respective apps for code sharing(?)
- Summary (what's next) view (slueppken) (done)
- Basic groupware functionality (Exchange 2k and Kolab)
-- make the headerWidget look nicer (we might use KIconLoader
+- make the headerWidget look nicer (we might use TDEIconLoader
for larger icons) (slueppken) (done)
- make all parts use the InfoExtension (done)
- make KCMultiDialog not crash when non-existent desktop-file
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index a67c0a594..95d8ad75c 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -48,8 +48,8 @@ SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const c
{
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
- TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_mail", KIcon::Desktop,
- KIcon::SizeMedium );
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_mail", TDEIcon::Desktop,
+ TDEIcon::SizeMedium );
TQWidget *header = createHeader(this, icon, i18n("E-Mail"));
mLayout = new TQGridLayout( 1, 3, 3 );
diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h
index b83c677f3..cda762eba 100644
--- a/kontact/plugins/knotes/knotes_part.h
+++ b/kontact/plugins/knotes/knotes_part.h
@@ -33,7 +33,7 @@
#include "knotes/KNotesIface.h"
-class KIconView;
+class TDEIconView;
class TQIconViewItem;
class KNotesIconViewItem;
class KNoteTip;
@@ -91,7 +91,7 @@ class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface
void printSelectedNotes();
private:
- KIconView *mNotesView;
+ TDEIconView *mNotesView;
KNoteTip *mNoteTip;
KNoteEditDlg *mNoteEditDlg;
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 8e11e4f15..ab386d1a9 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -57,19 +57,19 @@
#include "knotes/knoteedit.h"
-class KNotesIconViewItem : public KIconViewItem
+class KNotesIconViewItem : public TDEIconViewItem
{
public:
- KNotesIconViewItem( KIconView *parent, KCal::Journal *journal )
- : KIconViewItem( parent ),
+ KNotesIconViewItem( TDEIconView *parent, KCal::Journal *journal )
+ : TDEIconViewItem( parent ),
mJournal( journal )
{
setRenameEnabled( true );
- KIconEffect effect;
+ TDEIconEffect effect;
TQColor color( journal->customProperty( "KNotes", "BgColor" ) );
- TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "knotes", KIcon::Desktop );
- icon = effect.apply( icon, KIconEffect::Colorize, 1, color, false );
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "knotes", TDEIcon::Desktop );
+ icon = effect.apply( icon, TDEIconEffect::Colorize, 1, color, false );
setPixmap( icon );
setText( journal->summary() );
}
@@ -81,7 +81,7 @@ class KNotesIconViewItem : public KIconViewItem
virtual void setText( const TQString& text )
{
- KIconViewItem::setText( text );
+ TDEIconViewItem::setText( text );
mJournal->setSummary( text );
}
@@ -90,7 +90,7 @@ class KNotesIconViewItem : public KIconViewItem
};
-class KNotesIconView : public KIconView
+class KNotesIconView : public TDEIconView
{
protected:
TQDragObject* dragObject()
@@ -101,7 +101,7 @@ class KNotesIconView : public KIconView
selectedItems.append( static_cast<KNotesIconViewItem *>( it ) );
}
if ( selectedItems.count() != 1 )
- return KIconView::dragObject();
+ return TDEIconView::dragObject();
KCal::CalendarLocal cal( KPimPrefs::timezone() );
KCal::Incidence *i = selectedItems.first()->journal()->clone();
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index 0c6435341..054c0f91e 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -40,7 +40,7 @@
#include "knotes_part_p.h"
-KNoteTip::KNoteTip( KIconView *parent )
+KNoteTip::KNoteTip( TDEIconView *parent )
: TQFrame( 0, 0, WX11BypassWM | // this will make Seli happy >:-P
WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop ),
mFilter( false ),
diff --git a/kontact/plugins/knotes/knotetip.h b/kontact/plugins/knotes/knotetip.h
index 221720224..9a4e0fcc5 100644
--- a/kontact/plugins/knotes/knotetip.h
+++ b/kontact/plugins/knotes/knotetip.h
@@ -35,13 +35,13 @@
#include <tqframe.h>
class TQTextEdit;
-class KIconView;
+class TDEIconView;
class KNotesIconViewItem;
class KNoteTip : public TQFrame
{
public:
- KNoteTip( KIconView *parent );
+ KNoteTip( TDEIconView *parent );
~KNoteTip();
void setNote( KNotesIconViewItem *item );
@@ -59,7 +59,7 @@ class KNoteTip : public TQFrame
private:
bool mFilter;
- KIconView *mView;
+ TDEIconView *mView;
KNotesIconViewItem *mNoteIVI;
TQTextEdit *mPreview;
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index dd5c78ebe..c0a92617c 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -51,7 +51,7 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin,
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_notes",
- KIcon::Desktop, KIcon::SizeMedium );
+ TDEIcon::Desktop, TDEIcon::SizeMedium );
TQWidget* header = createHeader( this, icon, i18n( "Notes" ) );
mainLayout->addWidget( header );
@@ -80,10 +80,10 @@ void KNotesSummaryWidget::updateView()
label->deleteLater();
mLabels.clear();
- KIconLoader loader( "knotes" );
+ TDEIconLoader loader( "knotes" );
int counter = 0;
- TQPixmap pm = loader.loadIcon( "knotes", KIcon::Small );
+ TQPixmap pm = loader.loadIcon( "knotes", TDEIcon::Small );
KCal::Journal::List::Iterator it;
if ( mNotes.count() ) {
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 02e3eb106..16aba3778 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -57,7 +57,7 @@ SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_date",
- KIcon::Desktop, KIcon::SizeMedium );
+ TDEIcon::Desktop, TDEIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "Calendar" ) );
mainLayout->addWidget( header );
@@ -83,7 +83,7 @@ void SummaryWidget::updateView()
mLabels.clear();
mLabels.setAutoDelete( false );
- KIconLoader loader( "tdepim" );
+ TDEIconLoader loader( "tdepim" );
TDEConfig config( "kcmkorgsummaryrc" );
@@ -92,9 +92,9 @@ void SummaryWidget::updateView()
TQLabel *label = 0;
int counter = 0;
- TQPixmap pm = loader.loadIcon( "appointment", KIcon::Small );
- TQPixmap pmb = loader.loadIcon( "calendarbirthday", KIcon::Small );
- TQPixmap pma = loader.loadIcon( "calendaranniversary", KIcon::Small );
+ TQPixmap pm = loader.loadIcon( "appointment", TDEIcon::Small );
+ TQPixmap pmb = loader.loadIcon( "calendarbirthday", TDEIcon::Small );
+ TQPixmap pma = loader.loadIcon( "calendaranniversary", TDEIcon::Small );
TQDate dt;
TQDate currentDate = TQDate::currentDate();
@@ -270,7 +270,7 @@ void SummaryWidget::popupMenu( const TQString &uid )
TDEPopupMenu popup( this );
TQToolTip::remove( this );
popup.insertItem( i18n( "&Edit Appointment..." ), 0 );
- popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", TDEIcon::Small),
i18n( "&Delete Appointment" ), 1 );
switch ( popup.exec( TQCursor::pos() ) ) {
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 3089c9876..16aced52d 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -59,7 +59,7 @@ TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin,
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_todo",
- KIcon::Desktop, KIcon::SizeMedium );
+ TDEIcon::Desktop, TDEIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "To-do" ) );
mainLayout->addWidget( header );
@@ -89,7 +89,7 @@ void TodoSummaryWidget::updateView()
config.setGroup( "Todo" );
bool showAllTodos = config.readBoolEntry( "ShowAllTodos", false );
- KIconLoader loader( "tdepim" );
+ TDEIconLoader loader( "tdepim" );
TQLabel *label = 0;
int counter = 0;
@@ -97,7 +97,7 @@ void TodoSummaryWidget::updateView()
TQDate currentDate = TQDate::currentDate();
KCal::Todo::List todos = mCalendar->todos();
if ( todos.count() > 0 ) {
- TQPixmap pm = loader.loadIcon( "todo", KIcon::Small );
+ TQPixmap pm = loader.loadIcon( "todo", TDEIcon::Small );
KCal::Todo::List::ConstIterator it;
for ( it = todos.begin(); it != todos.end(); ++it ) {
KCal::Todo *todo = *it;
@@ -227,11 +227,11 @@ void TodoSummaryWidget::popupMenu( const TQString &uid )
TDEPopupMenu popup( this );
TQToolTip::remove( this );
popup.insertItem( i18n( "&Edit To-do..." ), 0 );
- popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", TDEIcon::Small),
i18n( "&Delete To-do" ), 1 );
KCal::Todo *todo = mCalendar->todo( uid );
if ( !todo->isCompleted() ) {
- popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "checkedbox", KIcon::Small),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "checkedbox", TDEIcon::Small),
i18n( "&Mark To-do Completed" ), 2 );
}
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 8a659a6e7..42b69f4f6 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -59,7 +59,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mLayout = new TQGridLayout( this, 2, 3, 3, 3 );
int row=0;
- TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kpilot", KIcon::Desktop, KIcon::SizeMedium );
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kpilot", TDEIcon::Desktop, TDEIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "KPilot Configuration" ) );
mLayout->addMultiCellWidget( header, row,row, 0,3 );
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index f0f7d7460..db83e3de0 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -48,7 +48,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
TQVBoxLayout *vlay = new TQVBoxLayout( this, 3, 3 );
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_news",
- KIcon::Desktop, KIcon::SizeMedium );
+ TDEIcon::Desktop, TDEIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "News Feeds" ) );
vlay->addWidget( header );
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index e55f19359..80e0f1465 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -85,7 +85,7 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "cookie",
- KIcon::Desktop, KIcon::SizeMedium );
+ TDEIcon::Desktop, TDEIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "Special Dates" ) );
mainLayout->addWidget(header);
@@ -219,7 +219,7 @@ void SDSummaryWidget::updateView()
mLabels.clear();
mLabels.setAutoDelete( false );
- KIconLoader loader( "tdepim" );
+ TDEIconLoader loader( "tdepim" );
KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true );
TQValueList<SDEntry> dates;
@@ -425,7 +425,7 @@ void SDSummaryWidget::updateView()
label = new TQLabel( this );
if ( icon_img.isNull() ) {
label->setPixmap( TDEGlobal::iconLoader()->loadIcon( icon_name,
- KIcon::Small ) );
+ TDEIcon::Small ) );
} else {
label->setPixmap( icon_img );
}
@@ -575,9 +575,9 @@ void SDSummaryWidget::viewContact( const TQString &uid )
void SDSummaryWidget::popupMenu( const TQString &uid )
{
TDEPopupMenu popup( this );
- popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kmail", KIcon::Small ),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kmail", TDEIcon::Small ),
i18n( "Send &Mail" ), 0 );
- popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Small ),
+ popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", TDEIcon::Small ),
i18n( "View &Contact" ), 1 );
switch ( popup.exec( TQCursor::pos() ) ) {
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index e1e3c7f00..b43af7ffb 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -55,7 +55,7 @@ class PluginItem : public TQCheckListItem
: TQCheckListItem( parent, TQString(), TQCheckListItem::CheckBox ),
mInfo( info )
{
- TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small );
+ TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( mInfo->icon(), TDEIcon::Small );
setPixmap( 0, pm );
}
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 2b114ca24..64d3d2691 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -45,7 +45,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mLayout = new TQVBoxLayout( this, 3, 3 );
mLayout->setAlignment( TQt::AlignTop );
- TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium );
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kweather", TDEIcon::Desktop, TDEIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) );
mLayout->addWidget( header );
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index db40083a6..faa2a2447 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -66,7 +66,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
const TDEAboutData *about )
{
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( icon,
- KIcon::Desktop, 48 );
+ TDEIcon::Desktop, 48 );
TQFrame *topFrame = addPage( title, TQString(), pixmap );
@@ -161,7 +161,7 @@ void AboutDialog::addLicenseText( const TDEAboutData *about )
return;
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( "signature",
- KIcon::Desktop, 48 );
+ TDEIcon::Desktop, 48 );
TQString title = i18n( "%1 License" ).arg( about->programName() );
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index 6c490880c..581a91b96 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -112,10 +112,10 @@ void EntryItem::reloadPixmap()
int size = (int)navigator()->viewMode();
if ( size != 0 )
mPixmap = TDEGlobal::iconLoader()->loadIcon( mPlugin->icon(),
- KIcon::Desktop, size,
+ TDEIcon::Desktop, size,
mPlugin->disabled() ?
- KIcon::DisabledState
- : KIcon::DefaultState);
+ TDEIcon::DisabledState
+ : TDEIcon::DefaultState);
else
mPixmap = TQPixmap();
}
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 8c82fa5f9..eff2d9089 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -433,13 +433,13 @@ void MainWindow::slotLoadProfile( const TQString& id )
cfg->sync();
Prefs::self()->readConfig();
applyMainWindowSettings( cfg );
- KIconTheme::reconfigure();
+ TDEIconTheme::reconfigure();
const WId wid = winId();
KIPC::sendMessage( KIPC::PaletteChanged, wid );
KIPC::sendMessage( KIPC::FontChanged, wid );
KIPC::sendMessage( KIPC::StyleChanged, wid );
KIPC::sendMessage( KIPC::SettingsChanged, wid );
- for ( int i = 0; i < KIcon::LastGroup; ++i )
+ for ( int i = 0; i < TDEIcon::LastGroup; ++i )
KIPC::sendMessage( KIPC::IconChanged, wid, i );
loadSettings();
@@ -1160,12 +1160,12 @@ void MainWindow::slotShowStatusMsg( const TQString &msg )
TQString MainWindow::introductionString()
{
- KIconLoader *iconloader = TDEGlobal::iconLoader();
- int iconSize = iconloader->currentSize( KIcon::Desktop );
+ TDEIconLoader *iconloader = TDEGlobal::iconLoader();
+ int iconSize = iconloader->currentSize( TDEIcon::Desktop );
- TQString handbook_icon_path = iconloader->iconPath( "contents2", KIcon::Desktop );
- TQString html_icon_path = iconloader->iconPath( "html", KIcon::Desktop );
- TQString wizard_icon_path = iconloader->iconPath( "wizard", KIcon::Desktop );
+ TQString handbook_icon_path = iconloader->iconPath( "contents2", TDEIcon::Desktop );
+ TQString html_icon_path = iconloader->iconPath( "html", TDEIcon::Desktop );
+ TQString wizard_icon_path = iconloader->iconPath( "wizard", TDEIcon::Desktop );
TQString info = i18n( "<h2 style='text-align:center; margin-top: 0px;'>Welcome to Kontact %1</h2>"
"<p>%1</p>"
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index f25b9c115..b7aff0a28 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -70,11 +70,11 @@
#include <cassert>
#include <cstdlib>
-class AttachmentListItem : public KIconViewItem
+class AttachmentListItem : public TDEIconViewItem
{
public:
AttachmentListItem( KCal::Attachment*att, TQIconView *parent ) :
- KIconViewItem( parent )
+ TDEIconViewItem( parent )
{
if ( att ) {
mAttachment = new KCal::Attachment( *att );
@@ -132,7 +132,7 @@ class AttachmentListItem : public KIconViewItem
static TQPixmap icon( KMimeType::Ptr mimeType, const TQString &uri )
{
TQString iconStr = mimeType->icon( uri, false );
- return TDEGlobal::iconLoader()->loadIcon( iconStr, KIcon::Small );
+ return TDEGlobal::iconLoader()->loadIcon( iconStr, TDEIcon::Small );
}
void readAttachment()
{
@@ -314,11 +314,11 @@ void AttachmentEditDialog::urlSelected( const TQString &url )
}
AttachmentIconView::AttachmentIconView( KOEditorAttachments* parent )
- : KIconView( parent ),
+ : TDEIconView( parent ),
mParent( parent )
{
setSelectionMode( TQIconView::Extended );
- setMode( KIconView::Select );
+ setMode( TDEIconView::Select );
setItemTextPos( TQIconView::Right );
setArrangement( TQIconView::LeftToRight );
setMaxItemWidth( TQMAX(maxItemWidth(), 250) );
diff --git a/korganizer/koeditorattachments.h b/korganizer/koeditorattachments.h
index 7d5b89d5a..b89dd0b33 100644
--- a/korganizer/koeditorattachments.h
+++ b/korganizer/koeditorattachments.h
@@ -149,7 +149,7 @@ class KOEditorAttachments : public TQWidget
};
-class AttachmentIconView : public KIconView
+class AttachmentIconView : public TDEIconView
{
Q_OBJECT
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 14bae60c1..b2a3b402d 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -88,9 +88,9 @@ int KOWhatsNextView::currentDateCount()
void KOWhatsNextView::updateView()
{
- KIconLoader kil("tdepim");
+ TDEIconLoader kil("tdepim");
TQString *ipath = new TQString();
- kil.loadIcon("tdepim",KIcon::NoGroup,32,KIcon::DefaultState,ipath);
+ kil.loadIcon("tdepim",TDEIcon::NoGroup,32,TDEIcon::DefaultState,ipath);
mText = "<table width=\"100%\">\n";
mText += "<tr bgcolor=\"#3679AD\"><td><h1>";
@@ -117,7 +117,7 @@ void KOWhatsNextView::updateView()
if (events.count() > 0) {
mText += "<p></p>";
- kil.loadIcon("appointment",KIcon::NoGroup,22,KIcon::DefaultState,ipath);
+ kil.loadIcon("appointment",TDEIcon::NoGroup,22,TDEIcon::DefaultState,ipath);
mText += "<h2><img src=\"";
mText += *ipath;
mText += "\">";
@@ -153,7 +153,7 @@ void KOWhatsNextView::updateView()
mTodos.clear();
Todo::List todos = calendar()->todos( TodoSortDueDate, SortDirectionAscending );
if ( todos.count() > 0 ) {
- kil.loadIcon("todo",KIcon::NoGroup,22,KIcon::DefaultState,ipath);
+ kil.loadIcon("todo",TDEIcon::NoGroup,22,TDEIcon::DefaultState,ipath);
mText += "<h2><img src=\"";
mText += *ipath;
mText += "\">";
@@ -192,7 +192,7 @@ void KOWhatsNextView::updateView()
if (me->status()==Attendee::NeedsAction && me->RSVP()) {
if (replies == 0) {
mText += "<p></p>";
- kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,ipath);
+ kil.loadIcon("reply",TDEIcon::NoGroup,22,TDEIcon::DefaultState,ipath);
mText += "<h2><img src=\"";
mText += *ipath;
mText += "\">";
@@ -213,7 +213,7 @@ void KOWhatsNextView::updateView()
if (me->status()==Attendee::NeedsAction && me->RSVP()) {
if (replies == 0) {
mText += "<p></p>";
- kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,ipath);
+ kil.loadIcon("reply",TDEIcon::NoGroup,22,TDEIcon::DefaultState,ipath);
mText += "<h2><img src=\"";
mText += *ipath;
mText += "\">";
diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp
index 09edb36c3..f5b91e781 100644
--- a/korganizer/urihandler.cpp
+++ b/korganizer/urihandler.cpp
@@ -117,7 +117,7 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri )
// KaddressBook is not already running.
// Pass it the UID of the contact via the command line while starting it - its neater.
// We start it without its main interface
- TQString iconPath = TDEGlobal::iconLoader()->iconPath( "go", KIcon::Small );
+ TQString iconPath = TDEGlobal::iconLoader()->iconPath( "go", TDEIcon::Small );
TQString tmpStr = "kaddressbook --editor-only --uid ";
tmpStr += TDEProcess::quote( uid );
KRun::runCommand( tmpStr, "KAddressBook", iconPath );
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index f59fa7b5e..fa6b266e4 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -281,7 +281,7 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne
}
if( hasIcon )
- pixmap = TDEGlobal::iconLoader()->loadIcon( *_icons[ index ], KIcon::Desktop, KIcon::SizeSmallMedium );
+ pixmap = TDEGlobal::iconLoader()->loadIcon( *_icons[ index ], TDEIcon::Desktop, TDEIcon::SizeSmallMedium );
if( hasIcon && hasFg )
{
@@ -363,7 +363,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo
}
//Merge icon and number and convert to result.
- KIconEffect::overlay( iconImage, numberImage );
+ TDEIconEffect::overlay( iconImage, numberImage );
result.convertFromImage( iconImage );
return result;
diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui
index 53e32d9c6..f7717c53e 100644
--- a/korn/kornboxcfg.ui
+++ b/korn/kornboxcfg.ui
@@ -181,7 +181,7 @@
<string></string>
</property>
</widget>
- <widget class="KIconButton">
+ <widget class="TDEIconButton">
<property name="name">
<cstring>ibNewIcon</cstring>
</property>
@@ -265,7 +265,7 @@
<string></string>
</property>
</widget>
- <widget class="KIconButton">
+ <widget class="TDEIconButton">
<property name="name">
<cstring>ibNormalIcon</cstring>
</property>
diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp
index a6ffe4d94..c62001e56 100644
--- a/ktnef/gui/attachpropertydialog.cpp
+++ b/ktnef/gui/attachpropertydialog.cpp
@@ -57,7 +57,7 @@ void AttachPropertyDialog::setAttachment(KTNEFAttach *attach)
if ( !pix.isNull() )
icon_->setPixmap( pix );
else
- icon_->setPixmap(mimetype->pixmap(KIcon::Small));
+ icon_->setPixmap(mimetype->pixmap(TDEIcon::Small));
description_->setText(mimetype->comment());
s.setNum(attach->index());
index_->setText(s);
diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp
index be3000aac..caadcc9e9 100644
--- a/ktnef/gui/ktnefview.cpp
+++ b/ktnef/gui/ktnefview.cpp
@@ -53,7 +53,7 @@ Attachment::Attachment(TQListView *parent, KTNEFAttach *attach)
if ( !pix.isNull() )
setPixmap( 0, pix );
else
- setPixmap(0, mimeType->pixmap(KIcon::Small));
+ setPixmap(0, mimeType->pixmap(TDEIcon::Small));
setDragEnabled( true );
}
diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp
index 7632b17ee..1c1efe1da 100644
--- a/libkcal/incidenceformatter.cpp
+++ b/libkcal/incidenceformatter.cpp
@@ -221,7 +221,7 @@ static TQString displayViewLinkPerson( const TQString& email, TQString name, TQS
mailto.setProtocol( "mailto" );
mailto.setPath( email );
const TQString iconPath =
- TDEGlobal::iconLoader()->iconPath( "mail_new", KIcon::Small );
+ TDEGlobal::iconLoader()->iconPath( "mail_new", TDEIcon::Small );
tmpString += "&nbsp;" +
htmlAddLink( mailto.url(),
"<img valign=\"top\" src=\"" + iconPath + "\">" );
@@ -401,38 +401,38 @@ static TQString displayViewFormatHeader( Incidence *incidence )
if ( incidence->customProperty( "KABC", "BIRTHDAY" ) == "YES" ) {
if ( incidence->customProperty( "KABC", "ANNIVERSARY" ) == "YES" ) {
iconPath =
- TDEGlobal::iconLoader()->iconPath( "calendaranniversary", KIcon::Small );
+ TDEGlobal::iconLoader()->iconPath( "calendaranniversary", TDEIcon::Small );
} else {
- iconPath = TDEGlobal::iconLoader()->iconPath( "calendarbirthday", KIcon::Small );
+ iconPath = TDEGlobal::iconLoader()->iconPath( "calendarbirthday", TDEIcon::Small );
}
} else {
- iconPath = TDEGlobal::iconLoader()->iconPath( "appointment", KIcon::Small );
+ iconPath = TDEGlobal::iconLoader()->iconPath( "appointment", TDEIcon::Small );
}
tmpStr += "<img valign=\"top\" src=\"" + iconPath + "\">";
}
if ( incidence->type() == "Todo" ) {
tmpStr += "<img valign=\"top\" src=\"" +
- TDEGlobal::iconLoader()->iconPath( "todo", KIcon::Small ) +
+ TDEGlobal::iconLoader()->iconPath( "todo", TDEIcon::Small ) +
"\">";
}
if ( incidence->type() == "Journal" ) {
tmpStr += "<img valign=\"top\" src=\"" +
- TDEGlobal::iconLoader()->iconPath( "journal", KIcon::Small ) +
+ TDEGlobal::iconLoader()->iconPath( "journal", TDEIcon::Small ) +
"\">";
}
if ( incidence->isAlarmEnabled() ) {
tmpStr += "<img valign=\"top\" src=\"" +
- TDEGlobal::iconLoader()->iconPath( "bell", KIcon::Small ) +
+ TDEGlobal::iconLoader()->iconPath( "bell", TDEIcon::Small ) +
"\">";
}
if ( incidence->doesRecur() ) {
tmpStr += "<img valign=\"top\" src=\"" +
- TDEGlobal::iconLoader()->iconPath( "recur", KIcon::Small ) +
+ TDEGlobal::iconLoader()->iconPath( "recur", TDEIcon::Small ) +
"\">";
}
if ( incidence->isReadOnly() ) {
tmpStr += "<img valign=\"top\" src=\"" +
- TDEGlobal::iconLoader()->iconPath( "readonlyevent", KIcon::Small ) +
+ TDEGlobal::iconLoader()->iconPath( "readonlyevent", TDEIcon::Small ) +
"\">";
}
@@ -1174,7 +1174,7 @@ static TQString invitationPerson( const TQString& email, TQString name, TQString
mailto.setProtocol( "mailto" );
mailto.setPath( person.fullName() );
const TQString iconPath =
- TDEGlobal::iconLoader()->iconPath( "mail_new", KIcon::Small );
+ TDEGlobal::iconLoader()->iconPath( "mail_new", TDEIcon::Small );
tmpString += "&nbsp;" +
htmlAddLink( mailto.url(), "<img src=\"" + iconPath + "\">" )
;
@@ -2005,7 +2005,7 @@ static TQString invitationAttachments( InvitationFormatterHelper *helper, Incide
// Attachment icon
KMimeType::Ptr mimeType = KMimeType::mimeType( a->mimeType() );
const TQString iconStr = mimeType ? mimeType->icon( a->uri(), false ) : TQString( "application-octet-stream" );
- const TQString iconPath = TDEGlobal::iconLoader()->iconPath( iconStr, KIcon::Small );
+ const TQString iconPath = TDEGlobal::iconLoader()->iconPath( iconStr, TDEIcon::Small );
if ( !iconPath.isEmpty() ) {
tmpStr += "<img valign=\"top\" src=\"" + iconPath + "\">";
}
diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp
index 817e60327..9cbbeb027 100644
--- a/libtdepim/addresseeemailselection.cpp
+++ b/libtdepim/addresseeemailselection.cpp
@@ -133,7 +133,7 @@ TQPixmap AddresseeEmailSelection::itemIcon( const KABC::Addressee &addressee, ui
if ( !addressee.photo().data().isNull() )
return addressee.photo().data().smoothScale( 16, 16 );
else
- return TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Small );
+ return TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Small );
}
bool AddresseeEmailSelection::itemEnabled( const KABC::Addressee &addressee, uint ) const
@@ -160,7 +160,7 @@ TQString AddresseeEmailSelection::distributionListText( const KABC::Distribution
TQPixmap AddresseeEmailSelection::distributionListIcon( const KABC::DistributionList* ) const
{
- return TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small );
+ return TDEGlobal::iconLoader()->loadIcon( "tdmconfig", TDEIcon::Small );
}
bool AddresseeEmailSelection::distributionListEnabled( const KABC::DistributionList* ) const
diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp
index a5221c647..082b73c54 100644
--- a/libtdepim/addresseeselector.cpp
+++ b/libtdepim/addresseeselector.cpp
@@ -288,8 +288,8 @@ void AddresseeSelector::initGUI()
int row = 1;
- TQIconSet moveSet = TDEGlobal::iconLoader()->loadIconSet( "next", KIcon::Small );
- TQIconSet removeSet = TDEGlobal::iconLoader()->loadIconSet( "previous", KIcon::Small );
+ TQIconSet moveSet = TDEGlobal::iconLoader()->loadIconSet( "next", TDEIcon::Small );
+ TQIconSet removeSet = TDEGlobal::iconLoader()->loadIconSet( "previous", TDEIcon::Small );
uint count = mSelection->fieldCount();
for ( uint i = 0; i < count; ++i, ++row ) {
diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index 20c06c94d..e2aa2e42c 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -207,7 +207,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
} else if ( !pic.url().isEmpty() ) {
image = (pic.url().startsWith( "http://" ) || pic.url().startsWith( "https://" ) ? pic.url() : "http://" + pic.url());
} else {
- image = "file:" + TDEGlobal::iconLoader()->iconPath( "personal", KIcon::Desktop );
+ image = "file:" + TDEGlobal::iconLoader()->iconPath( "personal", TDEIcon::Desktop );
}
}
@@ -554,7 +554,7 @@ void AddresseeView::updateView()
}
} else {
TQMimeSourceFactory::defaultFactory()->setPixmap( imageURL,
- TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 128 ) );
+ TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop, 128 ) );
}
}
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp
index 68fd906e3..1a3dc662a 100644
--- a/libtdepim/addressesdialog.cpp
+++ b/libtdepim/addressesdialog.cpp
@@ -105,11 +105,11 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Add
if ( addr.photo().url().isEmpty() ) {
if ( addr.photo().data().isNull() )
- setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ) );
+ setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Small ) );
else
setPixmap( 0, addr.photo().data().smoothScale( 16, 16 ) );
} else {
- setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( addr.photo().url(), KIcon::Small ) );
+ setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( addr.photo().url(), TDEIcon::Small ) );
}
}
@@ -135,7 +135,7 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString
d = new AddresseeViewItemPrivate;
d->category = DistList;
- setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ) );
+ setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "tdmconfig", TDEIcon::Small ) );
}
AddresseeViewItem::~AddresseeViewItem()
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 6c31a31e2..8c9f599ff 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -223,12 +223,12 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch,
TQVBox* upDownBox = new TQVBox( page );
mUpButton = new KPushButton( upDownBox, "mUpButton" );
- mUpButton->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) );
+ mUpButton->setIconSet( BarIconSet( "up", TDEIcon::SizeSmall ) );
mUpButton->setEnabled( false ); // b/c no item is selected yet
mUpButton->setFocusPolicy( TQ_StrongFocus );
mDownButton = new KPushButton( upDownBox, "mDownButton" );
- mDownButton->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) );
+ mDownButton->setIconSet( BarIconSet( "down", TDEIcon::SizeSmall ) );
mDownButton->setEnabled( false ); // b/c no item is selected yet
mDownButton->setFocusPolicy( TQ_StrongFocus );
diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp
index 0eadb6709..a0ce66f5a 100644
--- a/libtdepim/kscoringeditor.cpp
+++ b/libtdepim/kscoringeditor.cpp
@@ -613,12 +613,12 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,
TQHBoxLayout *btnL = new TQHBoxLayout( topL, KDialog::spacingHint() );
mRuleUp = new TQPushButton( this );
- mRuleUp->setPixmap( BarIcon( "up", KIcon::SizeSmall ) );
+ mRuleUp->setPixmap( BarIcon( "up", TDEIcon::SizeSmall ) );
TQToolTip::add( mRuleUp, i18n("Move rule up") );
btnL->addWidget( mRuleUp );
connect( mRuleUp, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleUp() ) );
mRuleDown = new TQPushButton( this );
- mRuleDown->setPixmap( BarIcon( "down", KIcon::SizeSmall ) );
+ mRuleDown->setPixmap( BarIcon( "down", TDEIcon::SizeSmall ) );
TQToolTip::add( mRuleDown, i18n("Move rule down") );
btnL->addWidget( mRuleDown );
connect( mRuleDown, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleDown() ) );
@@ -626,25 +626,25 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,
btnL = new TQHBoxLayout( topL, KDialog::spacingHint() );
editRule=0L;
newRule = new TQPushButton(this);
- newRule->setPixmap( BarIcon( "filenew", KIcon::SizeSmall ) );
+ newRule->setPixmap( BarIcon( "filenew", TDEIcon::SizeSmall ) );
TQToolTip::add(newRule,i18n("New rule")),
btnL->addWidget(newRule);
connect(newRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewRule()));
// if we're standalone, we need an additional edit button
if (standalone) {
editRule = new TQPushButton(this);
- editRule->setIconSet( BarIconSet("edit", KIcon::SizeSmall) );
+ editRule->setIconSet( BarIconSet("edit", TDEIcon::SizeSmall) );
TQToolTip::add(editRule,i18n("Edit rule"));
btnL->addWidget(editRule);
connect(editRule,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotEditRule()));
}
delRule = new TQPushButton(this);
- delRule->setIconSet( BarIconSet( "editdelete", KIcon::SizeSmall ) );
+ delRule->setIconSet( BarIconSet( "editdelete", TDEIcon::SizeSmall ) );
TQToolTip::add(delRule,i18n("Remove rule"));
btnL->addWidget(delRule);
connect(delRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelRule()));
copyRule = new TQPushButton(this);
- copyRule->setIconSet(BarIconSet("editcopy", KIcon::SizeSmall));
+ copyRule->setIconSet(BarIconSet("editcopy", TDEIcon::SizeSmall));
TQToolTip::add(copyRule,i18n("Copy rule"));
btnL->addWidget(copyRule);
connect(copyRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopyRule()));
diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp
index 5829d63a1..601da0fbb 100644
--- a/libtdepim/ksubscription.cpp
+++ b/libtdepim/ksubscription.cpp
@@ -224,7 +224,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption,
TQToolButton *clearButton = new TQToolButton( page );
clearButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet(
- TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
+ TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", TDEIcon::Small, 0 ) );
filterEdit = new KLineEdit(page);
TQLabel *l = new TQLabel(filterEdit,i18n("S&earch:"), page);
connect( clearButton, TQT_SIGNAL( clicked() ), filterEdit, TQT_SLOT( clear() ) );
diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp
index 947c0ce89..82a8895d4 100644
--- a/libtdepim/progressdialog.cpp
+++ b/libtdepim/progressdialog.cpp
@@ -260,7 +260,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c
pbClose->setAutoRaise(true);
pbClose->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
pbClose->setFixedSize( 16, 16 );
- pbClose->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "fileclose", KIcon::Small, 14 ) );
+ pbClose->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "fileclose", TDEIcon::Small, 14 ) );
TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) );
connect(pbClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()));
TQWidget* spacer = new TQWidget( rightBox ); // don't let the close button take up all the height
diff --git a/tdeioslaves/imap4/mimeheader.cc b/tdeioslaves/imap4/mimeheader.cc
index 72e3827b3..4f3de6469 100644
--- a/tdeioslaves/imap4/mimeheader.cc
+++ b/tdeioslaves/imap4/mimeheader.cc
@@ -701,9 +701,9 @@ mimeHeader::iconName ()
fileName =
KMimeType::mimeType (contentType.lower ())->icon (TQString(), false);
fileName =
- TDEGlobal::instance ()->iconLoader ()->iconPath (fileName, KIcon::Desktop);
+ TDEGlobal::instance ()->iconLoader ()->iconPath (fileName, TDEIcon::Desktop);
// if (fileName.isEmpty())
-// fileName = TDEGlobal::instance()->iconLoader()->iconPath( "unknown", KIcon::Desktop );
+// fileName = TDEGlobal::instance()->iconLoader()->iconPath( "unknown", TDEIcon::Desktop );
return fileName;
}
diff --git a/tderesources/scalix/scalixadmin/mainwindow.cpp b/tderesources/scalix/scalixadmin/mainwindow.cpp
index a6a31a3df..5eb3d2a5c 100644
--- a/tderesources/scalix/scalixadmin/mainwindow.cpp
+++ b/tderesources/scalix/scalixadmin/mainwindow.cpp
@@ -37,19 +37,19 @@ MainWindow::MainWindow()
{
KJanusWidget *wdg = new KJanusWidget( this, "", KJanusWidget::IconList );
- TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "folder_yellow", KIcon::Desktop );
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "folder_yellow", TDEIcon::Desktop );
TQVBox *page = wdg->addVBoxPage( i18n( "Other Accounts" ), i18n( "Register other accounts" ), icon );
new OtherUserPage( page );
- icon = TDEGlobal::iconLoader()->loadIcon( "edu_languages", KIcon::Desktop );
+ icon = TDEGlobal::iconLoader()->loadIcon( "edu_languages", TDEIcon::Desktop );
page = wdg->addVBoxPage( i18n( "Delegates" ), i18n( "Setup delegates for my account" ), icon );
new DelegatePage( page );
- icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary_green", KIcon::Desktop );
+ icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary_green", TDEIcon::Desktop );
page = wdg->addVBoxPage( i18n( "Out of Office..." ), i18n( "Setup Out of Office Message" ), icon );
new OutOfOfficePage( page );
- icon = TDEGlobal::iconLoader()->loadIcon( "password", KIcon::Desktop );
+ icon = TDEGlobal::iconLoader()->loadIcon( "password", TDEIcon::Desktop );
page = wdg->addVBoxPage( i18n( "Password" ), i18n( "Change the password" ), icon );
new PasswordPage( page );
diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp
index 22be7663a..893884ce5 100644
--- a/wizards/overviewpage.cpp
+++ b/wizards/overviewpage.cpp
@@ -51,7 +51,7 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name )
layout->addMultiCellWidget( label, 0, 0, 0, 2 );
label = new TQLabel( this );
- label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "network", KIcon::Desktop ) );
+ label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "network", TDEIcon::Desktop ) );
layout->addWidget( label, 0, 3 );
label = new TQLabel( "", this );