";
@@ -117,7 +117,7 @@ void KOWhatsNextView::updateView()
if (events.count() > 0) {
mText += "";
- kil.loadIcon("appointment",KIcon::NoGroup,22,KIcon::DefaultState,ipath);
+ kil.loadIcon("appointment",TDEIcon::NoGroup,22,TDEIcon::DefaultState,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 += "";
@@ -192,7 +192,7 @@ void KOWhatsNextView::updateView()
if (me->status()==Attendee::NeedsAction && me->RSVP()) {
if (replies == 0) {
mText += "";
- kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,ipath);
+ kil.loadIcon("reply",TDEIcon::NoGroup,22,TDEIcon::DefaultState,ipath);
mText += "";
@@ -213,7 +213,7 @@ void KOWhatsNextView::updateView()
if (me->status()==Attendee::NeedsAction && me->RSVP()) {
if (replies == 0) {
mText += "";
- kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,ipath);
+ kil.loadIcon("reply",TDEIcon::NoGroup,22,TDEIcon::DefaultState,ipath);
mText += "";
diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp
index 09edb36c..f5b91e78 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 f59fa7b5..fa6b266e 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 53e32d9c..f7717c53 100644
--- a/korn/kornboxcfg.ui
+++ b/korn/kornboxcfg.ui
@@ -181,7 +181,7 @@
-
+
ibNewIcon
@@ -265,7 +265,7 @@
-
+
ibNormalIcon
diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp
index a6ffe4d9..c62001e5 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 be3000aa..caadcc9e 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 7632b17e..1c1efe1d 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 += " " +
htmlAddLink( mailto.url(),
"" );
@@ -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 += "";
}
if ( incidence->type() == "Todo" ) {
tmpStr += "iconPath( "todo", KIcon::Small ) +
+ TDEGlobal::iconLoader()->iconPath( "todo", TDEIcon::Small ) +
"\">";
}
if ( incidence->type() == "Journal" ) {
tmpStr += "iconPath( "journal", KIcon::Small ) +
+ TDEGlobal::iconLoader()->iconPath( "journal", TDEIcon::Small ) +
"\">";
}
if ( incidence->isAlarmEnabled() ) {
tmpStr += "iconPath( "bell", KIcon::Small ) +
+ TDEGlobal::iconLoader()->iconPath( "bell", TDEIcon::Small ) +
"\">";
}
if ( incidence->doesRecur() ) {
tmpStr += "iconPath( "recur", KIcon::Small ) +
+ TDEGlobal::iconLoader()->iconPath( "recur", TDEIcon::Small ) +
"\">";
}
if ( incidence->isReadOnly() ) {
tmpStr += "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 += " " +
htmlAddLink( mailto.url(), "" )
;
@@ -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 += "";
}
diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp
index 817e6032..9cbbeb02 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 a5221c64..082b73c5 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 20c06c94..e2aa2e42 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 68fd906e..1a3dc662 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 6c31a31e..8c9f599f 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 0eadb670..a0ce66f5 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 5829d63a..601da0fb 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 947c0ce8..82a8895d 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 72e3827b..4f3de646 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 a6a31a3d..5eb3d2a5 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 22be7663..893884ce 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 );
|