Browse Source

Rename KIcon to enhance compatibility with KDE4

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
b97ee238f8
100 changed files with 270 additions and 270 deletions
  1. +1
    -1
      akregator/src/addfeeddialog.cpp
  2. +2
    -2
      akregator/src/akregator_view.cpp
  3. +2
    -2
      akregator/src/feeditem.cpp
  4. +2
    -2
      akregator/src/feedlistview.cpp
  5. +1
    -1
      akregator/src/folderitem.cpp
  6. +1
    -1
      akregator/src/searchbar.cpp
  7. +1
    -1
      akregator/src/tabwidget.cpp
  8. +2
    -2
      akregator/src/tagnodeitem.cpp
  9. +1
    -1
      akregator/src/tagpropertieswidgetbase.ui
  10. +2
    -2
      akregator/src/trayicon.cpp
  11. +1
    -1
      certmanager/lib/ui/cryptoconfigmodule.cpp
  12. +2
    -2
      certmanager/lib/ui/directoryserviceswidget.cpp
  13. +1
    -1
      certmanager/lib/ui/keyselectiondialog.cpp
  14. +1
    -1
      certmanager/lib/ui/passphrasedialog.cpp
  15. +13
    -13
      kaddressbook/addresseeeditorwidget.cpp
  16. +1
    -1
      kaddressbook/distributionlistentryview.cpp
  17. +2
    -2
      kaddressbook/features/resourceselection.cpp
  18. +1
    -1
      kaddressbook/geowidget.cpp
  19. +1
    -1
      kaddressbook/imagewidget.cpp
  20. +2
    -2
      kaddressbook/kcmconfigs/ldapoptionswidget.cpp
  21. +1
    -1
      kaddressbook/soundwidget.cpp
  22. +2
    -2
      kaddressbook/viewconfigurewidget.cpp
  23. +1
    -1
      kaddressbook/viewmanager.cpp
  24. +1
    -1
      kaddressbook/views/configuretableviewdialog.cpp
  25. +5
    -5
      kaddressbook/views/kaddressbookiconview.cpp
  26. +2
    -2
      kaddressbook/views/kaddressbookiconview.h
  27. +3
    -3
      kalarm/messagewin.cpp
  28. +3
    -3
      kandy/src/kandyprefsdialog.cpp
  29. +3
    -3
      karm/preferences.cpp
  30. +2
    -2
      karm/task.cpp
  31. +15
    -15
      kgantt/kgantt/xQGanttBarViewPort.cpp
  32. +1
    -1
      kgantt/kgantt/xQGanttBarViewPort.h
  33. +5
    -5
      kitchensync/src/aboutpage.cpp
  34. +2
    -2
      kitchensync/src/groupconfig.cpp
  35. +1
    -1
      kitchensync/src/groupitem.cpp
  36. +2
    -2
      kitchensync/src/memberinfo.cpp
  37. +1
    -1
      kitchensync/src/pluginpicker.cpp
  38. +5
    -5
      kmail/accountdialog.cpp
  39. +1
    -1
      kmail/configuredialog_p.h
  40. +5
    -5
      kmail/customtemplates.cpp
  41. +2
    -2
      kmail/folderpropertiesdialog.ui
  42. +1
    -1
      kmail/folderrequester.cpp
  43. +1
    -1
      kmail/kmfawidgets.cpp
  44. +9
    -9
      kmail/kmfilterdlg.cpp
  45. +2
    -2
      kmail/kmfilterdlg.h
  46. +5
    -5
      kmail/kmfolderdia.cpp
  47. +3
    -3
      kmail/kmfolderdia.h
  48. +15
    -15
      kmail/kmfoldertree.cpp
  49. +2
    -2
      kmail/kmheaders.cpp
  50. +1
    -1
      kmail/kmmimeparttree.cpp
  51. +1
    -1
      kmail/kmmsgpart.h
  52. +1
    -1
      kmail/kmmsgpartdlg.cpp
  53. +1
    -1
      kmail/kmstartup.cpp
  54. +2
    -2
      kmail/kmsystemtray.cpp
  55. +3
    -3
      kmail/objecttreeparser.cpp
  56. +1
    -1
      kmail/partNode.cpp
  57. +4
    -4
      kmail/recipientspicker.cpp
  58. +1
    -1
      kmail/redirectdialog.cpp
  59. +2
    -2
      kmail/searchwindow.cpp
  60. +2
    -2
      kmail/simplestringlisteditor.cpp
  61. +1
    -1
      kmail/urlhandlermanager.cpp
  62. +1
    -1
      kmobile/kmobile.cpp
  63. +1
    -1
      kmobile/kmobileitem.cpp
  64. +2
    -2
      kmobile/systemtray.cpp
  65. +1
    -1
      knode/articlewidget.cpp
  66. +4
    -4
      knode/knconfig.cpp
  67. +1
    -1
      knode/knconfigwidgets.cpp
  68. +1
    -1
      knotes/ChangeLog
  69. +6
    -6
      knotes/knote.cpp
  70. +1
    -1
      knotes/knotebutton.cpp
  71. +2
    -2
      knotes/knotesapp.cpp
  72. +1
    -1
      kontact/TODO
  73. +2
    -2
      kontact/plugins/kmail/summarywidget.cpp
  74. +2
    -2
      kontact/plugins/knotes/knotes_part.h
  75. +9
    -9
      kontact/plugins/knotes/knotes_part_p.h
  76. +1
    -1
      kontact/plugins/knotes/knotetip.cpp
  77. +3
    -3
      kontact/plugins/knotes/knotetip.h
  78. +3
    -3
      kontact/plugins/knotes/summarywidget.cpp
  79. +6
    -6
      kontact/plugins/korganizer/summarywidget.cpp
  80. +5
    -5
      kontact/plugins/korganizer/todosummarywidget.cpp
  81. +1
    -1
      kontact/plugins/kpilot/summarywidget.cpp
  82. +1
    -1
      kontact/plugins/newsticker/summarywidget.cpp
  83. +5
    -5
      kontact/plugins/specialdates/sdsummarywidget.cpp
  84. +1
    -1
      kontact/plugins/summary/kcmkontactsummary.cpp
  85. +1
    -1
      kontact/plugins/weather/summarywidget.cpp
  86. +2
    -2
      kontact/src/aboutdialog.cpp
  87. +3
    -3
      kontact/src/iconsidepane.cpp
  88. +7
    -7
      kontact/src/mainwindow.cpp
  89. +5
    -5
      korganizer/koeditorattachments.cpp
  90. +1
    -1
      korganizer/koeditorattachments.h
  91. +6
    -6
      korganizer/kowhatsnextview.cpp
  92. +1
    -1
      korganizer/urihandler.cpp
  93. +2
    -2
      korn/boxcontaineritem.cpp
  94. +2
    -2
      korn/kornboxcfg.ui
  95. +1
    -1
      ktnef/gui/attachpropertydialog.cpp
  96. +1
    -1
      ktnef/gui/ktnefview.cpp
  97. +11
    -11
      libkcal/incidenceformatter.cpp
  98. +2
    -2
      libtdepim/addresseeemailselection.cpp
  99. +2
    -2
      libtdepim/addresseeselector.cpp
  100. +2
    -2
      libtdepim/addresseeview.cpp

+ 1
- 1
akregator/src/addfeeddialog.cpp View File

@@ -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());
}



+ 2
- 2
akregator/src/akregator_view.cpp View File

@@ -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&)));



+ 2
- 2
akregator/src/feeditem.cpp View File

@@ -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)


+ 2
- 2
akregator/src/feedlistview.cpp View File

@@ -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);
}
}


+ 1
- 1
akregator/src/folderitem.cpp View File

@@ -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());
}


+ 1
- 1
akregator/src/searchbar.cpp View File

@@ -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"));


+ 1
- 1
akregator/src/tabwidget.cpp View File

@@ -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();
}
}


+ 2
- 2
akregator/src/tagnodeitem.cpp View File

@@ -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();
}



+ 1
- 1
akregator/src/tagpropertieswidgetbase.ui View File

@@ -79,7 +79,7 @@
<cstring>iconButton</cstring>
</property>
</widget>
<widget class="KIconButton">
<widget class="TDEIconButton">
<property name="name">
<cstring>iconButton</cstring>
</property>


+ 2
- 2
akregator/src/trayicon.cpp View File

@@ -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);


+ 1
- 1
certmanager/lib/ui/cryptoconfigmodule.cpp View File

@@ -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 ) {


+ 2
- 2
certmanager/lib/ui/directoryserviceswidget.cpp View File

@@ -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
}



+ 1
- 1
certmanager/lib/ui/keyselectiondialog.cpp View File

@@ -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 );


+ 1
- 1
certmanager/lib/ui/passphrasedialog.cpp View File

@@ -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


+ 13
- 13
kaddressbook/addresseeeditorwidget.cpp View File

@@ -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 );


+ 1
- 1
kaddressbook/distributionlistentryview.cpp View File

@@ -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() );


+ 2
- 2
kaddressbook/features/resourceselection.cpp View File

@@ -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();
}



+ 1
- 1
kaddressbook/geowidget.cpp View File

@@ -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 );



+ 1
- 1
kaddressbook/imagewidget.cpp View File

@@ -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() );
}


+ 2
- 2
kaddressbook/kcmconfigs/ldapoptionswidget.cpp View File

@@ -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 );


+ 1
- 1
kaddressbook/soundwidget.cpp View File

@@ -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 );



+ 2
- 2
kaddressbook/viewconfigurewidget.cpp View File

@@ -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 );
}


+ 1
- 1
kaddressbook/viewmanager.cpp View File

@@ -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();
}



+ 1
- 1
kaddressbook/views/configuretableviewdialog.cpp View File

@@ -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 );
}


+ 5
- 5
kaddressbook/views/kaddressbookiconview.cpp View File

@@ -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();


+ 2
- 2
kaddressbook/views/kaddressbookiconview.h View File

@@ -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


+ 3
- 3
kalarm/messagewin.cpp View File

@@ -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());


+ 3
- 3
kandy/src/kandyprefsdialog.cpp View File

@@ -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());


+ 3
- 3
karm/preferences.cpp View File

@@ -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 );



+ 2
- 2
karm/task.cpp View File

@@ -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);
}
}


+ 15
- 15
kgantt/kgantt/xQGanttBarViewPort.cpp View File

@@ -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()));



+ 1
- 1
kgantt/kgantt/xQGanttBarViewPort.h View File

@@ -272,7 +272,7 @@ private:
TDEPopupMenu* _menu;
TDEPopupMenu* _selectMenu;
KIconLoader* _iconloader;
TDEIconLoader* _iconloader;

TDEToolBar* _toolbar;



+ 5
- 5
kitchensync/src/aboutpage.cpp View File

@@ -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>"


+ 2
- 2
kitchensync/src/groupconfig.cpp View File

@@ -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 );


+ 1
- 1
kitchensync/src/groupitem.cpp View File

@@ -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 );


+ 2
- 2
kitchensync/src/memberinfo.cpp View File

@@ -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


+ 1
- 1
kitchensync/src/pluginpicker.cpp View File

@@ -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 );


+ 5
- 5
kmail/accountdialog.cpp View File

@@ -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 );


+ 1
- 1
kmail/configuredialog_p.h View File

@@ -55,7 +55,7 @@ class KMMsgTagDesc;
class TDEListBox;
class KColorCombo;
class TDEFontRequester;
class KIconButton;
class TDEIconButton;
class KKeyButton;
class TQSpinBox;
class KComboBox;


+ 5
- 5
kmail/customtemplates.cpp View File

@@ -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 );


+ 2
- 2
kmail/folderpropertiesdialog.ui View File

@@ -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>


+ 1
- 1
kmail/folderrequester.cpp View File

@@ -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,


+ 1
- 1
kmail/kmfawidgets.cpp View File

@@ -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 );


+ 9
- 9
kmail/kmfilterdlg.cpp View File

@@ -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") );


+ 2
- 2
kmail/kmfilterdlg.h View File

@@ -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;


+ 5
- 5
kmail/kmfolderdia.cpp View File

@@ -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 );
}


+ 3
- 3
kmail/kmfolderdia.h View File

@@ -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;


+ 15
- 15
kmail/kmfoldertree.cpp View File

@@ -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 );
}
}



+ 2
- 2
kmail/kmheaders.cpp View File

@@ -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() ) {


+ 1
- 1
kmail/kmmimeparttree.cpp View File

@@ -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") );
}
}



+ 1
- 1
kmail/kmmsgpart.h View File

@@ -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)


+ 1
- 1
kmail/kmmsgpartdlg.cpp View File

@@ -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") );
}


+ 1
- 1
kmail/kmstartup.cpp View File

@@ -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] );


+ 2
- 2
kmail/kmsystemtray.cpp View File

@@ -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 );


+ 3
- 3
kmail/objecttreeparser.cpp View File

@@ -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 +


+ 1
- 1
kmail/partNode.cpp View File

@@ -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();


+ 4
- 4
kmail/recipientspicker.cpp View File

@@ -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() ) );



+ 1
- 1
kmail/redirectdialog.cpp View File

@@ -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 "


+ 2
- 2
kmail/searchwindow.cpp View File

@@ -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;


+ 2
- 2
kmail/simplestringlisteditor.cpp View File

@@ -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 );


+ 1
- 1
kmail/urlhandlermanager.cpp View File

@@ -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 );


+ 1
- 1
kmobile/kmobile.cpp View File

@@ -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 );


+ 1
- 1
kmobile/kmobileitem.cpp View File

@@ -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


+ 2
- 2
kmobile/systemtray.cpp View File

@@ -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()));
}


+ 1
- 1
knode/articlewidget.cpp View File

@@ -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>";


+ 4
- 4
knode/knconfig.cpp View File

@@ -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);
}



+ 1
- 1
knode/knconfigwidgets.cpp View File

@@ -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();



+ 1
- 1
knotes/ChangeLog View File

@@ -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>


+ 6
- 6
knotes/knote.cpp View File

@@ -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


+ 1
- 1
knotes/knotebutton.cpp View File

@@ -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()


+ 2
- 2
knotes/knotesapp.cpp View File

@@ -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 );


+ 1
- 1
kontact/TODO View File

@@ -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


+ 2
- 2
kontact/plugins/kmail/summarywidget.cpp View File

@@ -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 );



+ 2
- 2
kontact/plugins/knotes/knotes_part.h View File

@@ -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;



+ 9
- 9
kontact/plugins/knotes/knotes_part_p.h View File

@@ -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();


+ 1
- 1
kontact/plugins/knotes/knotetip.cpp View File

@@ -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 ),


+ 3
- 3
kontact/plugins/knotes/knotetip.h View File

@@ -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;


+ 3
- 3
kontact/plugins/knotes/summarywidget.cpp View File

@@ -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() ) {


+ 6
- 6
kontact/plugins/korganizer/summarywidget.cpp View File

@@ -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() ) ) {


+ 5
- 5
kontact/plugins/korganizer/todosummarywidget.cpp View File

@@ -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" ) )