TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KIcon to enhance compatibility with KDE4

Browse Source
pull/2/head
Timothy Pearson 12 years ago
parent 4f841fbbbc
commit de9b6c9ad1
131 changed files with 640 additions and 640 deletions
Show Stats Download Patch File Download Diff File

4
kappfinder/toplevel.cpp
Unescape Escape View File

@ -161,7 +161,7 @@ TQListViewItem* TopLevel::addGroupItem( TQListViewItem *parent, const TQString &
void TopLevel::slotScan()
{
KIconLoader* loader = TDEGlobal::iconLoader();
TDEIconLoader* loader = TDEGlobal::iconLoader();
mTemplates = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );
@ -229,7 +229,7 @@ void TopLevel::slotScan()
else
item = new TQCheckListItem( mListView, desktop.readName(), TQCheckListItem::CheckBox );
item->setPixmap( 0, loader->loadIcon( desktop.readIcon(), KIcon::Small ) );
item->setPixmap( 0, loader->loadIcon( desktop.readIcon(), TDEIcon::Small ) );
item->setText( 1, desktop.readGenericName() );
item->setText( 2, desktop.readPathEntry( "Exec" ) );
if ( desktop.readBoolEntry( "X-StandardInstall" ) )

20
kate/app/kateconfigdialog.cpp
Unescape Escape View File

@ -89,13 +89,13 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
path.clear();
path << i18n("Application");
setFolderIcon (path, SmallIcon("kate", KIcon::SizeSmall));
setFolderIcon (path, SmallIcon("kate", TDEIcon::SizeSmall));
path.clear();
//BEGIN General page
path << i18n("Application") << i18n("General");
TQFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("gohome", KIcon::SizeSmall));
TQFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("gohome", TDEIcon::SizeSmall));
TQVBoxLayout *lo = new TQVBoxLayout( frGeneral );
lo->setSpacing(KDialog::spacingHint());
@ -193,7 +193,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
//BEGIN Session page
path << i18n("Application") << i18n("Sessions");
TQFrame* frSessions = addPage(path, i18n("Session Management"), BarIcon("history", KIcon::SizeSmall));
TQFrame* frSessions = addPage(path, i18n("Session Management"), BarIcon("history", TDEIcon::SizeSmall));
lo = new TQVBoxLayout( frSessions );
lo->setSpacing(KDialog::spacingHint());
@ -264,7 +264,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
path << i18n("Application") << i18n("File Selector");
TQVBox *page = addVBoxPage( path, i18n("File Selector Settings"),
BarIcon("fileopen", KIcon::SizeSmall) );
BarIcon("fileopen", TDEIcon::SizeSmall) );
fileSelConfigPage = new KFSConfigPage( page, "file selector config page",
mainWindow->fileselector );
connect( fileSelConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
@ -272,7 +272,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
path << i18n("Application") << i18n("Document List");
page = addVBoxPage( path, i18n("Document List Settings"),
BarIcon("view_text", KIcon::SizeSmall) );
BarIcon("view_text", TDEIcon::SizeSmall) );
filelistConfigPage = new KFLConfigPage( page, "file list config page",
mainWindow->filelist );
connect( filelistConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
@ -280,7 +280,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
path << i18n("Application") << i18n("Plugins");
/*TQVBox **/page=addVBoxPage(path,i18n("Plugin Manager"),
BarIcon("connect_established",KIcon::SizeSmall));
BarIcon("connect_established",TDEIcon::SizeSmall));
KateConfigPluginPage *configPluginPage = new KateConfigPluginPage(page, this);
connect( configPluginPage, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotChanged() ) );
@ -288,21 +288,21 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
path.clear();
path << i18n("Application") << i18n("External Tools");
page = addVBoxPage( path, i18n("External Tools"),
BarIcon("configure", KIcon::SizeSmall) );
BarIcon("configure", TDEIcon::SizeSmall) );
configExternalToolsPage = new KateExternalToolsConfigWidget(page, "external tools config page");
connect( configExternalToolsPage, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotChanged()) );
// editor widgets from kwrite/kwdialog
path.clear();
path << i18n("Editor");
setFolderIcon (path, SmallIcon("edit", KIcon::SizeSmall));
setFolderIcon (path, SmallIcon("edit", TDEIcon::SizeSmall));
for (uint i = 0; i < KTextEditor::configInterfaceExtension (v->document())->configPages (); i++)
{
path.clear();
path << i18n("Editor") << KTextEditor::configInterfaceExtension (v->document())->configPageName (i);
/*TQVBox **/page = addVBoxPage(path, KTextEditor::configInterfaceExtension (v->document())->configPageFullName (i),
KTextEditor::configInterfaceExtension (v->document())->configPagePixmap(i, KIcon::SizeSmall) );
KTextEditor::configInterfaceExtension (v->document())->configPagePixmap(i, TDEIcon::SizeSmall) );
KTextEditor::ConfigPage *cPage = KTextEditor::configInterfaceExtension (v->document())->configPage(i, page);
connect( cPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
@ -336,7 +336,7 @@ void KateConfigDialog::addPluginPage (Kate::Plugin *plugin)
TQStringList path;
path.clear();
path << i18n("Application")<<i18n("Plugins") << Kate::pluginConfigInterfaceExtension(plugin)->configPageName(i);
TQVBox *page=addVBoxPage(path, Kate::pluginConfigInterfaceExtension(plugin)->configPageFullName(i), Kate::pluginConfigInterfaceExtension(plugin)->configPagePixmap(i, KIcon::SizeSmall));
TQVBox *page=addVBoxPage(path, Kate::pluginConfigInterfaceExtension(plugin)->configPageFullName(i), Kate::pluginConfigInterfaceExtension(plugin)->configPagePixmap(i, TDEIcon::SizeSmall));
PluginPageListItem *info=new PluginPageListItem;
info->plugin = plugin;

6
kate/app/kateexternaltools.cpp
Unescape Escape View File

@ -445,8 +445,8 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
TQWhatsThis::add( leName, i18n(
"The name will be displayed in the 'Tools->External' menu") );
btnIcon = new KIconButton( w );
btnIcon->setIconSize( KIcon::SizeSmall );
btnIcon = new TDEIconButton( w );
btnIcon->setIconSize( TDEIcon::SizeSmall );
lo->addWidget( btnIcon, 1, 3 );
if ( tool && !tool->icon.isEmpty() )
btnIcon->setIcon( tool->icon );
@ -649,7 +649,7 @@ void KateExternalToolsConfigWidget::reload()
TQPixmap KateExternalToolsConfigWidget::blankIcon()
{
TQPixmap pm( KIcon::SizeSmall, KIcon::SizeSmall );
TQPixmap pm( TDEIcon::SizeSmall, TDEIcon::SizeSmall );
pm.fill();
pm.setMask( pm.createHeuristicMask() );
return pm;

2
kate/app/kateexternaltools.h
Unescape Escape View File

@ -210,7 +210,7 @@ class KateExternalToolServiceEditor : public KDialogBase
class TQLineEdit *leName, *leExecutable, *leMimetypes,*leCmdLine;
class TQTextEdit *teCommand;
class KIconButton *btnIcon;
class TDEIconButton *btnIcon;
class TQComboBox *cmbSave;
private slots:

6
kate/app/katesavemodifieddialog.cpp
Unescape Escape View File

@ -48,16 +48,16 @@ public:
STATE state() const { return m_state;}
void setState(enum STATE state) {
m_state=state;
KIconLoader *loader = TDEGlobal::instance()->iconLoader();
TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
switch (state) {
case InitialState:
setPixmap(0,TQPixmap());
break;
case SaveOKState:
setPixmap(0,loader->loadIcon("ok",KIcon::NoGroup,height()));
setPixmap(0,loader->loadIcon("ok",TDEIcon::NoGroup,height()));
break;
case SaveFailedState:
setPixmap(0,loader->loadIcon("cancel",KIcon::NoGroup,height()));
setPixmap(0,loader->loadIcon("cancel",TDEIcon::NoGroup,height()));
break;
}
}

2
kate/interfaces/pluginconfiginterfaceextension.h
Unescape Escape View File

@ -88,7 +88,7 @@ class KDE_EXPORT PluginConfigInterfaceExtension
virtual TQString configPageName (uint number = 0) const = 0;
virtual TQString configPageFullName (uint number = 0) const = 0;
virtual TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const = 0;
virtual TQPixmap configPagePixmap (uint number = 0, int size = TDEIcon::SizeSmall) const = 0;
private:
class PrivatePluginConfigInterfaceExtension *d;

2
kcontrol/access/kaccess.cpp
Unescape Escape View File

@ -574,7 +574,7 @@ void KAccessApp::createDialogContents() {
lay->setSpacing(KDialog::spacingHint());
TQLabel *label1 = new TQLabel( contents);
TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
if (pixmap.isNull())
pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
label1->setPixmap(pixmap);

4
kcontrol/filetypes/filetypedetails.cpp
Unescape Escape View File

@ -28,8 +28,8 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
TQHBoxLayout *hBox = new TQHBoxLayout(0L, 0, KDialog::spacingHint());
firstLayout->addLayout(hBox, 1);
iconButton = new KIconButton(firstWidget);
iconButton->setIconType(KIcon::Desktop, KIcon::MimeType);
iconButton = new TDEIconButton(firstWidget);
iconButton->setIconType(TDEIcon::Desktop, TDEIcon::MimeType);
connect(iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(updateIcon(TQString)));
iconButton->setFixedSize(70, 70);

4
kcontrol/filetypes/filetypedetails.h
Unescape Escape View File

@ -3,7 +3,7 @@
#include <tqtabwidget.h>
class TypesListItem;
class KIconButton;
class TDEIconButton;
class TQLineEdit;
class TQListBox;
class TQButtonGroup;
@ -47,7 +47,7 @@ private:
TypesListItem * m_item;
// First tab - General
KIconButton *iconButton;
TDEIconButton *iconButton;
TQListBox *extensionLB;
TQPushButton *addExtButton, *removeExtButton;
TQLineEdit *description;

2
kcontrol/filetypes/filetypesview.h
Unescape Escape View File

@ -14,7 +14,7 @@ class TDEListView;
class TQListViewItem;
class TQListBox;
class TQPushButton;
class KIconButton;
class TDEIconButton;
class TQLineEdit;
class TQComboBox;
class FileTypeDetails;

2
kcontrol/filetypes/typeslistitem.cpp
Unescape Escape View File

@ -82,7 +82,7 @@ void TypesListItem::setup()
{
if (m_mimetype)
{
setPixmap(0, m_mimetype->pixmap(KIcon::Small, IconSize(KIcon::Small)));
setPixmap(0, m_mimetype->pixmap(TDEIcon::Small, IconSize(TDEIcon::Small)));
}
TQListViewItem::setup();
}

4
kcontrol/hwmanager/deviceiconview.cpp
Unescape Escape View File

@ -103,6 +103,6 @@ TQPixmap DeviceIconView::loadIcon( const TQString &name )
return icon;
}
KIcon::StdSizes DeviceIconView::iconSize() {
return KIcon::SizeSmall;
TDEIcon::StdSizes DeviceIconView::iconSize() {
return TDEIcon::SizeSmall;
}

2
kcontrol/hwmanager/deviceiconview.h
Unescape Escape View File

@ -65,7 +65,7 @@ class DeviceIconView : public TDEListView
public:
DeviceIconView(TQWidget * parent = 0, const char * name = 0);
KIcon::StdSizes iconSize();
TDEIcon::StdSizes iconSize();
signals:
void deviceSelected(TDEGenericDevice*);

2
kcontrol/hwmanager/devicepropsdlg.cpp
Unescape Escape View File

@ -343,7 +343,7 @@ TQString assembleSwitchList(TDESwitchType::TDESwitchType switches) {
void DevicePropertiesDialog::populateDeviceInformation() {
if (m_device) {
base->labelDeviceType->setText(m_device->friendlyDeviceType());
base->iconDeviceType->setPixmap(m_device->icon(KIcon::SizeSmall));
base->iconDeviceType->setPixmap(m_device->icon(TDEIcon::SizeSmall));
base->labelDeviceName->setText(m_device->friendlyName());
base->labelDeviceNode->setText((m_device->deviceNode().isNull())?i18n("<none>"):m_device->deviceNode());
base->labelSystemPath->setText(m_device->systemPath());

174
kcontrol/icons/icons.cpp
Unescape Escape View File

@ -32,9 +32,9 @@
#include "icons.h"
/**** KIconConfig ****/
/**** TDEIconConfig ****/
KIconConfig::KIconConfig(TQWidget *parent, const char *name)
TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
: TDECModule(parent, name)
{
@ -114,13 +114,13 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name)
preview();
}
KIconConfig::~KIconConfig()
TDEIconConfig::~TDEIconConfig()
{
delete mpSystrayConfig;
delete mpEffect;
}
TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay)
TQPushButton *TDEIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay)
{
TQLabel *lab = new TQLabel(str, parent);
lay->addWidget(lab, 1, i, Qt::AlignCenter);
@ -133,14 +133,14 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *
return push;
}
void KIconConfig::init()
void TDEIconConfig::init()
{
mpLoader = TDEGlobal::iconLoader();
mpConfig = TDEGlobal::config();
mpEffect = new KIconEffect;
mpEffect = new TDEIconEffect;
mpTheme = mpLoader->theme();
mUsage = 0;
for (int i=0; i<KIcon::LastGroup; i++)
for (int i=0; i<TDEIcon::LastGroup; i++)
mbChanged[i] = false;
// Fill list/checkboxen
@ -165,11 +165,11 @@ void KIconConfig::init()
mStates += "Disabled";
}
void KIconConfig::initDefaults()
void TDEIconConfig::initDefaults()
{
mDefaultEffect[0].type = KIconEffect::NoEffect;
mDefaultEffect[1].type = KIconEffect::NoEffect;
mDefaultEffect[2].type = KIconEffect::ToGray;
mDefaultEffect[0].type = TDEIconEffect::NoEffect;
mDefaultEffect[1].type = TDEIconEffect::NoEffect;
mDefaultEffect[2].type = TDEIconEffect::ToGray;
mDefaultEffect[0].transparant = false;
mDefaultEffect[1].transparant = false;
mDefaultEffect[2].transparant = true;
@ -185,9 +185,9 @@ void KIconConfig::initDefaults()
const int defDefSizes[] = { 32, 22, 22, 16, 32 };
KIcon::Group i;
TDEIcon::Group i;
TQStringList::ConstIterator it;
for(it=mGroups.begin(), i=KIcon::FirstGroup; it!=mGroups.end(); ++it, i++)
for(it=mGroups.begin(), i=TDEIcon::FirstGroup; it!=mGroups.end(); ++it, i++)
{
mbDP[i] = false;
mbChanged[i] = true;
@ -213,24 +213,24 @@ void KIconConfig::initDefaults()
int group = mGroups.findIndex( "Desktop" );
if ( group != -1 )
{
mEffects[ group ][ activeState ].type = KIconEffect::ToGamma;
mEffects[ group ][ activeState ].type = TDEIconEffect::ToGamma;
mEffects[ group ][ activeState ].value = 0.7;
}
group = mGroups.findIndex( "Panel" );
if ( group != -1 )
{
mEffects[ group ][ activeState ].type = KIconEffect::ToGamma;
mEffects[ group ][ activeState ].type = TDEIconEffect::ToGamma;
mEffects[ group ][ activeState ].value = 0.7;
}
}
}
void KIconConfig::read()
void TDEIconConfig::read()
{
if (mpTheme)
{
for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++)
for (TDEIcon::Group i=TDEIcon::FirstGroup; i<TDEIcon::LastGroup; i++)
mAvSizes[i] = mpTheme->querySizes(i);
mTheme = mpTheme->current();
@ -238,7 +238,7 @@ void KIconConfig::read()
}
else
{
for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++)
for (TDEIcon::Group i=TDEIcon::FirstGroup; i<TDEIcon::LastGroup; i++)
mAvSizes[i] = TQValueList<int>();
mTheme = TQString::null;
@ -262,17 +262,17 @@ void KIconConfig::read()
{
TQString tmp = mpConfig->readEntry(*it2 + "Effect");
if (tmp == "togray")
effect = KIconEffect::ToGray;
effect = TDEIconEffect::ToGray;
else if (tmp == "colorize")
effect = KIconEffect::Colorize;
effect = TDEIconEffect::Colorize;
else if (tmp == "togamma")
effect = KIconEffect::ToGamma;
effect = TDEIconEffect::ToGamma;
else if (tmp == "desaturate")
effect = KIconEffect::DeSaturate;
effect = TDEIconEffect::DeSaturate;
else if (tmp == "tomonochrome")
effect = KIconEffect::ToMonochrome;
effect = TDEIconEffect::ToMonochrome;
else if (tmp == "none")
effect = KIconEffect::NoEffect;
effect = TDEIconEffect::NoEffect;
else continue;
mEffects[i][j].type = effect;
mEffects[i][j].value = mpConfig->readDoubleNumEntry(*it2 + "Value");
@ -287,14 +287,14 @@ void KIconConfig::read()
mSysTraySize = mpSystrayConfig->readNumEntry("systrayIconWidth", 22);
mpKickerConfig->setGroup("General");
mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);
mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", TDEIcon::SizeLarge);
TDEConfigGroup g( TDEGlobal::config(), "KDE" );
mpRoundedCheck->setChecked(g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED));
mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT));
}
void KIconConfig::apply()
void TDEIconConfig::apply()
{
int i;
@ -332,7 +332,7 @@ void KIconConfig::apply()
int delta = 1000, dw, index = -1, size = 0, i;
TQValueList<int>::Iterator it;
mpSizeBox->clear();
if (mUsage < KIcon::LastGroup) {
if (mUsage < TDEIcon::LastGroup) {
for (it=mAvSizes[mUsage].begin(), i=0; it!=mAvSizes[mUsage].end(); ++it, i++)
{
mpSizeBox->insertItem(TQString().setNum(*it));
@ -355,31 +355,31 @@ void KIconConfig::apply()
}
}
void KIconConfig::preview(int i)
void TDEIconConfig::preview(int i)
{
// Apply effects ourselves because we don't want to sync
// the configuration every preview.
int viewedGroup;
if (mpUsageList->text(mUsage) == i18n("Panel Buttons")) {
viewedGroup = KIcon::FirstGroup;
viewedGroup = TDEIcon::FirstGroup;
}
else if (mpUsageList->text(mUsage) == i18n("System Tray Icons")) {
viewedGroup = KIcon::FirstGroup;
viewedGroup = TDEIcon::FirstGroup;
}
else {
viewedGroup = (mUsage == KIcon::LastGroup) ? KIcon::FirstGroup : mUsage;
viewedGroup = (mUsage == TDEIcon::LastGroup) ? TDEIcon::FirstGroup : mUsage;
}
TQPixmap pm;
if (mpUsageList->text(mUsage) == i18n("Panel Buttons")) {
pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mQuickLaunchSize);
pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mQuickLaunchSize);
}
else if (mpUsageList->text(mUsage) == i18n("System Tray Icons")) {
pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSysTraySize);
pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mSysTraySize);
}
else {
pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]);
pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mSizes[viewedGroup]);
}
TQImage img = pm.convertToImage();
if (mbDP[viewedGroup])
@ -396,32 +396,32 @@ void KIconConfig::preview(int i)
mpPreview[i]->setPixmap(pm);
}
void KIconConfig::preview()
void TDEIconConfig::preview()
{
preview(0);
preview(1);
preview(2);
}
void KIconConfig::load()
void TDEIconConfig::load()
{
load( false );
}
void KIconConfig::load( bool useDefaults )
void TDEIconConfig::load( bool useDefaults )
{
mpConfig = TDEGlobal::config();
mpConfig->setReadDefaults( useDefaults );
read();
apply();
for (int i=0; i<KIcon::LastGroup; i++)
for (int i=0; i<TDEIcon::LastGroup; i++)
mbChanged[i] = false;
preview();
emit changed( useDefaults );
}
void KIconConfig::save()
void TDEIconConfig::save()
{
int i, j;
TQStringList::ConstIterator it, it2;
@ -436,19 +436,19 @@ void KIconConfig::save()
TQString tmp;
switch (mEffects[i][j].type)
{
case KIconEffect::ToGray:
case TDEIconEffect::ToGray:
tmp = "togray";
break;
case KIconEffect::ToGamma:
case TDEIconEffect::ToGamma:
tmp = "togamma";
break;
case KIconEffect::Colorize:
case TDEIconEffect::Colorize:
tmp = "colorize";
break;
case KIconEffect::DeSaturate:
case TDEIconEffect::DeSaturate:
tmp = "desaturate";
break;
case KIconEffect::ToMonochrome:
case TDEIconEffect::ToMonochrome:
tmp = "tomonochrome";
break;
default:
@ -487,7 +487,7 @@ void KIconConfig::save()
emit changed(false);
// Emit KIPC change message.
for (int i=0; i<KIcon::LastGroup; i++)
for (int i=0; i<TDEIcon::LastGroup; i++)
{
if (mbChanged[i])
{
@ -503,16 +503,16 @@ void KIconConfig::save()
kapp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray());
}
void KIconConfig::defaults()
void TDEIconConfig::defaults()
{
load( true );
}
void KIconConfig::QLSizeLockedChanged(bool checked) {
void TDEIconConfig::QLSizeLockedChanged(bool checked) {
emit changed();
}
void KIconConfig::slotUsage(int index)
void TDEIconConfig::slotUsage(int index)
{
mUsage = index;
if (mpUsageList->text(index) == i18n("Panel Buttons")) {
@ -531,11 +531,11 @@ void KIconConfig::slotUsage(int index)
mPreviewButton2->setEnabled(false);
mPreviewButton3->setEnabled(false);
}
else if ( mUsage == KIcon::Panel || mUsage == KIcon::LastGroup )
else if ( mUsage == TDEIcon::Panel || mUsage == TDEIcon::LastGroup )
{
mpSizeBox->setEnabled(false);
mpDPCheck->setEnabled(false);
mpAnimatedCheck->setEnabled( mUsage == KIcon::Panel );
mpAnimatedCheck->setEnabled( mUsage == TDEIcon::Panel );
mPreviewButton1->setEnabled(true);
mPreviewButton2->setEnabled(true);
mPreviewButton3->setEnabled(true);
@ -544,7 +544,7 @@ void KIconConfig::slotUsage(int index)
{
mpSizeBox->setEnabled(true);
mpDPCheck->setEnabled(true);
mpAnimatedCheck->setEnabled( mUsage == KIcon::Desktop );
mpAnimatedCheck->setEnabled( mUsage == TDEIcon::Desktop );
mPreviewButton1->setEnabled(true);
mPreviewButton2->setEnabled(true);
mPreviewButton3->setEnabled(true);
@ -554,9 +554,9 @@ void KIconConfig::slotUsage(int index)
preview();
}
void KIconConfig::EffectSetup(int state)
void TDEIconConfig::EffectSetup(int state)
{
int viewedGroup = (mUsage == KIcon::LastGroup) ? KIcon::FirstGroup : mUsage;
int viewedGroup = (mUsage == TDEIcon::LastGroup) ? TDEIcon::FirstGroup : mUsage;
if (mpUsageList->currentText() == i18n("Panel Buttons")) {
return;
@ -565,7 +565,7 @@ void KIconConfig::EffectSetup(int state)
return;
}
TQPixmap pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]);
TQPixmap pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mSizes[viewedGroup]);
TQImage img = pm.convertToImage();
if (mbDP[viewedGroup])
{
@ -581,12 +581,12 @@ void KIconConfig::EffectSetup(int state)
case 2 : caption = i18n("Setup Disabled Icon Effect"); break;
}
KIconEffectSetupDialog dlg(mEffects[viewedGroup][state], mDefaultEffect[state], caption, img);
TDEIconEffectSetupDialog dlg(mEffects[viewedGroup][state], mDefaultEffect[state], caption, img);
if (dlg.exec() == TQDialog::Accepted)
{
if (mUsage == KIcon::LastGroup) {
for (int i=0; i<KIcon::LastGroup; i++)
if (mUsage == TDEIcon::LastGroup) {
for (int i=0; i<TDEIcon::LastGroup; i++)
mEffects[i][state] = dlg.effect();
} else {
mEffects[mUsage][state] = dlg.effect();
@ -597,8 +597,8 @@ void KIconConfig::EffectSetup(int state)
emit changed(true);
if (mUsage == KIcon::LastGroup) {
for (int i=0; i<KIcon::LastGroup; i++)
if (mUsage == TDEIcon::LastGroup) {
for (int i=0; i<TDEIcon::LastGroup; i++)
mbChanged[i] = true;
} else {
mbChanged[mUsage] = true;
@ -607,7 +607,7 @@ void KIconConfig::EffectSetup(int state)
preview(state);
}
void KIconConfig::slotSize(int index)
void TDEIconConfig::slotSize(int index)
{
if (mpUsageList->currentText() == i18n("Panel Buttons")) {
mQuickLaunchSize = mpSizeBox->currentText().toInt();
@ -620,7 +620,7 @@ void KIconConfig::slotSize(int index)
emit changed(true);
}
else {
Q_ASSERT(mUsage < KIcon::LastGroup);
Q_ASSERT(mUsage < TDEIcon::LastGroup);
mSizes[mUsage] = mAvSizes[mUsage][index];
preview();
emit changed(true);
@ -628,9 +628,9 @@ void KIconConfig::slotSize(int index)
}
}
void KIconConfig::slotDPCheck(bool check)
void TDEIconConfig::slotDPCheck(bool check)
{
Q_ASSERT(mUsage < KIcon::LastGroup);
Q_ASSERT(mUsage < TDEIcon::LastGroup);
if (mbDP[mUsage] != check)
{
mbDP[mUsage] = check;
@ -641,9 +641,9 @@ void KIconConfig::slotDPCheck(bool check)
}
void KIconConfig::slotAnimatedCheck(bool check)
void TDEIconConfig::slotAnimatedCheck(bool check)
{
Q_ASSERT(mUsage < KIcon::LastGroup);
Q_ASSERT(mUsage < TDEIcon::LastGroup);
if (mbAnimated[mUsage] != check)
{
mbAnimated[mUsage] = check;
@ -652,17 +652,17 @@ void KIconConfig::slotAnimatedCheck(bool check)
}
}
void KIconConfig::slotRoundedCheck(bool check)
void TDEIconConfig::slotRoundedCheck(bool check)
{
emit changed(true);
}
void KIconConfig::slotActiveEffect(bool check)
void TDEIconConfig::slotActiveEffect(bool check)
{
emit changed(true);
}
KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
const Effect &defaultEffect,
const TQString &caption, const TQImage &image,
TQWidget *parent, char *name)
@ -672,7 +672,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
mDefaultEffect(defaultEffect),
mExample(image)
{
mpEffect = new KIconEffect;
mpEffect = new TDEIconEffect;
TQLabel *lbl;
TQGroupBox *frame;
@ -749,67 +749,67 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
preview();
}
KIconEffectSetupDialog::~KIconEffectSetupDialog()
TDEIconEffectSetupDialog::~TDEIconEffectSetupDialog()
{
delete mpEffect;
}
void KIconEffectSetupDialog::init()
void TDEIconEffectSetupDialog::init()
{
mpEffectBox->setCurrentItem(mEffect.type);
mpEffectSlider->setEnabled(mEffect.type != KIconEffect::NoEffect);
mpEColButton->setEnabled(mEffect.type == KIconEffect::Colorize || mEffect.type == KIconEffect::ToMonochrome);
mpECol2Button->setEnabled(mEffect.type == KIconEffect::ToMonochrome);
mpEffectSlider->setEnabled(mEffect.type != TDEIconEffect::NoEffect);
mpEColButton->setEnabled(mEffect.type == TDEIconEffect::Colorize || mEffect.type == TDEIconEffect::ToMonochrome);
mpECol2Button->setEnabled(mEffect.type == TDEIconEffect::ToMonochrome);
mpEffectSlider->setValue((int) (100.0 * mEffect.value + 0.5));
mpEColButton->setColor(mEffect.color);
mpECol2Button->setColor(mEffect.color2);
mpSTCheck->setChecked(mEffect.transparant);
}
void KIconEffectSetupDialog::slotEffectValue(int value)
void TDEIconEffectSetupDialog::slotEffectValue(int value)
{
mEffect.value = 0.01 * value;
preview();
}
void KIconEffectSetupDialog::slotEffectColor(const TQColor &col)
void TDEIconEffectSetupDialog::slotEffectColor(const TQColor &col)
{
mEffect.color = col;
preview();
}
void KIconEffectSetupDialog::slotEffectColor2(const TQColor &col)
void TDEIconEffectSetupDialog::slotEffectColor2(const TQColor &col)
{
mEffect.color2 = col;
preview();
}
void KIconEffectSetupDialog::slotEffectType(int type)
void TDEIconEffectSetupDialog::slotEffectType(int type)
{
mEffect.type = type;
mpEffectGroup->setEnabled(mEffect.type != KIconEffect::NoEffect);
mpEffectSlider->setEnabled(mEffect.type != KIconEffect::NoEffect);
mpEffectColor->setEnabled(mEffect.type == KIconEffect::Colorize || mEffect.type == KIconEffect::ToMonochrome);
mpEColButton->setEnabled(mEffect.type == KIconEffect::Colorize || mEffect.type == KIconEffect::ToMonochrome);
mpEffectColor2->setEnabled(mEffect.type == KIconEffect::ToMonochrome);
mpECol2Button->setEnabled(mEffect.type == KIconEffect::ToMonochrome);
mpEffectGroup->setEnabled(mEffect.type != TDEIconEffect::NoEffect);
mpEffectSlider->setEnabled(mEffect.type != TDEIconEffect::NoEffect);
mpEffectColor->setEnabled(mEffect.type == TDEIconEffect::Colorize || mEffect.type == TDEIconEffect::ToMonochrome);
mpEColButton->setEnabled(mEffect.type == TDEIconEffect::Colorize || mEffect.type == TDEIconEffect::ToMonochrome);
mpEffectColor2->setEnabled(mEffect.type == TDEIconEffect::ToMonochrome);
mpECol2Button->setEnabled(mEffect.type == TDEIconEffect::ToMonochrome);
preview();
}
void KIconEffectSetupDialog::slotSTCheck(bool b)
void TDEIconEffectSetupDialog::slotSTCheck(bool b)
{
mEffect.transparant = b;
preview();
}
void KIconEffectSetupDialog::slotDefault()
void TDEIconEffectSetupDialog::slotDefault()
{
mEffect = mDefaultEffect;
init();
preview();
}
void KIconEffectSetupDialog::preview()
void TDEIconEffectSetupDialog::preview()
{
TQPixmap pm;
TQImage img = mExample.copy();

26
kcontrol/icons/icons.h
Unescape Escape View File

@ -36,9 +36,9 @@ class TQWidget;
class KColorButton;
class TDEConfig;
class KIconEffect;
class KIconLoader;
class KIconTheme;
class TDEIconEffect;
class TDEIconLoader;
class TDEIconTheme;
struct Effect
{
@ -53,13 +53,13 @@ struct Effect
/**
* The General Icons tab in kcontrol.
*/
class KIconConfig: public TDECModule
class TDEIconConfig: public TDECModule
{
Q_OBJECT
public:
KIconConfig(TQWidget *parent, const char *name=0);
~KIconConfig();
TDEIconConfig(TQWidget *parent, const char *name=0);
~TDEIconConfig();
virtual void load();
virtual void load( bool useDefaults );
@ -103,9 +103,9 @@ private:
int mSysTraySize;
int mQuickLaunchSize;
KIconEffect *mpEffect;
KIconTheme *mpTheme;
KIconLoader *mpLoader;
TDEIconEffect *mpEffect;
TDEIconTheme *mpTheme;
TDEIconLoader *mpLoader;
TDEConfig *mpConfig;
KSimpleConfig *mpSystrayConfig;
KSimpleConfig *mpKickerConfig;
@ -121,15 +121,15 @@ private:
TQPushButton *mPreviewButton1, *mPreviewButton2, *mPreviewButton3;
};
class KIconEffectSetupDialog: public KDialogBase
class TDEIconEffectSetupDialog: public KDialogBase
{
Q_OBJECT
public:
KIconEffectSetupDialog(const Effect &, const Effect &,
TDEIconEffectSetupDialog(const Effect &, const Effect &,
const TQString &, const TQImage &,
TQWidget *parent=0L, char *name=0L);
~KIconEffectSetupDialog();
~TDEIconEffectSetupDialog();
Effect effect() { return mEffect; }
protected:
@ -145,7 +145,7 @@ protected slots:
void slotDefault();
private:
KIconEffect *mpEffect;
TDEIconEffect *mpEffect;
TQListBox *mpEffectBox;
TQCheckBox *mpSTCheck;
TQSlider *mpEffectSlider;

48
kcontrol/icons/iconthemes.cpp
Unescape Escape View File

@ -124,13 +124,13 @@ void IconThemesConfig::loadThemes()
{
m_iconThemes->clear();
m_themeNames.clear();
TQStringList themelist(KIconTheme::list());
TQStringList themelist(TDEIconTheme::list());
TQString name;
TQString tname;
TQStringList::Iterator it;
for (it=themelist.begin(); it != themelist.end(); ++it)
{
KIconTheme icontheme(*it);
TDEIconTheme icontheme(*it);
if (!icontheme.isValid()) kdDebug() << "notvalid\n";
if (icontheme.isHidden()) continue;
@ -194,7 +194,7 @@ void IconThemesConfig::installNewTheme()
TDEGlobal::instance()->newIconLoader();
loadThemes();
TQListViewItem *item=iconThemeItem(KIconTheme::current());
TQListViewItem *item=iconThemeItem(TDEIconTheme::current());
m_iconThemes->setSelected(item, true);
updateRemoveButton();
}
@ -289,12 +289,12 @@ void IconThemesConfig::removeSelectedTheme()
"This will delete the files installed by this theme.</qt>").
arg(selected->text(0));
bool deletingCurrentTheme=(selected==iconThemeItem(KIconTheme::current()));
bool deletingCurrentTheme=(selected==iconThemeItem(TDEIconTheme::current()));
int r=KMessageBox::warningContinueCancel(this,question,i18n("Confirmation"),KStdGuiItem::del());
if (r!=KMessageBox::Continue) return;
KIconTheme icontheme(m_themeNames[selected->text(0)]);
TDEIconTheme icontheme(m_themeNames[selected->text(0)]);
// delete the index file before the async TDEIO::del so loadThemes() will
// ignore that dir.
@ -309,9 +309,9 @@ void IconThemesConfig::removeSelectedTheme()
TQListViewItem *item=0L;
//Fallback to the default if we've deleted the current theme
if (!deletingCurrentTheme)
item=iconThemeItem(KIconTheme::current());
item=iconThemeItem(TDEIconTheme::current());
if (!item)
item=iconThemeItem(KIconTheme::defaultThemeName());
item=iconThemeItem(TDEIconTheme::defaultThemeName());
m_iconThemes->setSelected(item, true);
updateRemoveButton();
@ -326,12 +326,12 @@ void IconThemesConfig::updateRemoveButton()
bool enabled = false;
if (selected)
{
KIconTheme icontheme(m_themeNames[selected->text(0)]);
TDEIconTheme icontheme(m_themeNames[selected->text(0)]);
TQFileInfo fi(icontheme.dir());
enabled = fi.isWritable();
// Don't let users remove the current theme.
if(m_themeNames[selected->text(0)] == KIconTheme::current() ||
m_themeNames[selected->text(0)] == KIconTheme::defaultThemeName())
if(m_themeNames[selected->text(0)] == TDEIconTheme::current() ||
m_themeNames[selected->text(0)] == TDEIconTheme::defaultThemeName())
enabled = false;
}
m_removeButton->setEnabled(enabled);
@ -343,20 +343,20 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
KSVGIconEngine engine;
#endif
TQString dirName(m_themeNames[item->text(0)]);
KIconTheme icontheme(dirName);
TDEIconTheme icontheme(dirName);
if (!icontheme.isValid()) kdDebug() << "notvalid\n";
updateRemoveButton();
const int size = icontheme.defaultSize(KIcon::Desktop);
const int size = icontheme.defaultSize(TDEIcon::Desktop);
KIcon icon=icontheme.iconPath("exec.png", size, KIcon::MatchBest);
TDEIcon icon=icontheme.iconPath("exec.png", size, TDEIcon::MatchBest);
if (!icon.isValid()) {
#ifdef HAVE_LIBART
icon=icontheme.iconPath("exec.svg", size, KIcon::MatchBest);
icon=icontheme.iconPath("exec.svg", size, TDEIcon::MatchBest);
if(engine.load(size, size, icon.path))
m_previewExec->setPixmap(*engine.image());
else {
icon=icontheme.iconPath("exec.svgz", size, KIcon::MatchBest);
icon=icontheme.iconPath("exec.svgz", size, TDEIcon::MatchBest);
if(engine.load(size, size, icon.path))
m_previewExec->setPixmap(*engine.image());
}
@ -365,14 +365,14 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
else
m_previewExec->setPixmap(TQPixmap(icon.path));
icon=icontheme.iconPath("folder.png",size,KIcon::MatchBest);
icon=icontheme.iconPath("folder.png",size,TDEIcon::MatchBest);
if (!icon.isValid()) {
#ifdef HAVE_LIBART
icon=icontheme.iconPath("folder.svg", size, KIcon::MatchBest);
icon=icontheme.iconPath("folder.svg", size, TDEIcon::MatchBest);
if(engine.load(size, size, icon.path))
m_previewFolder->setPixmap(*engine.image());
else {
icon=icontheme.iconPath("folder.svgz", size, KIcon::MatchBest);
icon=icontheme.iconPath("folder.svgz", size, TDEIcon::MatchBest);
if(engine.load(size, size, icon.path))
m_previewFolder->setPixmap(*engine.image());
}
@ -381,14 +381,14 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
else
m_previewFolder->setPixmap(TQPixmap(icon.path));
icon=icontheme.iconPath("txt.png",size,KIcon::MatchBest);
icon=icontheme.iconPath("txt.png",size,TDEIcon::MatchBest);
if (!icon.isValid()) {
#ifdef HAVE_LIBART
icon=icontheme.iconPath("txt.svg", size, KIcon::MatchBest);
icon=icontheme.iconPath("txt.svg", size, TDEIcon::MatchBest);
if(engine.load(size, size, icon.path))
m_previewDocument->setPixmap(*engine.image());
else {
icon=icontheme.iconPath("txt.svgz", size, KIcon::MatchBest);
icon=icontheme.iconPath("txt.svgz", size, TDEIcon::MatchBest);
if(engine.load(size, size, icon.path))
m_previewDocument->setPixmap(*engine.image());
}
@ -403,7 +403,7 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
void IconThemesConfig::load()
{
m_defaultTheme=iconThemeItem(KIconTheme::current());
m_defaultTheme=iconThemeItem(TDEIconTheme::current());
m_iconThemes->setSelected(m_defaultTheme, true);
updateRemoveButton();
@ -424,10 +424,10 @@ void IconThemesConfig::save()
config->writeEntry("Theme", m_themeNames[selected->text(0)]);
delete config;
KIconTheme::reconfigure();
TDEIconTheme::reconfigure();
emit changed(false);
for (int i=0; i<KIcon::LastGroup; i++)
for (int i=0; i<TDEIcon::LastGroup; i++)
{
KIPC::sendMessageAll(KIPC::IconChanged, i);
}

2
kcontrol/icons/main.cpp
Unescape Escape View File

@ -47,7 +47,7 @@ IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
tab->addTab(tab1, i18n("&Theme"));
connect(tab1, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
tab2 = new KIconConfig(this, "effects");
tab2 = new TDEIconConfig(this, "effects");
tab->addTab(tab2, i18n("Ad&vanced"));
connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));

2
kcontrol/icons/testicons.cpp
Unescape Escape View File

@ -6,7 +6,7 @@
int main(int argc, char **argv)
{
TDEApplication app(argc, argv, "testicons");
KIconConfig *w = new KIconConfig(0L, "testicons");
TDEIconConfig *w = new TDEIconConfig(0L, "testicons");
app.setMainWidget(w);
w->show();
return app.exec();

4
kcontrol/joystick/joywidget.cpp
Unescape Escape View File

@ -54,8 +54,8 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
messageBox = new TQHBox(mainVbox);
messageBox->setSpacing(KDialog::spacingHint());
TQLabel *icon = new TQLabel(messageBox);
icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup,
KIcon::SizeMedium, KIcon::DefaultState, 0, true));
icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup,
TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true));
icon->setFixedSize(icon->sizeHint());
message = new TQLabel(messageBox);
messageBox->hide();

6
kcontrol/kcontrol/aboutwidget.cpp
Unescape Escape View File

@ -150,10 +150,10 @@ void AboutWidget::updatePixmap()
}
else
{
KIconLoader *loader = TDEGlobal::instance()->iconLoader();
TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
TQString iconPath;
if (!_icon.isEmpty()) {
iconPath = loader->iconPath( _icon, KIcon::Toolbar );
iconPath = loader->iconPath( _icon, TDEIcon::Toolbar );
content += "<div id=\"tableTitle\"><img src=\"" + iconPath +" \"</a>&nbsp;" + _caption + "</div>";
}
@ -171,7 +171,7 @@ void AboutWidget::updatePixmap()
{
szName = module->moduleName();
szComment = module->comment();
iconPath = loader->iconPath( module->icon(), KIcon::Small );
iconPath = loader->iconPath( module->icon(), TDEIcon::Small );
content += "<img src=\"" + iconPath +" \"</a>&nbsp;<a href=\"%1\" class=\"kcm_link\">" + szName + "</a></td><td class=\"kc_rightcol\">" + szComment;
KURL moduleURL( TQString("kcm://%1").arg(TQString().sprintf("%p",module)) );

4
kcontrol/kcontrol/dockcontainer.cpp
Unescape Escape View File

@ -83,8 +83,8 @@ void ModuleTitle::showTitleFor( ConfigModule *config )
TQWhatsThis::remove( this );
TQWhatsThis::add( this, config->comment() );
KIconLoader *loader = TDEGlobal::instance()->iconLoader();
TQPixmap icon = loader->loadIcon( config->icon(), KIcon::NoGroup, 22 );
TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
TQPixmap icon = loader->loadIcon( config->icon(), TDEIcon::NoGroup, 22 );
m_icon->setPixmap( icon );
m_name->setText( config->moduleName() );

2
kcontrol/kcontrol/global.cpp
Unescape Escape View File

@ -42,7 +42,7 @@ TQString KCGlobal::_irelease = "";
TQString KCGlobal::_iversion = "";
TQString KCGlobal::_imachine = "";
IndexViewMode KCGlobal::_viewmode = Icon;
KIcon::StdSizes KCGlobal::_iconsize = KIcon::SizeMedium;
TDEIcon::StdSizes KCGlobal::_iconsize = TDEIcon::SizeMedium;
TQString KCGlobal::_baseGroup = "";
void KCGlobal::init()

6
kcontrol/kcontrol/global.h
Unescape Escape View File

@ -45,7 +45,7 @@ public:
static TQString systemVersion() { return _iversion; }
static TQString systemMachine() { return _imachine; }
static IndexViewMode viewMode() { return _viewmode; }
static KIcon::StdSizes iconSize() { return _iconsize; }
static TDEIcon::StdSizes iconSize() { return _iconsize; }
static TQString baseGroup();
static void setIsInfoCenter(bool b) { _infocenter = b; }
@ -59,7 +59,7 @@ public:
static void setSystemVersion(const TQString& n){ _iversion = n; }
static void setSystemMachine(const TQString& n){ _imachine = n; }
static void setViewMode(IndexViewMode m) { _viewmode = m; }
static void setIconSize(KIcon::StdSizes s) { _iconsize = s; }
static void setIconSize(TDEIcon::StdSizes s) { _iconsize = s; }
static void repairAccels( TQWidget * tw );
@ -69,7 +69,7 @@ private:
static TQStringList _types;
static TQString _uname, _hname, _isystem, _irelease, _iversion, _imachine, _tdeversion;
static IndexViewMode _viewmode;
static KIcon::StdSizes _iconsize;
static TDEIcon::StdSizes _iconsize;
static TQString _baseGroup;
};

4
kcontrol/kcontrol/modulemenu.cpp
Unescape Escape View File

@ -72,7 +72,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
TQString name = group->caption();
name.replace("&", "&&");
parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(group->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall)
, name, menu);
fill(menu, path);
@ -87,7 +87,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
TQString name = module->moduleName();
name.replace("&", "&&");
int realid = parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
int realid = parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(module->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall)
, name, id);
_moduleDict.insert(realid, module);

8
kcontrol/kcontrol/moduletreeview.cpp
Unescape Escape View File

@ -38,12 +38,12 @@
static TQPixmap appIcon(const TQString &iconName)
{
TQString path;
TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true);
// make sure they are not larger than KIcon::SizeSmall
if (normal.width() > KIcon::SizeSmall || normal.height() > KIcon::SizeSmall)
TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::Small, 0, TDEIcon::DefaultState, &path, true);
// make sure they are not larger than TDEIcon::SizeSmall
if (normal.width() > TDEIcon::SizeSmall || normal.height() > TDEIcon::SizeSmall)
{
TQImage tmp = normal.convertToImage();
tmp = tmp.smoothScale(KIcon::SizeSmall, KIcon::SizeSmall);
tmp = tmp.smoothScale(TDEIcon::SizeSmall, TDEIcon::SizeSmall);
normal.convertFromImage(tmp);
}
return normal;

2
kcontrol/kcontrol/searchwidget.cpp
Unescape Escape View File

@ -39,7 +39,7 @@ class ModuleItem : public TQListBoxPixmap
public:
ModuleItem(ConfigModule *module, TQListBox * listbox = 0) :
TQListBoxPixmap(listbox,
TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall),
TDEGlobal::iconLoader()->loadIcon(module->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall),
module->moduleName())
, m_module(module)
{

32
kcontrol/kcontrol/toplevel.cpp
Unescape Escape View File

@ -68,13 +68,13 @@ TopLevel::TopLevel(const char* name)
TQString size = config->readEntry("IconSize", "Medium");
if (size == "Small")
KCGlobal::setIconSize(KIcon::SizeSmall);
KCGlobal::setIconSize(TDEIcon::SizeSmall);
else if (size == "Large")
KCGlobal::setIconSize(KIcon::SizeLarge);
KCGlobal::setIconSize(TDEIcon::SizeLarge);
else if (size == "Huge")
KCGlobal::setIconSize(KIcon::SizeHuge);
KCGlobal::setIconSize(TDEIcon::SizeHuge);
else
KCGlobal::setIconSize(KIcon::SizeMedium);
KCGlobal::setIconSize(TDEIcon::SizeMedium);
// initialize the entries
_modules = new ConfigModuleList();
@ -182,8 +182,8 @@ TopLevel::TopLevel(const char* name)
TQT_SLOT( activateModule( ConfigModule * ) ) );
_dock->setBaseWidget( aw );
KWin::setIcons( winId(),
TDEGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 32 ),
TDEGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 16 ) );
TDEGlobal::iconLoader()->loadIcon("hwinfo", TDEIcon::NoGroup, 32 ),
TDEGlobal::iconLoader()->loadIcon("hwinfo", TDEIcon::NoGroup, 16 ) );
}
else
{
@ -205,13 +205,13 @@ TopLevel::~TopLevel()
switch (KCGlobal::iconSize())
{
case KIcon::SizeSmall:
case TDEIcon::SizeSmall:
config->writeEntry("IconSize", "Small");
break;
case KIcon::SizeLarge:
case TDEIcon::SizeLarge:
config->writeEntry("IconSize", "Large");
break;
case KIcon::SizeHuge:
case TDEIcon::SizeHuge:
config->writeEntry("IconSize", "Huge");
break;
default:
@ -295,13 +295,13 @@ void TopLevel::activateIconView()
switch(KCGlobal::iconSize())
{
case KIcon::SizeSmall:
case TDEIcon::SizeSmall:
icon_small->setChecked(true);
break;
case KIcon::SizeLarge:
case TDEIcon::SizeLarge:
icon_large->setChecked(true);
break;
case KIcon::SizeHuge:
case TDEIcon::SizeHuge:
icon_huge->setChecked(true);
break;
default:
@ -323,25 +323,25 @@ void TopLevel::activateTreeView()
void TopLevel::activateSmallIcons()
{
KCGlobal::setIconSize(KIcon::SizeSmall);
KCGlobal::setIconSize(TDEIcon::SizeSmall);
_index->reload();
}
void TopLevel::activateMediumIcons()
{
KCGlobal::setIconSize(KIcon::SizeMedium);
KCGlobal::setIconSize(TDEIcon::SizeMedium);
_index->reload();
}
void TopLevel::activateLargeIcons()
{
KCGlobal::setIconSize(KIcon::SizeLarge);
KCGlobal::setIconSize(TDEIcon::SizeLarge);
_index->reload();
}
void TopLevel::activateHugeIcons()
{
KCGlobal::setIconSize(KIcon::SizeHuge);
KCGlobal::setIconSize(TDEIcon::SizeHuge);
_index->reload();
}

12
kcontrol/kicker/menutab_impl.cpp
Unescape Escape View File

@ -84,13 +84,13 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
//connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged()));
connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged()));
KIconLoader * ldr = TDEGlobal::iconLoader();
TDEIconLoader * ldr = TDEGlobal::iconLoader();
TQPixmap kmenu_icon;
m_kmenu_icon = KickerSettings::customKMenuIcon();
if (m_kmenu_icon.isNull() == true) {
m_kmenu_icon = TQString("kmenu");
}
kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
kmenu_icon = ldr->loadIcon(m_kmenu_icon, TDEIcon::Small, TDEIcon::SizeSmall);
btnCustomKMenuIcon->setPixmap(kmenu_icon);
TDEConfig *config;
@ -306,15 +306,15 @@ void MenuTab::launchMenuEditor()
void MenuTab::launchIconEditor()
{
KIconDialog dlg(this);
TQString newIcon = dlg.selectIcon(KIcon::Small, KIcon::Application);
TDEIconDialog dlg(this);
TQString newIcon = dlg.selectIcon(TDEIcon::Small, TDEIcon::Application);
if (newIcon.isEmpty())
return;
m_kmenu_icon = newIcon;
KIconLoader * ldr = TDEGlobal::iconLoader();
TDEIconLoader * ldr = TDEGlobal::iconLoader();
TQPixmap kmenu_icon;
kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
kmenu_icon = ldr->loadIcon(m_kmenu_icon, TDEIcon::Small, TDEIcon::SizeSmall);
btnCustomKMenuIcon->setPixmap(kmenu_icon);
m_kmenu_button_changed = true;

2
kcontrol/konsole/sessiondialog.ui
Unescape Escape View File

@ -180,7 +180,7 @@
</widget>
</grid>
</widget>
<widget class="KIconButton" row="0" column="1">
<widget class="TDEIconButton" row="0" column="1">
<property name="name">
<cstring>previewIcon</cstring>
</property>

4
kcontrol/kthememanager/ktheme.cpp
Unescape Escape View File

@ -187,7 +187,7 @@ TQString KTheme::createYourself( bool pack )
// 3. Icons
globalConf->setGroup( "Icons" );
TQDomElement iconElem = m_dom.createElement( "icons" );
iconElem.setAttribute( "name", globalConf->readEntry( "Theme",KIconTheme::current() ) );
iconElem.setAttribute( "name", globalConf->readEntry( "Theme",TDEIconTheme::current() ) );
createIconElems( "DesktopIcons", "desktop", iconElem, globalConf );
createIconElems( "MainToolbarIcons", "mainToolbar", iconElem, globalConf );
createIconElems( "PanelIcons", "panel", iconElem, globalConf );
@ -483,7 +483,7 @@ void KTheme::apply()
}
iconConf->sync();
for ( int i = 0; i < KIcon::LastGroup; i++ )
for ( int i = 0; i < TDEIcon::LastGroup; i++ )
KIPC::sendMessageAll( KIPC::IconChanged, i );
KService::rebuildKSycoca( m_parent );
}

16
kcontrol/kthememanager/kthememanager.cpp
Unescape Escape View File

@ -385,20 +385,20 @@ void kthememanager::queryLNFModules()
if ( p->isType( KST_KService ) )
{
KService *s = static_cast<KService *>( p );
( void ) new KThemeDetailsItem( dlg->lvDetails, s->name(), s->pixmap( KIcon::Desktop ), s->exec() );
( void ) new KThemeDetailsItem( dlg->lvDetails, s->name(), s->pixmap( TDEIcon::Desktop ), s->exec() );
}
}
dlg->lvDetails->sort();*/
// For now use a static list
KIconLoader * il = TDEGlobal::iconLoader();
dlg->btnBackground->setIconSet( il->loadIconSet( "background", KIcon::Desktop, 32 ) );
dlg->btnColors->setIconSet( il->loadIconSet( "colorscm", KIcon::Desktop, 32 ) );
dlg->btnStyle->setIconSet( il->loadIconSet( "style", KIcon::Desktop, 32 ) );
dlg->btnIcons->setIconSet( il->loadIconSet( "icons", KIcon::Desktop, 32 ) );
dlg->btnFonts->setIconSet( il->loadIconSet( "fonts", KIcon::Desktop, 32 ) );
dlg->btnSaver->setIconSet( il->loadIconSet( "tdescreensaver", KIcon::Desktop, 32 ) );
TDEIconLoader * il = TDEGlobal::iconLoader();
dlg->btnBackground->setIconSet( il->loadIconSet( "background", TDEIcon::Desktop, 32 ) );
dlg->btnColors->setIconSet( il->loadIconSet( "colorscm", TDEIcon::Desktop, 32 ) );
dlg->btnStyle->setIconSet( il->loadIconSet( "style", TDEIcon::Desktop, 32 ) );
dlg->btnIcons->setIconSet( il->loadIconSet( "icons", TDEIcon::Desktop, 32 ) );
dlg->btnFonts->setIconSet( il->loadIconSet( "fonts", TDEIcon::Desktop, 32 ) );
dlg->btnSaver->setIconSet( il->loadIconSet( "tdescreensaver", TDEIcon::Desktop, 32 ) );
}
void kthememanager::updatePreview( const TQString & pixFile )

8
kcontrol/kthememanager/kthememanager.h
Unescape Escape View File

@ -34,13 +34,13 @@ class TDEAboutData;
#define ORIGINAL_THEME "original" // no i18n() here!!!
/*
class KIconViewItem;
class TDEIconViewItem;
class KThemeDetailsItem: public KIconViewItem
class KThemeDetailsItem: public TDEIconViewItem
{
public:
KThemeDetailsItem( KIconView * parent, const TQString & text, const TQPixmap & icon, const TQString & execString )
: KIconViewItem( parent, text, icon ) { m_exec = execString; }
KThemeDetailsItem( TDEIconView * parent, const TQString & text, const TQPixmap & icon, const TQString & execString )
: TDEIconViewItem( parent, text, icon ) { m_exec = execString; }
virtual ~KThemeDetailsItem() { };
void exec() {

4
kcontrol/locale/kcmlocale.cpp
Unescape Escape View File

@ -356,7 +356,7 @@ void TDELocaleConfig::loadCountryList()
.arg(tag) ) );
TQIconSet icon;
if ( !map.isNull() )
icon = TDEGlobal::iconLoader()->loadIconSet(map, KIcon::Small);
icon = TDEGlobal::iconLoader()->loadIconSet(map, TDEIcon::Small);
m_comboCountry->insertSubmenu( icon, name, tag, sub, -2 );
}
@ -383,7 +383,7 @@ void TDELocaleConfig::loadCountryList()
TQString flag( locate( "locale",
TQString::fromLatin1( "l10n/%1/flag.png" )
.arg(tag) ) );
TQIconSet icon( TDEGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
TQIconSet icon( TDEGlobal::iconLoader()->loadIconSet(flag, TDEIcon::Small) );
m_comboCountry->insertItem( icon, name, tag, submenu, menu_index );
}

4
kcontrol/style/menupreview.cpp
Unescape Escape View File

@ -82,8 +82,8 @@ void MenuPreview::createPixmaps()
(x % 2) ?
((y % 2) ? c2 : c1 ) : // See the grid? ;-)
((y % 2) ? c1 : c2 ) );
KIconLoader* icl = TDEGlobal::iconLoader();
TQPixmap pix = icl->loadIcon("go", KIcon::Desktop, KIcon::SizeLarge, KIcon::ActiveState);
TDEIconLoader* icl = TDEGlobal::iconLoader();
TQPixmap pix = icl->loadIcon("go", TDEIcon::Desktop, TDEIcon::SizeLarge, TDEIcon::ActiveState);
p.drawPixmap( (width()-2-pix.width())/2, (height()-2-pix.height())/2, pix );
}

8
kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
Unescape Escape View File

@ -260,7 +260,7 @@ void CKFileFontView::updateView(bool b)
{
CFontListViewItem *item=static_cast<CFontListViewItem *>(it.current());
item->setPixmap(0, item->fileInfo()->pixmap(KIcon::SizeSmall));
item->setPixmap(0, item->fileInfo()->pixmap(TDEIcon::SizeSmall));
}
}
}
@ -475,9 +475,9 @@ TQDragObject *CKFileFontView::dragObject()
urls.append( (*it)->url() );
if(urls.count()> 1)
pixmap = DesktopIcon("tdemultiple", KIcon::SizeSmall);
pixmap = DesktopIcon("tdemultiple", TDEIcon::SizeSmall);
if(pixmap.isNull())
pixmap = currentFileItem()->pixmap(KIcon::SizeSmall);
pixmap = currentFileItem()->pixmap(TDEIcon::SizeSmall);
hotspot.setX(pixmap.width() / 2);
hotspot.setY(pixmap.height() / 2);
@ -629,7 +629,7 @@ void CKFileFontView::writeConfig(TDEConfig *kc, const TQString &group)
void CFontListViewItem::init()
{
CFontListViewItem::setPixmap(COL_NAME, itsInf->pixmap(KIcon::SizeSmall));
CFontListViewItem::setPixmap(COL_NAME, itsInf->pixmap(TDEIcon::SizeSmall));
setText(COL_NAME, itsInf->text());
setText(COL_SIZE, itsInf->isDir() ? "" : TDEGlobal::locale()->formatNumber(itsInf->size(), 0));

2
kcontrol/tdeio/kmanualproxydlg.cpp
Unescape Escape View File

@ -49,7 +49,7 @@ KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name )
mDlg = new ManualProxyDlgUI (this);
setMainWidget( mDlg );
mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) );
mDlg->pbCopyDown->setPixmap( BarIcon("down", TDEIcon::SizeSmall) );
TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed,
mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() );
mDlg->pbCopyDown->setSizePolicy( sizePolicy );

2
kcontrol/tdm/tdm-appear.cpp
Unescape Escape View File

@ -462,7 +462,7 @@ void TDMAppearanceWidget::save()
config->writeEntry("LogoArea", noneRadio->isChecked() ? "None" :
logoRadio->isChecked() ? "Logo" : "Clock" );
config->writeEntry("LogoPixmap", TDEGlobal::iconLoader()->iconPath(logopath, KIcon::Desktop, true));
config->writeEntry("LogoPixmap", TDEGlobal::iconLoader()->iconPath(logopath, TDEIcon::Desktop, true));
config->writeEntry("Compositor", compositorcombo->currentId());

2
kdcop/kdcopwindow.cpp
Unescape Escape View File

@ -114,7 +114,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
{
setExpandable(true);
setText(0, TQString::fromUtf8(app_));
setPixmap(0, TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small ));
setPixmap(0, TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), TDEIcon::Small ));
/* Get the icon: we use the icon from a mainwindow in that class.

2
kdepasswd/kcm/chfacedlg.cpp
Unescape Escape View File

@ -63,7 +63,7 @@ ChFaceDlg::ChFaceDlg(const TQString& picsdir, TQWidget *parent, const char *name
TQLabel *header = new TQLabel( i18n("Select a new face:"), page );
top->addWidget( header );
m_FacesWidget = new KIconView( page );
m_FacesWidget = new TDEIconView( page );
m_FacesWidget->setSelectionMode( TQIconView::Single );
m_FacesWidget->setItemsMovable( false );
m_FacesWidget->setMinimumSize( 400, 200 );

2
kdepasswd/kcm/chfacedlg.h
Unescape Escape View File

@ -63,7 +63,7 @@ private slots:
private:
void addCustomPixmap( TQString imPath, bool saveCopy );
KIconView *m_FacesWidget;
TDEIconView *m_FacesWidget;
};
#endif // CHFACEDLG_H

2
kdepasswd/kcm/kcm_useraccount.kcfg
Unescape Escape View File

@ -37,7 +37,7 @@
<default>$HOME/.face.icon</default>
</entry>
<entry name="CustomKey" type="String">
<label>Sort key for KIconViewItems</label>
<label>Sort key for TDEIconViewItems</label>
<default>Zz_custom</default>
</entry>
</group>

2
kdesktop/desktop.cc
Unescape Escape View File

@ -810,7 +810,7 @@ void KDesktop::slotSettingsChanged(int category)
void KDesktop::slotIconChanged(int group)
{
if ( group == KIcon::Desktop )
if ( group == TDEIcon::Desktop )
{
kdDebug(1204) << "KDesktop::slotIconChanged" << endl;
refresh();

8
kdesktop/kcustommenu.cc
Unescape Escape View File

@ -84,10 +84,10 @@ KCustomMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/)
// to accelators, replace them with two ampersands.
serviceName.replace("&", "&&");
TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
0, KIcon::DefaultState, 0L, true);
TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
0, KIcon::ActiveState, 0L, true);
TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), TDEIcon::Small,
0, TDEIcon::DefaultState, 0L, true);
TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), TDEIcon::Small,
0, TDEIcon::ActiveState, 0L, true);
// make sure they are not larger than 16x16
if (normal.width() > 16 || normal.height() > 16) {
TQImage tmp = normal.convertToImage();

8
kdesktop/kdiconview.cc
Unescape Escape View File

@ -490,7 +490,7 @@ void KDIconView::setAutoAlign( bool b )
// Auto line-up icons
if ( b ) {
// set maxItemWidth to ensure sane initial icon layout before the auto align code is fully activated
int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
setFont( font() ); // Force calcRect()
@ -505,7 +505,7 @@ void KDIconView::setAutoAlign( bool b )
}
else {
// change maxItemWidth, because when grid-align was active, it changed this for the grid
int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
setFont( font() ); // Force calcRect()
@ -1528,7 +1528,7 @@ void KDIconView::showEvent( TQShowEvent *e )
if (m_hasExistingPos)
TQScrollView::showEvent( e );
else
KIconView::showEvent( e );
TDEIconView::showEvent( e );
}
void KDIconView::contentsDropEvent( TQDropEvent * e )
@ -1548,7 +1548,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
bool bSignals = signalsBlocked();
setItemsMovable(false);
blockSignals(true);
KIconView::contentsDropEvent( e );
TDEIconView::contentsDropEvent( e );
blockSignals(bSignals);
setItemsMovable(bMovable);
// End hack

2
kdesktop/minicli.cpp
Unescape Escape View File

@ -864,7 +864,7 @@ void Minicli::setIcon ()
if ( m_iconName == "www" )
{
// Not using KIconEffect::overlay as that requires the same size
// Not using TDEIconEffect::overlay as that requires the same size
// for the icon and the overlay, also the overlay definately doesn't
// have a more that one-bit alpha channel here
TQPixmap overlay( locate ( "icon", KMimeType::favIconForURL( m_filterData->uri() ) + ".png" ) );

4
kdesktop/startupid.cpp
Unescape Escape View File

@ -179,8 +179,8 @@ void StartupId::start_startupid( const TQString& icon_P )
= { Qt::black, Qt::darkGray, Qt::lightGray, Qt::white, Qt::white };
TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, KIcon::Small, 0,
KIcon::DefaultState, 0, true ); // return null pixmap if not found
TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, TDEIcon::Small, 0,
TDEIcon::DefaultState, 0, true ); // return null pixmap if not found
if( icon_pixmap.isNull())
icon_pixmap = SmallIcon( "exec" );
if( startup_widget == NULL )

6
kdesktop/tdefileividesktop.cpp
Unescape Escape View File

@ -64,7 +64,7 @@ KFileIVIDesktop::~KFileIVIDesktop()
void KFileIVIDesktop::calcRect( const TQString& _text )
{
KIconViewItem::calcRect( _text );
TDEIconViewItem::calcRect( _text );
if ( !iconView() || !m_shadow ||
!wordWrap() || !( static_cast<KDesktopShadowSettings *>
@ -99,7 +99,7 @@ void KFileIVIDesktop::paintItem( TQPainter *p, const TQColorGroup &cg)
p->save();
// draw the pixmap as in KIconViewItem::paintItem(...)
// draw the pixmap as in TDEIconViewItem::paintItem(...)
paintPixmap(p, colors);
//
@ -147,7 +147,7 @@ void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg )
else
textX = textRect( FALSE ).x() + 2;
int textY = textRect( FALSE ).y();
int align = ((KIconView *) iconView())->itemTextPos() == TQIconView::Bottom
int align = ((TDEIconView *) iconView())->itemTextPos() == TQIconView::Bottom
? AlignHCenter : AlignAuto;
bool rebuild = shouldUpdateShadow(isSelected());

2
kdesktop/tdefileividesktop.h
Unescape Escape View File

@ -66,7 +66,7 @@ class KFileIVIDesktop : public KFileIVI
protected:
/**
* Reimplements KIconView::calcRect to take the shadow metrics
* Reimplements TDEIconView::calcRect to take the shadow metrics
* into account
*/
virtual void calcRect( const TQString& _text );

42
kdialog/kdialog.cpp
Unescape Escape View File

@ -596,47 +596,47 @@ static int directCommand(TDECmdLineArgs *args)
if (args->count() >= 1) {
contextStr = TQString::fromLocal8Bit(args->arg(0));
}
KIcon::Group group = KIcon::NoGroup;
TDEIcon::Group group = TDEIcon::NoGroup;
if ( groupStr == TQString::fromLatin1( "Desktop" ) )
group = KIcon::Desktop;
group = TDEIcon::Desktop;
else if ( groupStr == TQString::fromLatin1( "Toolbar" ) )
group = KIcon::Toolbar;
group = TDEIcon::Toolbar;
else if ( groupStr == TQString::fromLatin1( "MainToolbar" ) )
group = KIcon::MainToolbar;
group = TDEIcon::MainToolbar;
else if ( groupStr == TQString::fromLatin1( "Small" ) )
group = KIcon::Small;
group = TDEIcon::Small;
else if ( groupStr == TQString::fromLatin1( "Panel" ) )
group = KIcon::Panel;
group = TDEIcon::Panel;
else if ( groupStr == TQString::fromLatin1( "User" ) )
group = KIcon::User;
KIcon::Context context = KIcon::Any;
group = TDEIcon::User;
TDEIcon::Context context = TDEIcon::Any;
// From kicontheme.cpp
if ( contextStr == TQString::fromLatin1( "Devices" ) )
context = KIcon::Device;
context = TDEIcon::Device;
else if ( contextStr == TQString::fromLatin1( "MimeTypes" ) )
context = KIcon::MimeType;
context = TDEIcon::MimeType;
else if ( contextStr == TQString::fromLatin1( "FileSystems" ) )
context = KIcon::FileSystem;
context = TDEIcon::FileSystem;
else if ( contextStr == TQString::fromLatin1( "Applications" ) )
context = KIcon::Application;
context = TDEIcon::Application;
else if ( contextStr == TQString::fromLatin1( "Actions" ) )
context = KIcon::Action;
context = TDEIcon::Action;
else if ( contextStr == TQString::fromLatin1( "Animations" ) )
context = KIcon::Animation;
context = TDEIcon::Animation;
else if ( contextStr == TQString::fromLatin1( "Categories" ) )
context = KIcon::Category;
context = TDEIcon::Category;
else if ( contextStr == TQString::fromLatin1( "Emblems" ) )
context = KIcon::Emblem;
context = TDEIcon::Emblem;
else if ( contextStr == TQString::fromLatin1( "Emotes" ) )
context = KIcon::Emote;
context = TDEIcon::Emote;
else if ( contextStr == TQString::fromLatin1( "International" ) )
context = KIcon::International;
context = TDEIcon::International;
else if ( contextStr == TQString::fromLatin1( "Places" ) )
context = KIcon::Place;
context = TDEIcon::Place;
else if ( contextStr == TQString::fromLatin1( "Status" ) )
context = KIcon::StatusIcon;
context = TDEIcon::StatusIcon;
KIconDialog dlg(0, "icon dialog");
TDEIconDialog dlg(0, "icon dialog");
kapp->setTopWidget( &dlg );
dlg.setup( group, context);
if (!title.isNull())

2
kfind/kftabdlg.cpp
Unescape Escape View File

@ -301,7 +301,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
it != m_types.end(); ++it )
{
KMimeType::Ptr typ = *it;
typeBox->insertItem(typ->pixmap( KIcon::Small ), typ->comment());
typeBox->insertItem(typ->pixmap( TDEIcon::Small ), typ->comment());
}
if ( editRegExp ) {

8
kicker/applets/clock/clock.cpp
Unescape Escape View File

@ -370,7 +370,7 @@ void DigitalClock::loadSettings()
setSegmentStyle(TQLCDNumber::Flat);
if (_prefs->digitalLCDStyle())
lcdPattern = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User);
lcdPattern = TDEIconLoader("clockapplet").loadIcon("lcd", TDEIcon::User);
setNumDigits(_prefs->digitalShowSeconds() ? 8:5);
@ -477,14 +477,14 @@ void AnalogClock::initBackgroundPixmap()
//if no antialiasing, use pixmap as-is
if (_prefs->analogAntialias() == 0)
{
lcdPattern = KIconLoader("clockapplet").loadIcon("lcd",KIcon::User);
lcdPattern = TDEIconLoader("clockapplet").loadIcon("lcd",TDEIcon::User);
_bgScale = 1;
}
else
{
//make a scaled pixmap -- so when image is reduced it'll look "OK".
_bgScale = _prefs->analogAntialias()+1;
TQImage bgImage = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User).convertToImage();
TQImage bgImage = TDEIconLoader("clockapplet").loadIcon("lcd", TDEIcon::User).convertToImage();
lcdPattern = TQPixmap(bgImage.scale(bgImage.width() * _bgScale,
bgImage.height() * _bgScale));
@ -1780,7 +1780,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
TZoffset = zone->calc_TZ_offset(activeZone);
}
data.icon = DesktopIcon("date", KIcon::SizeMedium);
data.icon = DesktopIcon("date", TDEIcon::SizeMedium);
data.direction = popupDirection();
data.duration = 4000;
}

12
kicker/applets/launcher/quickbutton.cpp
Unescape Escape View File

@ -126,7 +126,7 @@ void QuickURL::run() const
}
//similar to MimeType::pixmapForURL
TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group,
TQPixmap QuickURL::pixmap( mode_t _mode, TDEIcon::Group _group,
int _force_size, int _state, TQString *) const
{
TQPixmap pxmap;
@ -206,8 +206,8 @@ void QuickButton::loadIcon()
// Set Icon Dimension from size
_iconDim=std::min(size().width(),size().height())-2*ICON_MARGIN;
// Load icons
_icon = _qurl->pixmap(0, KIcon::Panel, _iconDim, KIcon::DefaultState);
_iconh = _qurl->pixmap(0, KIcon::Panel, _iconDim, KIcon::ActiveState);
_icon = _qurl->pixmap(0, TDEIcon::Panel, _iconDim, TDEIcon::DefaultState);
_iconh = _qurl->pixmap(0, TDEIcon::Panel, _iconDim, TDEIcon::ActiveState);
setPixmap(_icon);
}
@ -262,7 +262,7 @@ void QuickButton::launch()
if (!KickerSettings::showDeepButtons()) {
setDown(false);
update();
KIconEffect::visualActivate(this, rect());
TDEIconEffect::visualActivate(this, rect());
}
if (_qurl->kurl().url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
if (isOn()) {
@ -344,10 +344,10 @@ void QuickButton::updateKickerTip(KickerTip::Data &data)
data.subtext = data.message;
}
if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
data.icon = TDEGlobal::iconLoader()->loadIcon("desktop", KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
data.icon = TDEGlobal::iconLoader()->loadIcon("desktop", TDEIcon::Panel, TDEIcon::SizeHuge, TDEIcon::DefaultState);
}
else {
data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, TDEIcon::Panel, TDEIcon::SizeHuge, TDEIcon::DefaultState);
}
}

2
kicker/applets/launcher/quickbutton.h
Unescape Escape View File

@ -53,7 +53,7 @@ public:
TQString name() const { return m_name; }
KService::Ptr service() const {return _service;};
void run() const;
TQPixmap pixmap(mode_t _mode = 0, KIcon::Group _group = KIcon::Desktop,
TQPixmap pixmap(mode_t _mode = 0, TDEIcon::Group _group = TDEIcon::Desktop,
int _force_size = 0, int _state = 0, TQString * _path = 0L) const;
private:

2
kicker/applets/minipager/pagerbutton.cpp
Unescape Escape View File

@ -829,7 +829,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data)
}
data.duration = 4000;
data.icon = DesktopIcon("window_list", KIcon::SizeMedium);
data.icon = DesktopIcon("window_list", TDEIcon::SizeMedium);
data.message = TQStyleSheet::escape(m_desktopName);
data.direction = m_pager->popupDirection();
}

2
kicker/extensions/kasbar/ChangeLog
Unescape Escape View File

@ -786,7 +786,7 @@
* Moved the icon handling code out of Kasbar and into the Task
class. Task now provides an API for icon loading that allows
access to different icon sizes and uses KIconLoader where needed.
access to different icon sizes and uses TDEIconLoader where needed.
2001-05-15 Tuesday 01:19 rich

4
kicker/extensions/kasbar/kasaboutdlg.cpp
Unescape Escape View File

@ -80,8 +80,8 @@
#include "kasaboutdlg.h"
#include "version.h"
#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeMedium )
#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeLarge )
KasAboutDialog::KasAboutDialog( TQWidget *parent )
: KDialogBase( KDialogBase::IconList, i18n("About Kasbar"),

2
kicker/extensions/kasbar/kasbar.cpp
Unescape Escape View File

@ -717,7 +717,7 @@ void KasBar::addTestItems()
KasItem *i = new KasItem( this );
insert( 0, i );
i->setText( "Animated" );
i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) );
i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
i->setAnimation( resources()->startupAnimation() );
TQTimer *aniTimer = new TQTimer( i, "aniTimer" );
connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) );

16
kicker/extensions/kasbar/kasgroupitem.cpp
Unescape Escape View File

@ -145,19 +145,19 @@ void KasGroupItem::updateIcon()
Task::Ptr t = items.first();
if (!t)
p = TDEGlobal::iconLoader()->loadIcon( "kicker",
KIcon::NoGroup,
KIcon::SizeSmall );
TDEIcon::NoGroup,
TDEIcon::SizeSmall );
int sizes[] = { KIcon::SizeEnormous,
KIcon::SizeHuge,
KIcon::SizeLarge,
KIcon::SizeMedium,
KIcon::SizeSmall };
int sizes[] = { TDEIcon::SizeEnormous,
TDEIcon::SizeHuge,
TDEIcon::SizeLarge,
TDEIcon::SizeMedium,
TDEIcon::SizeSmall };
p = t->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader );
if ( p.isNull() )
p = TDEGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall );
p = TDEGlobal::iconLoader()->loadIcon( "error", TDEIcon::NoGroup, TDEIcon::SizeSmall );
setIcon( p );
}

4
kicker/extensions/kasbar/kasprefsdlg.cpp
Unescape Escape View File

@ -75,8 +75,8 @@
#include "kasprefsdlg.h"
#include "kasprefsdlg.moc"
#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeMedium )
#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeLarge )
KasPrefsDialog::KasPrefsDialog( KasTasker *kas, TQWidget *parent )

24
kicker/extensions/kasbar/kasstartupitem.cpp
Unescape Escape View File

@ -99,34 +99,34 @@ TQPixmap KasStartupItem::icon() const
case KasBar::Small:
/* ***** NOP ******
pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeSmall );
TDEIcon::NoGroup,
TDEIcon::SizeSmall );
*/
break;
case KasBar::Medium:
pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeMedium );
TDEIcon::NoGroup,
TDEIcon::SizeMedium );
break;
case KasBar::Large:
pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeLarge );
TDEIcon::NoGroup,
TDEIcon::SizeLarge );
break;
case KasBar::Huge:
pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeHuge );
TDEIcon::NoGroup,
TDEIcon::SizeHuge );
break;
case KasBar::Enormous:
pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeEnormous );
TDEIcon::NoGroup,
TDEIcon::SizeEnormous );
break;
default:
pixmap = TDEGlobal::iconLoader()->loadIcon( "error",
KIcon::NoGroup,
KIcon::SizeSmall );
TDEIcon::NoGroup,
TDEIcon::SizeSmall );
}
return pixmap;

14
kicker/extensions/kasbar/kastaskitem.cpp
Unescape Escape View File

@ -85,7 +85,7 @@
#include "kastaskitem.h"
#include "kasbarextension.h"
#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeMedium )
static const int CHECK_ATTENTION_DELAY = 2000;
@ -124,11 +124,11 @@ KasTasker *KasTaskItem::kasbar() const
TQPixmap KasTaskItem::icon()
{
int sizes[] = { KIcon::SizeEnormous,
KIcon::SizeHuge,
KIcon::SizeLarge,
KIcon::SizeMedium,
KIcon::SizeSmall };
int sizes[] = { TDEIcon::SizeEnormous,
TDEIcon::SizeHuge,
TDEIcon::SizeLarge,
TDEIcon::SizeMedium,
TDEIcon::SizeSmall };
if ( kasbar()->embedThumbnails() && task_->hasThumbnail() ) {
usedIconLoader = true;
@ -194,7 +194,7 @@ void KasTaskItem::paint( TQPainter *p )
//
// Overlay the small icon if the icon has changed, we have space,
// and we are using a KIconLoader icon rather than one from the NET props.
// and we are using a TDEIconLoader icon rather than one from the NET props.
// This only exists because we are almost always using the icon loader for
// large icons.
//

8
kicker/kicker/core/containerarea.cpp
Unescape Escape View File

@ -979,7 +979,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
saveContainerConfig(true);
PanelDrag *dd = new PanelDrag(_moveAC, this);
dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), KIcon::Small));
dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small));
grabKeyboard();
dd->drag();
releaseKeyboard();
@ -1334,13 +1334,13 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
{
// non-TDE executable
TQString pixmapFile;
KMimeType::pixmapForURL(url, 0, KIcon::Panel, 0,
KIcon::DefaultState, &pixmapFile);
KMimeType::pixmapForURL(url, 0, TDEIcon::Panel, 0,
TDEIcon::DefaultState, &pixmapFile);
PanelExeDialog dlg(TQString::null, TQString::null, url.path(),
pixmapFile, TQString::null, false, 0);
if (dlg.exec() == TQDialog::Accepted)
{
// KIconloader returns a full path, we only want the name
// TDEIconloader returns a full path, we only want the name
TQFileInfo iconfi(dlg.iconPath());
a = new NonKDEAppButtonContainer(dlg.title(),
dlg.description(),

4
kicker/kicker/ui/addapplet.cpp
Unescape Escape View File

@ -74,8 +74,8 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent)
itemDescription->installEventFilter(this);
KIconLoader * ldr = TDEGlobal::iconLoader();
TQPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge);
TDEIconLoader * ldr = TDEGlobal::iconLoader();
TQPixmap icon = ldr->loadIcon(info.icon(), TDEIcon::Panel, TDEIcon::SizeLarge);
itemPixmap->setPixmap(icon);
itemPixmap->installEventFilter(this);
}

4
kicker/kicker/ui/appletop_mnu.cpp
Unescape Escape View File

@ -100,8 +100,8 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
}
TQPixmap iconPix(kapp->iconLoader()->loadIcon(icon,
KIcon::Small, 0,
KIcon::DefaultState,
TDEIcon::Small, 0,
TDEIcon::DefaultState,
0, true));
insertItem(iconPix, i18n("&About %1").arg( titleText ), About);
needSeparator = !(actions & KPanelApplet::Help);

4
kicker/kicker/ui/browser_dlg.cpp
Unescape Escape View File

@ -46,9 +46,9 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic
hbox2->setSpacing( KDialog::spacingHint() );
TQLabel *label1 = new TQLabel( i18n( "Button icon:" ), hbox2 );
iconBtn = new KIconButton( hbox2 );
iconBtn = new TDEIconButton( hbox2 );
iconBtn->setFixedSize( 50, 50 );
iconBtn->setIconType( KIcon::Panel, KIcon::Place );
iconBtn->setIconType( TDEIcon::Panel, TDEIcon::Place );
label1->setBuddy( iconBtn );
TQHBox *hbox1 = new TQHBox( page );

4
kicker/kicker/ui/browser_dlg.h
Unescape Escape View File

@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdialogbase.h>
class KIconButton;
class TDEIconButton;
class KLineEdit;
class PanelBrowserDialog : public KDialogBase
@ -45,7 +45,7 @@ protected slots:
virtual void slotOk();
void slotPathChanged( const TQString &_text );
protected:
KIconButton *iconBtn;
TDEIconButton *iconBtn;
KLineEdit *pathInput;
TQPushButton *browseBtn;
};

8
kicker/kicker/ui/browser_mnu.cpp
Unescape Escape View File

@ -197,8 +197,8 @@ void PanelBrowserMenu::initialize()
iconPath = path + '/' + iconPath.mid(2);
icon = TDEGlobal::iconLoader()->loadIcon(iconPath,
KIcon::Small, KIcon::SizeSmall,
KIcon::DefaultState, 0, true);
TDEIcon::Small, TDEIcon::SizeSmall,
TDEIcon::DefaultState, 0, true);
if(icon.isNull())
icon = CICON("folder");
name = c.readEntry("Name", name);
@ -245,8 +245,8 @@ void PanelBrowserMenu::initialize()
TQString s = c.readEntry("Icon");
if(!_icons->contains(s)) {
icon = TDEGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall,
KIcon::DefaultState, 0, true);
icon = TDEGlobal::iconLoader()->loadIcon(s, TDEIcon::Small, TDEIcon::SizeSmall,
TDEIcon::DefaultState, 0, true);
if(icon.isNull()) {
TQString type = c.readEntry("Type", "Application");

6
kicker/kicker/ui/exe_dlg.cpp
Unescape Escape View File

@ -64,7 +64,7 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio
ui->m_exec->setURL(path);
ui->m_commandLine->setText(cmd);
ui->m_inTerm->setChecked(inTerm);
ui->m_icon->setIconType(KIcon::Panel, KIcon::Application);
ui->m_icon->setIconType(TDEIcon::Panel, TDEIcon::Application);
updateIcon();
@ -168,7 +168,7 @@ void PanelExeDialog::slotTextChanged(const TQString &str)
if (it != m_partialPath2full.end())
exeLocation = it.data();
KMimeType::pixmapForURL(KURL( exeLocation ), 0, KIcon::Panel, 0, KIcon::DefaultState, &m_icon);
KMimeType::pixmapForURL(KURL( exeLocation ), 0, TDEIcon::Panel, 0, TDEIcon::DefaultState, &m_icon);
updateIcon();
}
@ -196,7 +196,7 @@ void PanelExeDialog::slotSelect(const TQString& exec)
return;
}
KMimeType::pixmapForURL(KURL( exec ), 0, KIcon::Panel, 0, KIcon::DefaultState, &m_icon);
KMimeType::pixmapForURL(KURL( exec ), 0, TDEIcon::Panel, 0, TDEIcon::DefaultState, &m_icon);
updateIcon();
}

8
kicker/kicker/ui/hidebutton.cpp
Unescape Escape View File

@ -140,10 +140,10 @@ void HideButton::generateIcons()
TQImage image = pixmap()->convertToImage();
image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin);
KIconEffect effect;
TDEIconEffect effect;
m_normalIcon = effect.apply(image, KIcon::Panel, KIcon::DefaultState);
m_activeIcon = effect.apply(image, KIcon::Panel, KIcon::ActiveState);
m_normalIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DefaultState);
m_activeIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::ActiveState);
}
void HideButton::slotSettingsChanged(int category)
@ -167,7 +167,7 @@ void HideButton::slotSettingsChanged(int category)
void HideButton::slotIconChanged(int group)
{
if (group != KIcon::Panel)
if (group != TDEIcon::Panel)
{
return;
}

6
kicker/kicker/ui/itemview.cpp
Unescape Escape View File

@ -139,7 +139,7 @@ void KMenuItem::setDescription(const TQString& txt)
void KMenuItem::setIcon(const TQString& icon, int size)
{
m_icon = icon;
TQListViewItem::setPixmap(0, TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size ));
TQListViewItem::setPixmap(0, TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::Panel, size ));
}
void KMenuItem::setHasChildren( bool flag )
@ -1013,8 +1013,8 @@ TQDragObject * ItemView::dragObject()
return 0;
o = new KMultipleDrag(viewport());
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( kitem->icon(), KIcon::Panel, m_iconSize);
TQPixmap add = TDEGlobal::iconLoader()->loadIcon( "add", KIcon::Small );
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( kitem->icon(), TDEIcon::Panel, m_iconSize);
TQPixmap add = TDEGlobal::iconLoader()->loadIcon( "add", TDEIcon::Small );
TQPainter p( &pix );
p.drawPixmap(pix.height()-add.height(), pix.width()-add.width(), add);

2
kicker/kicker/ui/nonKDEButtonSettings.ui
Unescape Escape View File

@ -128,7 +128,7 @@
</size>
</property>
</spacer>
<widget class="KIconButton" row="0" column="0" rowspan="3" colspan="1">
<widget class="TDEIconButton" row="0" column="0" rowspan="3" colspan="1">
<property name="name">
<cstring>m_icon</cstring>
</property>

4
kicker/kicker/ui/service_mnu.cpp
Unescape Escape View File

@ -783,7 +783,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
case KST_KService:
{
icon = static_cast<KService *>(e)->pixmap(KIcon::Small);
icon = static_cast<KService *>(e)->pixmap(TDEIcon::Small);
TQString filePath = static_cast<KService *>(e)->desktopEntryPath();
if (filePath[0] != '/')
{
@ -796,7 +796,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
case KST_KServiceGroup:
{
icon = TDEGlobal::iconLoader()
->loadIcon(static_cast<KServiceGroup *>(e)->icon(), KIcon::Small);
->loadIcon(static_cast<KServiceGroup *>(e)->icon(), TDEIcon::Small);
url = "programs:/" + static_cast<KServiceGroup *>(e)->relPath();
break;
}

16
kicker/libkicker/global.cpp
Unescape Escape View File

@ -159,11 +159,11 @@ int sizeValue(KPanelExtension::Size s)
int maxButtonDim()
{
int maxDim;
//return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge;
//return (2 * KickerSettings::iconMargin()) + TDEIcon::SizeLarge;
KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
kickerconfig->setGroup("General");
maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);;
maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", TDEIcon::SizeLarge);;
delete kickerconfig;
return maxDim;
}
@ -358,7 +358,7 @@ void colorize(TQImage& image)
b = (b + (76 - gray) > 255 ? 255 : b + (76 - gray));
}
color.setRgb(r, g, b);
KIconEffect::colorize(image, color, 1.0);
TDEIconEffect::colorize(image, color, 1.0);
}
TQColor blendColors(const TQColor& c1, const TQColor& c2)
@ -415,22 +415,22 @@ TQIconSet menuIconSet(const TQString& icon)
if (iconSize > 0)
{
iconset = TDEGlobal::iconLoader()->loadIconSet(icon,
KIcon::NoGroup,
TDEIcon::NoGroup,
iconSize, true);
}
else if (iconSize == 0)
{
TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(icon,
KIcon::Small,
TDEIcon::Small,
0,
KIcon::DefaultState,
TDEIcon::DefaultState,
0,
true);
TQPixmap active = TDEGlobal::iconLoader()->loadIcon(icon,
KIcon::Small,
TDEIcon::Small,
0,
KIcon::ActiveState,
TDEIcon::ActiveState,
0,
true);

28
kicker/libkicker/panelbutton.cpp
Unescape Escape View File

@ -74,7 +74,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
m_popupDirection(KPanelApplet::Up),
m_iconAlignment(AlignCenter),
m_orientation(Qt::Horizontal),
m_size((KIcon::StdSizes)-1),
m_size((TDEIcon::StdSizes)-1),
m_fontPercent(0.40),
m_forceStandardCursor(forceStandardCursor)
{
@ -208,7 +208,7 @@ void PanelButton::setOrientation(Orientation o)
void PanelButton::updateIcon(int group)
{
if (group != KIcon::Panel)
if (group != TDEIcon::Panel)
{
return;
}
@ -516,7 +516,7 @@ void PanelButton::mouseReleaseEvent(TQMouseEvent *e)
TQPixmap pix = labelIcon();
if (KickerSettings::showIconActivationEffect() == true) {
KIconEffect::visualActivate(this, this->geometry(), &pix);
TDEIconEffect::visualActivate(this, this->geometry(), &pix);
}
}
TQButton::mouseReleaseEvent(e);
@ -781,16 +781,16 @@ int PanelButton::preferredIconSize(int proposed_size) const
{
// (re)calculates the icon sizes and report true if they have changed.
// Get sizes from icontheme. We assume they are sorted.
KIconTheme *ith = TDEGlobal::iconLoader()->theme();
TDEIconTheme *ith = TDEGlobal::iconLoader()->theme();
if (!ith)
{
return -1; // unknown icon size
}
TQValueList<int> sizes = ith->querySizes(KIcon::Panel);
TQValueList<int> sizes = ith->querySizes(TDEIcon::Panel);
int sz = ith->defaultSize(KIcon::Panel);
int sz = ith->defaultSize(TDEIcon::Panel);
if (proposed_size < 0)
{
@ -878,10 +878,10 @@ void PanelButton::loadTiles()
void PanelButton::loadIcons()
{
KIconLoader * ldr = TDEGlobal::iconLoader();
TDEIconLoader * ldr = TDEGlobal::iconLoader();
TQString nm = m_iconName;
KIcon::States defaultState = isEnabled() ? KIcon::DefaultState :
KIcon::DisabledState;
TDEIcon::States defaultState = isEnabled() ? TDEIcon::DefaultState :
TDEIcon::DisabledState;
if (nm=="kmenu-suse")
{
TQString pth = locate( "data", "kicker/data/kickoff/kmenu_basic.png" );
@ -894,12 +894,12 @@ void PanelButton::loadIcons()
}
}
else
m_icon = ldr->loadIcon(nm, KIcon::Panel, m_size, defaultState, 0L, true);
m_icon = ldr->loadIcon(nm, TDEIcon::Panel, m_size, defaultState, 0L, true);
if (m_icon.isNull())
{
nm = defaultIcon();
m_icon = ldr->loadIcon(nm, KIcon::Panel, m_size, defaultState);
m_icon = ldr->loadIcon(nm, TDEIcon::Panel, m_size, defaultState);
}
if (!isEnabled())
@ -908,11 +908,11 @@ void PanelButton::loadIcons()
}
else
{
m_iconh = ldr->loadIcon(nm, KIcon::Panel, m_size,
KIcon::ActiveState, 0L, true);
m_iconh = ldr->loadIcon(nm, TDEIcon::Panel, m_size,
TDEIcon::ActiveState, 0L, true);
}
m_iconz = ldr->loadIcon(nm, KIcon::Panel, KIcon::SizeHuge,
m_iconz = ldr->loadIcon(nm, TDEIcon::Panel, TDEIcon::SizeHuge,
defaultState, 0L, true );
}

10
kicker/libkicker/simplebutton.cpp
Unescape Escape View File

@ -154,11 +154,11 @@ void SimpleButton::generateIcons()
}
TQImage image = pixmap()->convertToImage();
KIconEffect effect;
TDEIconEffect effect;
m_normalIcon = effect.apply(image, KIcon::Panel, KIcon::DefaultState);
m_activeIcon = effect.apply(image, KIcon::Panel, KIcon::ActiveState);
m_disabledIcon = effect.apply(image, KIcon::Panel, KIcon::DisabledState);
m_normalIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DefaultState);
m_activeIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::ActiveState);
m_disabledIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DisabledState);
updateGeometry();
}
@ -188,7 +188,7 @@ void SimpleButton::slotSettingsChanged(int category)
void SimpleButton::slotIconChanged( int group )
{
if (group != KIcon::Panel)
if (group != TDEIcon::Panel)
{
return;
}

4
kicker/menuext/prefmenu/prefmenu.cpp
Unescape Escape View File

@ -170,7 +170,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
{
case KST_KService:
{
icon = static_cast<KService *>(e)->pixmap(KIcon::Small);
icon = static_cast<KService *>(e)->pixmap(TDEIcon::Small);
TQString filePath = static_cast<KService *>(e)->desktopEntryPath();
if (filePath[0] != '/')
{
@ -183,7 +183,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
case KST_KServiceGroup:
{
icon = TDEGlobal::iconLoader()->loadIcon(static_cast<KServiceGroup*>(e)->icon(),
KIcon::Small);
TDEIcon::Small);
url = "programs:/" + static_cast<KServiceGroup*>(e)->relPath();
break;
}

32
kicker/menuext/tom/tom.cc
Unescape Escape View File

@ -97,10 +97,10 @@ class runMenuWidget : public TQWidget, public QMenuItem
TQHBoxLayout* runLayout = new TQHBoxLayout(this);
textRect = fontMetrics().boundingRect(i18n("Run:"));
runLayout->setSpacing(KDialog::spacingHint());
runLayout->addSpacing((KDialog::spacingHint() * 3) + KIcon::SizeMedium + textRect.width());
icon = DesktopIcon("run", KIcon::SizeMedium);
runLayout->addSpacing((KDialog::spacingHint() * 3) + TDEIcon::SizeMedium + textRect.width());
icon = DesktopIcon("run", TDEIcon::SizeMedium);
/*TQLabel* l1 = new TQLabel(this);
TQPixmap foo = DesktopIcon("run", KIcon::SizeMedium);
TQPixmap foo = DesktopIcon("run", TDEIcon::SizeMedium);
cout << "foo is: " << foo.width() << " by " << foo.height() << endl;
l1->setPixmap(foo);
runLayout->addWidget(l1);*/
@ -133,7 +133,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
//m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
}
setMinimumHeight(KIcon::SizeMedium + 2);
setMinimumHeight(TDEIcon::SizeMedium + 2);
}
~runMenuWidget() {}
@ -144,9 +144,9 @@ class runMenuWidget : public TQWidget, public QMenuItem
TQRect r(rect());
// ew, nasty hack. may result in coredumps due to horrid C-style cast???
kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled,
TQStyleOption(static_cast<TQMenuItem*>(this), 0, KIcon::SizeMedium ));
TQStyleOption(static_cast<TQMenuItem*>(this), 0, TDEIcon::SizeMedium ));
p.drawPixmap(KDialog::spacingHint(), 1, icon);
p.drawText((KDialog::spacingHint() * 2) + KIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:"));
p.drawText((KDialog::spacingHint() * 2) + TDEIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:"));
}
void focusInEvent (TQFocusEvent* e)
@ -238,7 +238,7 @@ void TOM::initializeRecentDocs()
*/
KDesktopFile f(*it, true /* read only */);
m_recentDocsMenu->insertItem(DesktopIcon(f.readIcon(), KIcon::SizeMedium),
m_recentDocsMenu->insertItem(DesktopIcon(f.readIcon(), TDEIcon::SizeMedium),
f.readName().replace('&', "&&"), id);
++id;
}
@ -274,7 +274,7 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
if (icon != TQString::null)
{
insertItem(DesktopIcon(icon, KIcon::SizeMedium), name, taskGroup);
insertItem(DesktopIcon(icon, TDEIcon::SizeMedium), name, taskGroup);
}
else
{
@ -459,7 +459,7 @@ void TOM::initialize()
PanelServiceMenu* moreApps = new PanelServiceMenu(TQString::null, TQString::null, this, "More Applications");
moreApps->setFont(m_largerFont);
insertItem(DesktopIcon("misc", KIcon::SizeMedium), i18n("More Applications"), moreApps);
insertItem(DesktopIcon("misc", TDEIcon::SizeMedium), i18n("More Applications"), moreApps);
m_submenus.append(moreApps);
if (!m_isImmutable)
@ -486,7 +486,7 @@ void TOM::initialize()
}
else if (kapp->authorize("run_command"))
{
insertItem(DesktopIcon("run", KIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
insertItem(DesktopIcon("run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
}
// RECENTLY USED ITEMS
@ -496,7 +496,7 @@ void TOM::initialize()
m_recentDocsMenu->setFont(m_largerFont);
connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs()));
connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int)));
insertItem(DesktopIcon("document", KIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu);
insertItem(DesktopIcon("document", TDEIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu);
m_submenus.append(m_recentDocsMenu);
TDEPopupMenu* recentApps = new TDEPopupMenu(this, "recentApps");
@ -512,7 +512,7 @@ void TOM::initialize()
// if we have no destinations, put the run command here
if (numDests == 0 && kapp->authorize("run_command"))
{
insertItem(DesktopIcon("run", KIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
insertItem(DesktopIcon("run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
}
@ -533,7 +533,7 @@ void TOM::initialize()
if (menu)
{
++m_maxIndex;
insertItem(DesktopIcon(info.icon(), KIcon::SizeMedium), info.name(), menu, m_maxIndex);
insertItem(DesktopIcon(info.icon(), TDEIcon::SizeMedium), info.name(), menu, m_maxIndex);
m_submenus.append(menu);
needSeparator = true;
}
@ -563,7 +563,7 @@ void TOM::initialize()
}
}
insertItem(DesktopIcon("exit", KIcon::SizeMedium),
insertItem(DesktopIcon("exit", TDEIcon::SizeMedium),
i18n("Logout %1").arg(username), this, TQT_SLOT(logout()));
}
@ -677,7 +677,7 @@ bool TOM::loadSidePixmap()
return false;
}
KIconEffect::colorize(image, color, 1.0);
TDEIconEffect::colorize(image, color, 1.0);
m_sidePixmap.convertFromImage(image);
image.load(locate("data", "kicker/pics/" + sideTileName));
@ -687,7 +687,7 @@ bool TOM::loadSidePixmap()
return false;
}
KIconEffect::colorize(image, color, 1.0);
TDEIconEffect::colorize(image, color, 1.0);
m_sideTilePixmap.convertFromImage(image);
if (m_sidePixmap.width() != m_sideTilePixmap.width())

4
kicker/taskbar/taskbarcontainer.cpp
Unescape Escape View File

@ -154,7 +154,7 @@ void TaskBarContainer::configure()
}
windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
KIcon::Panel,
TDEIcon::Panel,
16));
windowListButton->setMinimumSize(windowListButton->sizeHint());
layout->insertWidget(0, windowListButton);
@ -258,7 +258,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
if (windowListButton)
{
windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
KIcon::Panel,
TDEIcon::Panel,
16));
windowListButton->setMinimumSize(windowListButton->sizeHint());
}

14
kicker/taskbar/taskcontainer.cpp
Unescape Escape View File

@ -698,7 +698,7 @@ void TaskContainer::drawButton(TQPainter *p)
// fade out the icon when minimized
if (iconified)
{
KIconEffect::semiTransparent( pixmap );
TDEIconEffect::semiTransparent( pixmap );
}
// draw icon
@ -731,7 +731,7 @@ void TaskContainer::drawButton(TQPainter *p)
if (iconified)
{
KIconEffect::semiTransparent(modPixmap);
TDEIconEffect::semiTransparent(modPixmap);
}
p->drawPixmap(r, modPixmap);
@ -1664,9 +1664,9 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
data.duration = 4000;
data.subtext = i18n("Loading application ...");
data.icon = TDEGlobal::iconLoader()->loadIcon(m_startup->icon(),
KIcon::Small,
KIcon::SizeMedium,
KIcon::DefaultState,
TDEIcon::Small,
TDEIcon::SizeMedium,
TDEIcon::DefaultState,
0, true);
return;
}
@ -1689,8 +1689,8 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
{
// try to load icon via net_wm
pixmap = KWin::icon(tasks.last()->window(),
KIcon::SizeMedium,
KIcon::SizeMedium,
TDEIcon::SizeMedium,
TDEIcon::SizeMedium,
true);
}

32
kicker/taskmanager/taskmanager.cpp
Unescape Escape View File

@ -629,9 +629,9 @@ Task::Task(WId win, TQObject *parent, const char *name)
if(_pixmap.isNull())
{
TDEGlobal::iconLoader()->loadIcon(className().lower(),
KIcon::Small,
KIcon::Small,
KIcon::DefaultState,
TDEIcon::Small,
TDEIcon::Small,
TDEIcon::DefaultState,
0, true);
}
@ -710,9 +710,9 @@ void Task::refreshIcon()
if(_pixmap.isNull())
{
TDEGlobal::iconLoader()->loadIcon(className().lower(),
KIcon::Small,
KIcon::Small,
KIcon::DefaultState,
TDEIcon::Small,
TDEIcon::Small,
TDEIcon::DefaultState,
0, true);
}
@ -908,20 +908,20 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
isStaticIcon = false;
switch( size ) {
case KIcon::SizeSmall:
case TDEIcon::SizeSmall:
{
pixmap = icon( 16, 16, true );
// Icon of last resort
if( pixmap.isNull() ) {
pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
KIcon::SizeSmall );
TDEIcon::NoGroup,
TDEIcon::SizeSmall );
isStaticIcon = true;
}
}
break;
case KIcon::SizeMedium:
case TDEIcon::SizeMedium:
{
//
// Try 34x34 first for KDE 2.1 icons with shadows, if we don't
@ -938,13 +938,13 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
KIcon::SizeMedium );
TDEIcon::NoGroup,
TDEIcon::SizeMedium );
isStaticIcon = true;
}
}
break;
case KIcon::SizeLarge:
case TDEIcon::SizeLarge:
{
// If there's a 48x48 icon in the hints then use it
pixmap = icon( size, size, false );
@ -952,9 +952,9 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// If not, try to get one from the classname
if ( pixmap.isNull() || pixmap.width() != size || pixmap.height() != size ) {
pixmap = TDEGlobal::iconLoader()->loadIcon( className(),
KIcon::NoGroup,
TDEIcon::NoGroup,
size,
KIcon::DefaultState,
TDEIcon::DefaultState,
0L,
true );
isStaticIcon = true;
@ -969,7 +969,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
TDEIcon::NoGroup,
size );
isStaticIcon = true;
}

14
kicker/taskmanager/taskmanager.h
Unescape Escape View File

@ -127,25 +127,25 @@ public:
WindowList transients() const { return _transients; }
/**
* Returns a 16x16 (KIcon::Small) icon for the task. This method will
* Returns a 16x16 (TDEIcon::Small) icon for the task. This method will
* only fall back to a static icon if there is no icon of any size in
* the WM hints.
*/
TQPixmap pixmap() const { return _pixmap; }
/**
* Returns the best icon for any of the KIcon::StdSizes. If there is no
* Returns the best icon for any of the TDEIcon::StdSizes. If there is no
* icon of the specified size specified in the WM hints, it will try to
* get one using KIconLoader.
* get one using TDEIconLoader.
*
* <pre>
* bool gotStaticIcon;
* TQPixmap icon = myTask->icon( KIcon::SizeMedium, gotStaticIcon );
* TQPixmap icon = myTask->icon( TDEIcon::SizeMedium, gotStaticIcon );
* </pre>
*
* @param size Any of the constants in KIcon::StdSizes.
* @param isStaticIcon Set to true if KIconLoader was used, false otherwise.
* @see KIcon
* @param size Any of the constants in TDEIcon::StdSizes.
* @param isStaticIcon Set to true if TDEIconLoader was used, false otherwise.
* @see TDEIcon
*/
TQPixmap bestIcon( int size, bool &isStaticIcon );

2
kmenuedit/basictab.cpp
Unescape Escape View File

@ -123,7 +123,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
grid->addMultiCellWidget(_systrayCB, 5, 5, 0, 2);
// setup icon button
_iconButton = new KIconButton(general_group);
_iconButton = new TDEIconButton(general_group);
_iconButton->setFixedSize(56,56);
_iconButton->setIconSize(48);
connect(_iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(slotChanged()));

4
kmenuedit/basictab.h
Unescape Escape View File

@ -27,7 +27,7 @@
class KKeyButton;
class KLineEdit;
class KIconButton;
class TDEIconButton;
class TQCheckBox;
class TQGroupBox;
class TQLabel;
@ -74,7 +74,7 @@ protected:
KURLRequester *_execEdit, *_pathEdit;
KLineEdit *_termOptEdit, *_uidEdit;
TQCheckBox *_terminalCB, *_uidCB, *_launchCB, *_systrayCB;
KIconButton *_iconButton;
TDEIconButton *_iconButton;
TQGroupBox *_path_group, *_term_group, *_uid_group, *general_group_keybind;
TQLabel *_termOptLabel, *_uidLabel, *_pathLabel, *_nameLabel, *_commentLabel, *_execLabel;
TQLabel *_descriptionLabel;

2
kmenuedit/treeview.cpp
Unescape Escape View File

@ -134,7 +134,7 @@ void TreeItem::setup()
static TQPixmap appIcon(const TQString &iconName)
{
TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true);
TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::Small, 0, TDEIcon::DefaultState, 0L, true);
// make sure they are not larger than 20x20
if (normal.width() > 20 || normal.height() > 20)
{

2
konqueror/ChangeLog
Unescape Escape View File

@ -285,7 +285,7 @@ Sat Nov 25 17:38:27 2000 Carsten Pfeiffer <pfeiffer@kde.org>
2000-11-22 David Faure <faure@kde.org>
* konq_listview.cc: Added "Default" Icon Size, which corresponds to
KIcon::Small (but when switching to icon view, it becomes whatever's
TDEIcon::Small (but when switching to icon view, it becomes whatever's
configured for the "Desktop" group).
2000-11-21 David Faure <faure@kde.org>

2
konqueror/TODO
Unescape Escape View File

@ -1,4 +1,4 @@
KIconView:
TDEIconView:
==========
- When you are adding to the selection (eg. by shift + LMB)

52
konqueror/about/konq_aboutpage.cc
Unescape Escape View File

@ -98,17 +98,17 @@ TQString KonqAboutPageFactory::launch()
if ( res.isEmpty() )
return res;
KIconLoader *iconloader = TDEGlobal::iconLoader();
int iconSize = iconloader->currentSize(KIcon::Desktop);
TQString home_icon_path = iconloader->iconPath("kfm_home", KIcon::Desktop );
TQString storage_icon_path = iconloader->iconPath("system", KIcon::Desktop );
TQString remote_icon_path = iconloader->iconPath("network", KIcon::Desktop );
TQString wastebin_icon_path = iconloader->iconPath("trashcan_full", KIcon::Desktop );
TQString applications_icon_path = iconloader->iconPath("kmenu", KIcon::Desktop );
TQString settings_icon_path = iconloader->iconPath("kcontrol", KIcon::Desktop );
TQString help_icon_path = iconloader->iconPath("khelpcenter", KIcon::Desktop );
TDEIconLoader *iconloader = TDEGlobal::iconLoader();
int iconSize = iconloader->currentSize(TDEIcon::Desktop);
TQString home_icon_path = iconloader->iconPath("kfm_home", TDEIcon::Desktop );
TQString storage_icon_path = iconloader->iconPath("system", TDEIcon::Desktop );
TQString remote_icon_path = iconloader->iconPath("network", TDEIcon::Desktop );
TQString wastebin_icon_path = iconloader->iconPath("trashcan_full", TDEIcon::Desktop );
TQString applications_icon_path = iconloader->iconPath("kmenu", TDEIcon::Desktop );
TQString settings_icon_path = iconloader->iconPath("kcontrol", TDEIcon::Desktop );
TQString help_icon_path = iconloader->iconPath("khelpcenter", TDEIcon::Desktop );
TQString home_folder = TQDir::homeDirPath();
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
@ -171,7 +171,7 @@ TQString KonqAboutPageFactory::launch()
.arg( i18n( "Settings" ) )
.arg( i18n( "Desktop configuration" ) )
.arg( continue_icon_path )
.arg( KIcon::SizeSmall ).arg( KIcon::SizeSmall )
.arg( TDEIcon::SizeSmall ).arg( TDEIcon::SizeSmall )
.arg( i18n( "Next: An Introduction to Konqueror" ) )
;
i18n("Search the Web");//i18n for possible future use
@ -190,10 +190,10 @@ TQString KonqAboutPageFactory::intro()
if ( res.isEmpty() )
return res;
KIconLoader *iconloader = TDEGlobal::iconLoader();
TQString back_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("forward", KIcon::Small ):iconloader->iconPath("back", KIcon::Small );
TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small );
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
TDEIconLoader *iconloader = TDEGlobal::iconLoader();
TQString back_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("forward", TDEIcon::Small ):iconloader->iconPath("back", TDEIcon::Small );
TQString gohome_icon_path = iconloader->iconPath("gohome", TDEIcon::Small );
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
@ -244,9 +244,9 @@ TQString KonqAboutPageFactory::specs()
if ( s_specs_html )
return *s_specs_html;
KIconLoader *iconloader = TDEGlobal::iconLoader();
TDEIconLoader *iconloader = TDEGlobal::iconLoader();
TQString res = loadFile( locate( "data", "konqueror/about/specs.html" ));
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
if ( res.isEmpty() )
return res;
@ -330,22 +330,22 @@ TQString KonqAboutPageFactory::tips()
if ( res.isEmpty() )
return res;
KIconLoader *iconloader = TDEGlobal::iconLoader();
TDEIconLoader *iconloader = TDEGlobal::iconLoader();
TQString viewmag_icon_path =
iconloader->iconPath("viewmag", KIcon::Small );
iconloader->iconPath("viewmag", TDEIcon::Small );
TQString history_icon_path =
iconloader->iconPath("history", KIcon::Small );
iconloader->iconPath("history", TDEIcon::Small );
TQString openterm_icon_path =
iconloader->iconPath("openterm", KIcon::Small );
iconloader->iconPath("openterm", TDEIcon::Small );
TQString locationbar_erase_rtl_icon_path =
iconloader->iconPath("clear_left", KIcon::Small );
iconloader->iconPath("clear_left", TDEIcon::Small );
TQString locationbar_erase_icon_path =
iconloader->iconPath("locationbar_erase", KIcon::Small );
iconloader->iconPath("locationbar_erase", TDEIcon::Small );
TQString window_fullscreen_icon_path =
iconloader->iconPath("window_fullscreen", KIcon::Small );
iconloader->iconPath("window_fullscreen", TDEIcon::Small );
TQString view_left_right_icon_path =
iconloader->iconPath("view_left_right", KIcon::Small );
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
iconloader->iconPath("view_left_right", TDEIcon::Small );
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )

4
konqueror/iconview/konq_iconview.cc
Unescape Escape View File

@ -671,11 +671,11 @@ void KonqKfmIconView::newIconSize( int size )
//check for that when checking whether the size changed
int effSize = size;
if (effSize == 0)
effSize = IconSize(KIcon::Desktop);
effSize = IconSize(TDEIcon::Desktop);
int oldEffSize = m_pIconView->iconSize();
if (oldEffSize == 0)
oldEffSize = IconSize(KIcon::Desktop);
oldEffSize = IconSize(TDEIcon::Desktop);
// Make sure all actions are initialized.
KonqDirPart::newIconSize( size );

4
konqueror/keditbookmarks/actionsimpl.cpp
Unescape Escape View File

@ -616,8 +616,8 @@ void ActionsImpl::slotHideInToolbar() {
void ActionsImpl::slotChangeIcon() {
KEBApp::self()->bkInfo()->commitChanges();
KBookmark bk = ListView::self()->firstSelected()->bookmark();
KIconDialog dlg(KEBApp::self());
TQString newIcon = dlg.selectIcon(KIcon::Small, KIcon::Place);
TDEIconDialog dlg(KEBApp::self());
TQString newIcon = dlg.selectIcon(TDEIcon::Small, TDEIcon::Place);
if (newIcon.isEmpty())
return;
EditCommand *cmd = new EditCommand(

14
konqueror/konq_combo.cc
Unescape Escape View File

@ -329,7 +329,7 @@ void KonqCombo::loadItems()
item = *it;
if ( !item.isEmpty() ) { // only insert non-empty items
if( first ) {
insertItem( KonqPixmapProvider::self()->pixmapFor( item, KIcon::SizeSmall ),
insertItem( KonqPixmapProvider::self()->pixmapFor( item, TDEIcon::SizeSmall ),
item, i++, titleOfURL( item ) );
}
else
@ -349,7 +349,7 @@ void KonqCombo::slotSetIcon( int index )
if( pixmap( index ) == NULL )
// on-demand icon loading
updateItem( KonqPixmapProvider::self()->pixmapFor( text( index ),
KIcon::SizeSmall ), text( index ), index,
TDEIcon::SizeSmall ), text( index ), index,
titleOfURL( text( index ) ) );
update();
}
@ -362,7 +362,7 @@ void KonqCombo::popup()
{
// on-demand icon loading
updateItem( KonqPixmapProvider::self()->pixmapFor( text( i ),
KIcon::SizeSmall), text( i ), i, titleOfURL( text( i ) ) );
TDEIcon::SizeSmall), text( i ), i, titleOfURL( text( i ) ) );
}
}
KHistoryCombo::popup();
@ -577,7 +577,7 @@ void KonqCombo::mouseMoveEvent( TQMouseEvent *e )
list.append( url );
KURLDrag *drag = new KURLDrag( list, this );
TQPixmap pix = KonqPixmapProvider::self()->pixmapFor( currentText(),
KIcon::SizeMedium );
TDEIcon::SizeMedium );
if ( !pix.isNull() )
drag->setPixmap( pix );
drag->dragCopy();
@ -700,13 +700,13 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
if ( lookup_pending ) {
title = titleOfURL( text() );
if ( !title.isEmpty() )
pm = KonqPixmapProvider::self()->pixmapFor( text(), KIcon::SizeSmall );
pm = KonqPixmapProvider::self()->pixmapFor( text(), TDEIcon::SizeSmall );
else if ( text().find( "://" ) == -1 ) {
title = titleOfURL( "http://"+text() );
if ( !title.isEmpty() )
pm = KonqPixmapProvider::self()->pixmapFor( "http://"+text(), KIcon::SizeSmall );
pm = KonqPixmapProvider::self()->pixmapFor( "http://"+text(), TDEIcon::SizeSmall );
else
pm = KonqPixmapProvider::self()->pixmapFor( text(), KIcon::SizeSmall );
pm = KonqPixmapProvider::self()->pixmapFor( text(), TDEIcon::SizeSmall );
}
else
pm = TQPixmap();

2
konqueror/konq_guiclients.cc
Unescape Escape View File

@ -156,7 +156,7 @@ void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const
action.setAttribute( "group", "preview" );
(void)new TDEAction( name, service->pixmap( KIcon::Small ), 0,
(void)new TDEAction( name, service->pixmap( TDEIcon::Small ), 0,
TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName );
}

2
konqueror/konq_mainwindow.cc
Unescape Escape View File

@ -5403,7 +5403,7 @@ void KonqMainWindow::setIcon( const TQPixmap& pix )
TQString url = m_combo->currentText();
if ( !url.isEmpty() )
big = KonqPixmapProvider::self()->pixmapFor( url, KIcon::SizeMedium );
big = KonqPixmapProvider::self()->pixmapFor( url, TDEIcon::SizeMedium );
KWin::setIcons( winId(), big, pix );
}

2
konqueror/konq_misc.cc
Unescape Escape View File

@ -248,7 +248,7 @@ void KonqDraggableLabel::mouseMoveEvent( TQMouseEvent * ev )
KURL::List lst;
lst.append( m_mw->currentView()->url() );
TQDragObject * drag = new KURLDrag( lst, m_mw );
drag->setPixmap( KMimeType::pixmapForURL( lst.first(), 0, KIcon::Small ) );
drag->setPixmap( KMimeType::pixmapForURL( lst.first(), 0, TDEIcon::Small ) );
drag->dragCopy();
}
}

2
konqueror/konq_tabs.cc
Unescape Escape View File

@ -509,7 +509,7 @@ void KonqFrameTabs::slotInitiateDrag( TQWidget *w )
KURL::List lst;
lst.append( frame->activeChildView()->url() );
KURLDrag *d = new KURLDrag( lst, this );
d->setPixmap( KMimeType::pixmapForURL( lst.first(), 0, KIcon::Small ) );
d->setPixmap( KMimeType::pixmapForURL( lst.first(), 0, TDEIcon::Small ) );
d->dragCopy();
}
}

2
konqueror/listview/konq_infolistviewitem.cc
Unescape Escape View File

@ -202,7 +202,7 @@ void KonqInfoListViewItem::setDisabled( bool disabled )
{
KonqBaseListViewItem::setDisabled( disabled );
int iconSize = static_cast<KonqBaseListViewWidget *>(listView())->iconSize();
iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( TDEIcon::Small ); // Default = small
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}

2
konqueror/listview/konq_listview.cc
Unescape Escape View File

@ -675,7 +675,7 @@ void KonqListView::setupActions()
// m_paShowDot->setCheckedState(i18n("Hide &Hidden Files"));
m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" );
newIconSize( KIcon::SizeSmall /* default size */ );
newIconSize( TDEIcon::SizeSmall /* default size */ );
}
void KonqListView::slotSelectionChanged()

4
konqueror/listview/konq_listviewitems.cc
Unescape Escape View File

@ -164,7 +164,7 @@ void KonqListViewItem::setDisabled( bool disabled )
{
KonqBaseListViewItem::setDisabled( disabled );
int iconSize = m_pListViewWidget->iconSize();
iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( TDEIcon::Small ); // Default = small
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}
@ -176,7 +176,7 @@ void KonqListViewItem::setActive( bool active )
//#### Optimize away repaint if possible, like the iconview does?
KonqBaseListViewItem::setActive( active );
int iconSize = m_pListViewWidget->iconSize();
iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( TDEIcon::Small ); // Default = small
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}

6
konqueror/listview/konq_listviewitems.h
Unescape Escape View File

@ -57,10 +57,10 @@ class KonqBaseListViewItem : public TDEListViewItem
int state() const
{
if (m_bDisabled)
return KIcon::DisabledState;
return TDEIcon::DisabledState;
if (m_bActive)
return KIcon::ActiveState;
return KIcon::DefaultState;
return TDEIcon::ActiveState;
return TDEIcon::DefaultState;
}
/** For KonqMimeTypeResolver */

4
konqueror/listview/konq_listviewwidget.cc
Unescape Escape View File

@ -839,7 +839,7 @@ void KonqBaseListViewWidget::startDrag()
if (( urls.count() > 1 ) || (pixmap0Invalid))
{
int iconSize = m_pBrowserView->m_pProps->iconSize();
iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( TDEIcon::Small ); // Default = small
pixmap2 = DesktopIcon( "tdemultiple", iconSize );
if ( pixmap2.isNull() )
kdWarning(1202) << "Could not find multiple pixmap" << endl;
@ -1011,7 +1011,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
// call the icon effect if enabled
if (TDEGlobalSettings::showKonqIconActivationEffect() == true) {
KIconEffect::visualActivate(viewport(), rect, pix);
TDEIconEffect::visualActivate(viewport(), rect, pix);
}
// clean up

4
konqueror/sidebar/sidebar_widget.cpp
Unescape Escape View File

@ -488,9 +488,9 @@ void Sidebar_Widget::buttonPopupActivate(int id)
{
case 1:
{
KIconDialog kicd(this);
TDEIconDialog kicd(this);
// kicd.setStrictIconSize(true);
TQString iconname=kicd.selectIcon(KIcon::Small);
TQString iconname=kicd.selectIcon(TDEIcon::Small);
kdDebug()<<"New Icon Name:"<<iconname<<endl;
if (!iconname.isEmpty())
{

2
konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
Unescape Escape View File

@ -92,7 +92,7 @@ void KonqSidebarDirTreeItem::setOpen( bool open )
MYMODULE->openSubFolder( this );
else if ( hasStandardIcon() )
{
int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
int size = TDEGlobal::iconLoader()->currentSize( TDEIcon::Small );
if ( open )
setPixmap( 0, DesktopIcon( "folder_open", size ) );
else

8
konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
Unescape Escape View File

@ -325,7 +325,7 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item )
if ( !item->isTopLevelItem() &&
static_cast<KonqSidebarDirTreeItem *>(item)->hasStandardIcon() )
{
int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
int size = TDEGlobal::iconLoader()->currentSize( TDEIcon::Small );
TQPixmap pix = DesktopIcon( "folder_open", size );
m_pTree->startAnimation( item, "kde", 6, &pix );
}
@ -358,7 +358,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
{
// We have this directory listed already, just copy the entries as we
// can't use the dirlister, it would invalidate the old entries
int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
int size = TDEGlobal::iconLoader()->currentSize( TDEIcon::Small );
KonqSidebarTreeItem * parentItem = item;
KonqSidebarDirTreeItem *oldItem = static_cast<KonqSidebarDirTreeItem *> (openItem->firstChild());
while(oldItem)
@ -424,7 +424,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
}
kdDebug()<<"number of additional parent items:"<< (parentItemList?parentItemList->count():0)<<endl;
int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
int size = TDEGlobal::iconLoader()->currentSize( TDEIcon::Small );
do
{
kdDebug()<<"Parent Item URL:"<<parentItem->externalURL()<<endl;
@ -456,7 +456,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries )
{
int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
int size = TDEGlobal::iconLoader()->currentSize( TDEIcon::Small );
TQPtrListIterator<KFileItem> kit ( entries );
kdDebug(1201) << "KonqSidebarDirTreeModule::slotRefreshItems " << entries.count() << " entries. First: " << kit.current()->url().url() << endl;

4
konsole/konsole/konsole.cpp
Unescape Escape View File

@ -3288,9 +3288,9 @@ void Konsole::notifySessionState(TESession* session, int state)
&& m_tabViewMode != ShowTextOnly) {
TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(state_iconname,
KIcon::Small, 0, KIcon::DefaultState, 0L, true);
TDEIcon::Small, 0, TDEIcon::DefaultState, 0L, true);
TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(state_iconname,
KIcon::Small, 0, KIcon::ActiveState, 0L, true);
TDEIcon::Small, 0, TDEIcon::ActiveState, 0L, true);
// make sure they are not larger than 16x16
if (normal.width() > 16 || normal.height() > 16)

2
kpersonalizer/keyecandypage.cpp
Unescape Escape View File

@ -631,7 +631,7 @@ void KEyeCandyPage::save(bool currSettings){
// kicker stuff: Iconzooming etc.
kapp->dcopClient()->send( "kicker", "Panel", "configure()", TQString("") );
// Icon stuff
for (int i=0; i<KIcon::LastGroup; i++) {
for (int i=0; i<TDEIcon::LastGroup; i++) {
KIPC::sendMessageAll(KIPC::IconChanged, i);
}
// font stuff

2
kpersonalizer/krefinepage.cpp
Unescape Escape View File

@ -33,7 +33,7 @@ KRefinePage::KRefinePage(TQWidget *parent, const char *name ) : KRefinePageDlg(p
pb_kcontrol->hide();
lb_kcontrol->hide();
}
px_kcontrol->setPixmap(TDEGlobal::iconLoader()->loadIcon("kcontrol", KIcon::Panel, KIcon::SizeMedium));
px_kcontrol->setPixmap(TDEGlobal::iconLoader()->loadIcon("kcontrol", TDEIcon::Panel, TDEIcon::SizeMedium));
}
KRefinePage::~KRefinePage(){
}

10
kpersonalizer/kstylepage.cpp
Unescape Escape View File

@ -233,9 +233,9 @@ void TDEStylePage::saveIcons(bool curSettings) {
// save, what we got
TDEGlobal::config()->setGroup("Icons");
TDEGlobal::config()->writeEntry("Theme", theme, true, true);
KIconTheme icontheme(theme);
TDEIconTheme icontheme(theme);
const char * const groups[] = { "Desktop", "Toolbar", "MainToolbar", "Small", 0L };
for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) {
for (TDEIcon::Group i=TDEIcon::FirstGroup; i<TDEIcon::LastGroup; i++) {
if (groups[i] == 0L)
break;
TDEGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons");
@ -456,9 +456,9 @@ void TDEStylePage::getAvailability() {
// check, wich Icon-themes are available
icon_crystalsvg_exist = icon_kdeclassic_exist = icon_Locolor_exist = false;
TQStringList icons(KIconTheme::list());
TQStringList icons(TDEIconTheme::list());
for (TQStringList::iterator it=icons.begin(); it != icons.end(); it++) {
KIconTheme icontheme(*it);
TDEIconTheme icontheme(*it);
if (icontheme.isHidden() || !icontheme.isValid()) continue;
if (*it == "crystalsvg") icon_crystalsvg_exist = true;
else if (*it == "kdeclassic") icon_kdeclassic_exist = true;
@ -514,7 +514,7 @@ void TDEStylePage::initColors() {
/** live-update the system */
void TDEStylePage::liveUpdate() {
// tell all apps about the changed icons
for (int i=0; i<KIcon::LastGroup; i++) {
for (int i=0; i<TDEIcon::LastGroup; i++) {
KIPC::sendMessageAll(KIPC::IconChanged, i);
}
// tell all apps about the changed style

6
ksysguard/gui/SensorBrowser.cc
Unescape Escape View File

@ -128,7 +128,7 @@ void SensorBrowser::update()
TQString hostName = mSensorManager->hostName( host );
HostItem* lvi = new HostItem( this, hostName, id, host );
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( "computer", KIcon::Desktop, KIcon::SizeSmall );
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( "computer", TDEIcon::Desktop, TDEIcon::SizeSmall );
lvi->setPixmap( 0, pix );
HostInfo* hostInfo = new HostInfo( id, host, hostName, lvi );
@ -214,8 +214,8 @@ void SensorBrowser::answerReceived( int id, const TQString &answer )
if ( !found ) {
TQListViewItem* lvi = new TQListViewItem( parent, name );
if ( j == absolutePath.count() - 1 ) {
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( "ksysguardd", KIcon::Desktop,
KIcon::SizeSmall );
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( "ksysguardd", TDEIcon::Desktop,
TDEIcon::SizeSmall );
lvi->setPixmap( 0, pix );
lvi->setText( 1, KSGRD::SensorMgr->translateSensorType( sensorType ) );

10
ksysguard/gui/SensorDisplayLib/ProcessList.cc
Unescape Escape View File

@ -613,16 +613,16 @@ ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli)
TQPixmap pix;
if (!iconCache[name])
{
pix = TDEGlobal::iconLoader()->loadIcon(name, KIcon::Small,
KIcon::SizeSmall, KIcon::DefaultState,
pix = TDEGlobal::iconLoader()->loadIcon(name, TDEIcon::Small,
TDEIcon::SizeSmall, TDEIcon::DefaultState,
0L, true);
if (pix.isNull() || !pix.mask())
pix = TDEGlobal::iconLoader()->loadIcon("unknownapp", KIcon::User,
KIcon::SizeSmall);
pix = TDEGlobal::iconLoader()->loadIcon("unknownapp", TDEIcon::User,
TDEIcon::SizeSmall);
if (pix.width() != 16 || pix.height() != 16)
{
/* I guess this isn't needed too often. The KIconLoader should
/* I guess this isn't needed too often. The TDEIconLoader should
* scale the pixmaps already appropriately. Since I got a bug
* report claiming that it doesn't work with GNOME apps I've
* added this safeguard. */

4
ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
Unescape Escape View File

@ -439,8 +439,8 @@ void SensorDisplay::setSensorOk( bool ok )
if ( mErrorIndicator )
return;
TQPixmap errorIcon = TDEGlobal::iconLoader()->loadIcon( "connect_creating", KIcon::Desktop,
KIcon::SizeSmall );
TQPixmap errorIcon = TDEGlobal::iconLoader()->loadIcon( "connect_creating", TDEIcon::Desktop,
TDEIcon::SizeSmall );
if ( !mPlotterWdg )
return;

8
kxkb/kxkbtraywindow.cpp
Unescape Escape View File

@ -43,8 +43,8 @@ void KxkbLabelController::setToolTip(const TQString& tip)
void KxkbLabelController::setPixmap(const TQPixmap& pixmap)
{
KIconEffect iconeffect;
label->setPixmap( iconeffect.apply(pixmap, KIcon::Panel, KIcon::DefaultState) );
TDEIconEffect iconeffect;
label->setPixmap( iconeffect.apply(pixmap, TDEIcon::Panel, TDEIcon::DefaultState) );
}
@ -81,7 +81,7 @@ void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts,
/* menu->removeItem(CONFIG_MENU_ID);
menu->removeItem(HELP_MENU_ID);*/
KIconEffect iconeffect;
TDEIconEffect iconeffect;
int cnt = 0;
TQValueList<LayoutUnit>::ConstIterator it;
@ -91,7 +91,7 @@ void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts,
const TQString variantName = (*it).variant;
const TQPixmap& layoutPixmap = LayoutIcon::getInstance().findPixmap(layoutName, m_showFlag, (*it).displayName);
const TQPixmap pix = iconeffect.apply(layoutPixmap, KIcon::Small, KIcon::DefaultState);
const TQPixmap pix = iconeffect.apply(layoutPixmap, TDEIcon::Small, TDEIcon::DefaultState);
TQString fullName = i18n((rules.layouts()[layoutName]));
if( variantName.isEmpty() == false )

6
libkonq/favicons/favicons.cpp
Unescape Escape View File

@ -57,7 +57,7 @@ struct FaviconsModulePrivate
FaviconsModule::FaviconsModule(const TQCString &obj)
: KDEDModule(obj)
{
// create our favicons folder so that KIconLoader knows about it
// create our favicons folder so that TDEIconLoader knows about it
d = new FaviconsModulePrivate;
d->faviconsDir = TDEGlobal::dirs()->saveLocation( "cache", "favicons/" );
d->faviconsDir.truncate(d->faviconsDir.length()-9); // Strip off "favicons/"
@ -229,8 +229,8 @@ void FaviconsModule::slotResult(TDEIO::Job *job)
// Some sites have nasty 32x32 icons, according to the MS docs
// IE ignores them, well, we scale them, otherwise the location
// combo / menu will look quite ugly
if (io.image().width() != KIcon::SizeSmall || io.image().height() != KIcon::SizeSmall)
io.setImage(io.image().smoothScale(KIcon::SizeSmall, KIcon::SizeSmall));
if (io.image().width() != TDEIcon::SizeSmall || io.image().height() != TDEIcon::SizeSmall)
io.setImage(io.image().smoothScale(TDEIcon::SizeSmall, TDEIcon::SizeSmall));
if (download.isHost)
iconName = download.hostOrURL;

4
libkonq/favicons/favicons.h
Unescape Escape View File

@ -36,7 +36,7 @@ namespace TDEIO { class Job; }
* the default icon for all URLs on the given host. In this case, the
* second parameter is a host name, otherwise the second parameter is the
* URL which is associated with the icon. The third parameter is the
* @ref KIconLoader friendly name of the downloaded icon, the same as
* @ref TDEIconLoader friendly name of the downloaded icon, the same as
* @ref iconForURL will from now on return for any matching URL.
*
* @short KDED Module for favicons
@ -57,7 +57,7 @@ k_dcop:
* been downloaded yet, TQString::null is returned.
*
* @param url the URL for which the icon is queried
* @return the icon name suitable to pass to @ref KIconLoader or
* @return the icon name suitable to pass to @ref TDEIconLoader or
* TQString::null if no icon for this URL was found.
*/
TQString iconForURL(const KURL &url);

70
libkonq/konq_dirpart.cc
Unescape Escape View File

@ -64,10 +64,10 @@ public:
void KonqDirPart::KonqDirPartPrivate::findAvailableIconSizes(void)
{
KIconTheme *root = TDEGlobal::instance()->iconLoader()->theme();
TDEIconTheme *root = TDEGlobal::instance()->iconLoader()->theme();
iconSize.resize(1);
if (root) {
TQValueList<int> avSizes = root->querySizes(KIcon::Desktop);
TQValueList<int> avSizes = root->querySizes(TDEIcon::Desktop);
kdDebug(1203) << "The icon theme handles the sizes:" << avSizes << endl;
qHeapSort(avSizes);
int oldSize = -1;
@ -95,10 +95,10 @@ void KonqDirPart::KonqDirPartPrivate::findAvailableIconSizes(void)
}
}
} else {
iconSize.append(KIcon::SizeSmall); // 16
iconSize.append(KIcon::SizeMedium); // 32
iconSize.append(KIcon::SizeLarge); // 48
iconSize.append(KIcon::SizeHuge); // 64
iconSize.append(TDEIcon::SizeSmall); // 16
iconSize.append(TDEIcon::SizeMedium); // 32
iconSize.append(TDEIcon::SizeLarge); // 48
iconSize.append(TDEIcon::SizeHuge); // 64
}
kdDebug(1203) << "Using " << iconSize.count() << " icon sizes." << endl;
}
@ -106,7 +106,7 @@ void KonqDirPart::KonqDirPartPrivate::findAvailableIconSizes(void)
int KonqDirPart::KonqDirPartPrivate::findNearestIconSize(int preferred)
{
int s1 = iconSize[1];
if (preferred == 0) return TDEGlobal::iconLoader()->currentSize(KIcon::Desktop);
if (preferred == 0) return TDEGlobal::iconLoader()->currentSize(TDEIcon::Desktop);
if (preferred <= s1) return s1;
for (uint i = 2; i <= iconSize.count(); i++) {
if (preferred <= iconSize[i]) {
@ -175,18 +175,18 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
// Use these also if the icon theme is scalable.
int i;
d->iconSize[0] = 0; // Default value
d->iconSize[1] = KIcon::SizeSmall; // 16
d->iconSize[2] = KIcon::SizeSmallMedium; // 22
d->iconSize[3] = KIcon::SizeMedium; // 32
d->iconSize[4] = KIcon::SizeLarge; // 48
d->iconSize[5] = KIcon::SizeHuge; // 64
d->iconSize[6] = KIcon::SizeEnormous; // 128
d->iconSize[1] = TDEIcon::SizeSmall; // 16
d->iconSize[2] = TDEIcon::SizeSmallMedium; // 22
d->iconSize[3] = TDEIcon::SizeMedium; // 32
d->iconSize[4] = TDEIcon::SizeLarge; // 48
d->iconSize[5] = TDEIcon::SizeHuge; // 64
d->iconSize[6] = TDEIcon::SizeEnormous; // 128
d->iconSize[7] = 192;
d->iconSize[8] = 256;
KIconTheme *root = TDEGlobal::instance()->iconLoader()->theme();
TDEIconTheme *root = TDEGlobal::instance()->iconLoader()->theme();
if (root)
{
TQValueList<int> avSizes = root->querySizes(KIcon::Desktop);
TQValueList<int> avSizes = root->querySizes(TDEIcon::Desktop);
kdDebug(1203) << "the icon theme handles the following sizes:" << avSizes << endl;
if (avSizes.count() < 10) {
// Use the icon sizes supplied by the theme.
@ -213,10 +213,10 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
// Remove in KDE4 ...
// These are here in the event subclasses access them.
m_iIconSize[1] = KIcon::SizeSmall;
m_iIconSize[2] = KIcon::SizeMedium;
m_iIconSize[3] = KIcon::SizeLarge;
m_iIconSize[4] = KIcon::SizeHuge;
m_iIconSize[1] = TDEIcon::SizeSmall;
m_iIconSize[2] = TDEIcon::SizeMedium;
m_iIconSize[3] = TDEIcon::SizeLarge;
m_iIconSize[4] = TDEIcon::SizeHuge;
// ... up to here
TDEAction *a = new TDEAction( i18n( "Configure Background..." ), "background", 0, this, TQT_SLOT( slotBackgroundSettings() ),
@ -555,23 +555,23 @@ void KonqDirPart::slotIconSizeToggled( bool toggleOn )
if ( m_paDefaultIcons->isChecked() )
setIconSize(0);
else if ( d->aEnormousIcons->isChecked() )
setIconSize(d->findNearestIconSize(KIcon::SizeEnormous));
setIconSize(d->findNearestIconSize(TDEIcon::SizeEnormous));
else if ( m_paHugeIcons->isChecked() )
setIconSize(d->findNearestIconSize(KIcon::SizeHuge));
setIconSize(d->findNearestIconSize(TDEIcon::SizeHuge));
else if ( m_paLargeIcons->isChecked() )
setIconSize(d->findNearestIconSize(KIcon::SizeLarge));
setIconSize(d->findNearestIconSize(TDEIcon::SizeLarge));
else if ( m_paMediumIcons->isChecked() )
setIconSize(d->findNearestIconSize(KIcon::SizeMedium));
setIconSize(d->findNearestIconSize(TDEIcon::SizeMedium));
else if ( d->aSmallMediumIcons->isChecked() )
setIconSize(d->findNearestIconSize(KIcon::SizeSmallMedium));
setIconSize(d->findNearestIconSize(TDEIcon::SizeSmallMedium));
else if ( m_paSmallIcons->isChecked() )
setIconSize(d->findNearestIconSize(KIcon::SizeSmall));
setIconSize(d->findNearestIconSize(TDEIcon::SizeSmall));
}
void KonqDirPart::slotIncIconSize()
{
int s = m_pProps->iconSize();
s = s ? s : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
s = s ? s : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
uint sizeIndex = 0;
for ( uint idx = 1; idx < d->iconSize.count() ; ++idx )
if (s == d->iconSize[idx]) {
@ -587,7 +587,7 @@ void KonqDirPart::slotIncIconSize()
void KonqDirPart::slotDecIconSize()
{
int s = m_pProps->iconSize();
s = s ? s : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
s = s ? s : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
uint sizeIndex = 0;
for ( uint idx = 1; idx < d->iconSize.count() ; ++idx )
if (s == d->iconSize[idx]) {
@ -603,17 +603,17 @@ void KonqDirPart::slotDecIconSize()
// Only updates Actions, a GUI update is done in the views by reimplementing this
void KonqDirPart::newIconSize( int size /*0=default, or 16,32,48....*/ )
{
int realSize = (size==0) ? TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ) : size;
int realSize = (size==0) ? TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ) : size;
m_paDecIconSize->setEnabled(realSize > d->iconSize[1]);
m_paIncIconSize->setEnabled(realSize < d->iconSize.back());
m_paDefaultIcons->setChecked(size == 0);
d->aEnormousIcons->setChecked(size == d->findNearestIconSize(KIcon::SizeEnormous));
m_paHugeIcons->setChecked(size == d->findNearestIconSize(KIcon::SizeHuge));
m_paLargeIcons->setChecked(size == d->findNearestIconSize(KIcon::SizeLarge));
m_paMediumIcons->setChecked(size == d->findNearestIconSize(KIcon::SizeMedium));
d->aSmallMediumIcons->setChecked(size == d->findNearestIconSize(KIcon::SizeSmallMedium));
m_paSmallIcons->setChecked(size == d->findNearestIconSize(KIcon::SizeSmall));
d->aEnormousIcons->setChecked(size == d->findNearestIconSize(TDEIcon::SizeEnormous));
m_paHugeIcons->setChecked(size == d->findNearestIconSize(TDEIcon::SizeHuge));
m_paLargeIcons->setChecked(size == d->findNearestIconSize(TDEIcon::SizeLarge));
m_paMediumIcons->setChecked(size == d->findNearestIconSize(TDEIcon::SizeMedium));
d->aSmallMediumIcons->setChecked(size == d->findNearestIconSize(TDEIcon::SizeSmallMedium));
m_paSmallIcons->setChecked(size == d->findNearestIconSize(TDEIcon::SizeSmall));
}
// Stores the new icon size and updates the GUI
@ -688,7 +688,7 @@ void KonqDirPart::slotFindClosed()
void KonqDirPart::slotIconChanged( int group )
{
if (group != KIcon::Desktop) return;
if (group != TDEIcon::Desktop) return;
adjustIconSizes();
}

70
libkonq/konq_iconviewwidget.cc
Unescape Escape View File

@ -115,7 +115,7 @@ struct KonqIconViewWidgetPrivate
};
KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WFlags f, bool kdesktop )
: KIconView( parent, name, f ),
: TDEIconView( parent, name, f ),
m_rootItem( 0L ), m_size( 0 ) /* default is DesktopIcon size */,
m_bDesktop( kdesktop ),
m_bSetGridX( !kdesktop ) /* No line breaking on the desktop */
@ -186,7 +186,7 @@ void KonqIconViewWidget::focusOutEvent( TQFocusEvent * ev )
// Matt Newell 2004-09-24
slotOnViewport();
KIconView::focusOutEvent( ev );
TDEIconView::focusOutEvent( ev );
}
void KonqIconViewWidget::slotItemRenamed(TQIconViewItem *item, const TQString &name)
@ -196,7 +196,7 @@ void KonqIconViewWidget::slotItemRenamed(TQIconViewItem *item, const TQString &n
KFileItem *fileItem = viewItem->item();
// The correct behavior is to show the old name until the rename has successfully
// completed. Unfortunately, KIconView forces us to allow the text to be changed
// completed. Unfortunately, TDEIconView forces us to allow the text to be changed
// before we try the rename, so set it back to the pre-rename state.
viewItem->setText( fileItem->text() );
kdDebug(1203)<<" fileItem->text() ;"<<fileItem->text()<<endl;
@ -215,7 +215,7 @@ void KonqIconViewWidget::slotItemRenamed(TQIconViewItem *item, const TQString &n
void KonqIconViewWidget::slotIconChanged( int group )
{
if (group != KIcon::Desktop)
if (group != TDEIcon::Desktop)
return;
int size = m_size;
@ -292,7 +292,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
else
#endif
{
TQMovie movie = TDEGlobal::iconLoader()->loadMovie( d->pActiveItem->mouseOverAnimation(), KIcon::Desktop, d->pActiveItem->iconSize() );
TQMovie movie = TDEGlobal::iconLoader()->loadMovie( d->pActiveItem->mouseOverAnimation(), TDEIcon::Desktop, d->pActiveItem->iconSize() );
if ( !movie.isNull() )
{
delete d->m_movie;
@ -398,7 +398,7 @@ void KonqIconViewWidget::slotOnViewport()
}
#endif
d->pActiveItem->refreshIcon( true );
Q_ASSERT( d->pActiveItem->state() == KIcon::DefaultState );
Q_ASSERT( d->pActiveItem->state() == TDEIcon::DefaultState );
//delete d->m_movie;
//d->m_movie = 0L;
// TODO a timer to delete the movie after some time if unused?
@ -427,10 +427,10 @@ void KonqIconViewWidget::slotPreview(const KFileItem *item, const TQPixmap &pix)
KFileIVI* current = static_cast<KFileIVI *>(it);
if (current->item() == item)
{
if (item->overlays() & KIcon::HiddenOverlay) {
if (item->overlays() & TDEIcon::HiddenOverlay) {
TQPixmap p(pix);
KIconEffect::semiTransparent(p);
TDEIconEffect::semiTransparent(p);
current->setThumbnailPixmap(p);
} else {
current->setThumbnailPixmap(pix);
@ -464,10 +464,10 @@ void KonqIconViewWidget::slotMovieUpdate( const TQRect& rect )
// seems stopAnimation triggers one last update
if ( d->pActiveItem && d->m_movie && d->pActiveItem->isAnimated() ) {
const TQPixmap &frame = d->m_movie->framePixmap();
// This can happen if the icon was scaled to the desired size, so KIconLoader
// This can happen if the icon was scaled to the desired size, so TDEIconLoader
// will happily return a movie with different dimensions than the icon
int iconSize=d->pActiveItem->iconSize();
if (iconSize==0) iconSize = TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
if (iconSize==0) iconSize = TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
if ( frame.width() != iconSize || frame.height() != iconSize ) {
d->pActiveItem->setAnimated( false );
d->m_movie->pause();
@ -509,7 +509,7 @@ void KonqIconViewWidget::clear()
{
d->pFileTip->setItem( 0L );
stopImagePreview(); // Just in case
KIconView::clear();
TDEIconView::clear();
d->pActiveItem = 0L;
}
@ -524,7 +524,7 @@ void KonqIconViewWidget::takeItem( TQIconViewItem *item )
if ( d->pPreviewJob )
d->pPreviewJob->removeItem( static_cast<KFileIVI *>(item)->item() );
KIconView::takeItem( item );
TDEIconView::takeItem( item );
}
// Currently unused - remove in KDE 4.0
@ -636,9 +636,9 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
if ( sizeChanged || previewSizeChanged )
{
int realSize = size ? size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int realSize = size ? size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
// choose spacing depending on font, but min 5 (due to KFileIVI move limit)
setSpacing( ( m_bDesktop || ( realSize > KIcon::SizeSmall ) ) ?
setSpacing( ( m_bDesktop || ( realSize > TDEIcon::SizeSmall ) ) ?
QMAX( 5, TQFontMetrics(font()).width('n') ) : 0 );
}
@ -707,7 +707,7 @@ bool KonqIconViewWidget::mimeTypeMatch( const TQString& mimeType, const TQString
void KonqIconViewWidget::setItemTextPos( ItemTextPos pos )
{
// can't call gridXValue() because this already would need the new itemTextPos()
int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
if ( m_bSetGridX )
if ( pos == TQIconView::Bottom )
@ -718,14 +718,14 @@ void KonqIconViewWidget::setItemTextPos( ItemTextPos pos )
setGridX( -1 );
}
KIconView::setItemTextPos( pos );
TDEIconView::setItemTextPos( pos );
}
void KonqIconViewWidget::gridValues( int* x, int* y, int* dx, int* dy,
int* nx, int* ny )
{
int previewSize = previewIconSize( m_size );
int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
// Grid size
// as KFileIVI limits to move an icon to x >= 5, y >= 5, we define a grid cell as:
@ -786,7 +786,7 @@ void KonqIconViewWidget::calculateGridX()
int KonqIconViewWidget::gridXValue() const
{
// this method is only used in konqi as filemanager (not desktop)
int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
int newGridX;
if ( itemTextPos() == TQIconView::Bottom )
@ -858,7 +858,7 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
return; // don't start the preview job if not really necessary
}
int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
int size;
d->bBoostPreview = boostPreview();
@ -1017,7 +1017,7 @@ void KonqIconViewWidget::contentsDragEnterEvent( TQDragEnterEvent *e )
}
}
KIconView::contentsDragEnterEvent( e );
TDEIconView::contentsDragEnterEvent( e );
emit dragEntered( true /*accepted*/ );
}
@ -1039,13 +1039,13 @@ void KonqIconViewWidget::contentsDragMoveEvent( TQDragMoveEvent *e )
return;
}
emit dragMove( true );
KIconView::contentsDragMoveEvent( e );
TDEIconView::contentsDragMoveEvent( e );
}
void KonqIconViewWidget::contentsDragLeaveEvent( TQDragLeaveEvent *e )
{
d->bProgramsURLdrag = false;
KIconView::contentsDragLeaveEvent(e);
TDEIconView::contentsDragLeaveEvent(e);
emit dragLeft();
}
@ -1231,7 +1231,7 @@ void KonqIconViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
}
}
d->renameItem= false;
KIconView::contentsMouseMoveEvent( e );
TDEIconView::contentsMouseMoveEvent( e );
}
void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev )
@ -1252,7 +1252,7 @@ void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev )
// First we need to call TQIconView though, to clear the drag shape
bool bMovable = itemsMovable();
setItemsMovable(false); // hack ? call it what you want :-)
KIconView::contentsDropEvent( ev );
TDEIconView::contentsDropEvent( ev );
setItemsMovable(bMovable);
TQValueList<TQIconDragItem> lst;
@ -1260,7 +1260,7 @@ void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev )
}
else
{
KIconView::contentsDropEvent( ev );
TDEIconView::contentsDropEvent( ev );
emit dropped(); // What is this for ? (David) KDE4: remove
}
// Don't do this here, it's too early !
@ -1302,7 +1302,7 @@ void KonqIconViewWidget::doubleClickTimeout()
else
{
TQMouseEvent e( TQEvent::MouseMove,d->mousePos , 1, d->mouseState);
KIconView::contentsMousePressEvent( &e );
TDEIconView::contentsMousePressEvent( &e );
}
if( d->pActivateDoubleClick->isActive() )
d->pActivateDoubleClick->stop();
@ -1330,7 +1330,7 @@ void KonqIconViewWidget::wheelEvent(TQWheelEvent* e)
return;
}
KIconView::wheelEvent(e);
TDEIconView::wheelEvent(e);
}
void KonqIconViewWidget::leaveEvent( TQEvent *e )
@ -1338,7 +1338,7 @@ void KonqIconViewWidget::leaveEvent( TQEvent *e )
// when leaving the widget, stop possible pending filetip and icon effect
slotOnViewport();
KIconView::leaveEvent(e);
TDEIconView::leaveEvent(e);
}
void KonqIconViewWidget::mousePressChangeValue()
@ -1393,13 +1393,13 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
mousePressChangeValue();
if(d->pActivateDoubleClick && d->pActivateDoubleClick->isActive())
d->pActivateDoubleClick->stop();
KIconView::contentsMousePressEvent( e );
TDEIconView::contentsMousePressEvent( e );
}
void KonqIconViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e )
{
KIconView::contentsMouseReleaseEvent( e );
TDEIconView::contentsMouseReleaseEvent( e );
if(d->releaseMouseEvent && d->pActivateDoubleClick && d->pActivateDoubleClick->isActive ())
d->pActivateDoubleClick->stop();
slotSelectionChanged();
@ -1475,7 +1475,7 @@ void KonqIconViewWidget::insertInGrid(TQIconViewItem *item)
if (!m_IconRect.isValid())
{
KIconView::insertInGrid(item);
TDEIconView::insertInGrid(item);
return;
}
@ -1564,7 +1564,7 @@ void KonqIconViewWidget::lineupIcons()
return;
}
int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
typedef TQValueList<TQIconViewItem*> Bin;
Bin*** bins = new Bin**[nx];
@ -1809,7 +1809,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement )
int KonqIconViewWidget::largestPreviewIconSize( int size ) const
{
int iconSize = size ? size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int iconSize = size ? size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
if (iconSize < 28)
return 48;
@ -1825,7 +1825,7 @@ int KonqIconViewWidget::largestPreviewIconSize( int size ) const
int KonqIconViewWidget::previewIconSize( int size ) const
{
int iconSize = size ? size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int iconSize = size ? size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
if (!d->bBoostPreview)
return iconSize;
@ -1849,7 +1849,7 @@ void KonqIconViewWidget::visualActivate(TQIconViewItem * item)
rect.moveBy( -contentsX(), -contentsY() );
if (TDEGlobalSettings::showKonqIconActivationEffect() == true) {
KIconEffect::visualActivate(viewport(), rect, item->pixmap());
TDEIconEffect::visualActivate(viewport(), rect, item->pixmap());
}
}

2
libkonq/konq_iconviewwidget.h
Unescape Escape View File

@ -39,7 +39,7 @@ namespace TDEIO { class Job; }
* Used by kdesktop and konq_iconview.
*
*/
class LIBKONQ_EXPORT KonqIconViewWidget : public KIconView
class LIBKONQ_EXPORT KonqIconViewWidget : public TDEIconView
{
Q_OBJECT
TQ_PROPERTY( bool sortDirectoriesFirst READ sortDirectoriesFirst WRITE setSortDirectoriesFirst )

6
libkonq/konq_pixmapprovider.cc
Unescape Escape View File

@ -162,7 +162,7 @@ void KonqPixmapProvider::clear()
TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon,
int size )
{
if ( size <= KIcon::SizeSmall )
if ( size <= TDEIcon::SizeSmall )
return SmallIcon( icon, size );
KURL u;
@ -177,7 +177,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon
if ( url.startsWith( "http:/" ) && icon.startsWith("favicons/") ) {
TQPixmap small = SmallIcon( icon, size );
big = TDEGlobal::iconLoader()->loadIcon( KProtocolInfo::icon("http"),
KIcon::Panel, size );
TDEIcon::Panel, size );
int x = big.width() - small.width();
int y = 0;
@ -195,7 +195,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon
}
else // not a favicon..
big = TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Panel, size );
big = TDEGlobal::iconLoader()->loadIcon( icon, TDEIcon::Panel, size );
return big;
}

2
libkonq/konq_popupmenu.cc
Unescape Escape View File

@ -924,7 +924,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( menu == m_menuElement ) // no submenu -> prefix single offer
actionName = i18n( "Open with %1" ).arg( actionName );
act = new TDEAction( actionName, (*it)->pixmap( KIcon::Small ), 0,
act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ),
&m_ownActions, nam.prepend( "appservice_" ) );
addAction( act, menu );

64
libkonq/tdefileivi.cc
Unescape Escape View File

@ -49,8 +49,8 @@ struct KFileIVI::Private
};
KFileIVI::KFileIVI( KonqIconViewWidget *iconview, KFileItem* fileitem, int size )
: KIconViewItem( iconview, fileitem->text() ),
m_size( size ), m_state( KIcon::DefaultState ),
: TDEIconViewItem( iconview, fileitem->text() ),
m_size( size ), m_state( TDEIcon::DefaultState ),
m_bDisabled( false ), m_bThumbnail( false ), m_fileitem( fileitem )
{
d = new KFileIVI::Private;
@ -86,20 +86,20 @@ void KFileIVI::invalidateThumb( int state, bool redraw )
TQIconSet::Mode mode;
switch( state )
{
case KIcon::DisabledState:
case TDEIcon::DisabledState:
mode = TQIconSet::Disabled;
break;
case KIcon::ActiveState:
case TDEIcon::ActiveState:
mode = TQIconSet::Active;
break;
case KIcon::DefaultState:
case TDEIcon::DefaultState:
default:
mode = TQIconSet::Normal;
break;
}
d->icons = TQIconSet();
d->icons.setPixmap( TDEGlobal::iconLoader()->iconEffect()->
apply( d->thumb, KIcon::Desktop, state ),
apply( d->thumb, TDEIcon::Desktop, state ),
TQIconSet::Large, mode );
m_state = state;
@ -112,7 +112,7 @@ void KFileIVI::setIcon( int size, int state, bool recalc, bool redraw )
m_size = size;
m_bThumbnail = false;
if ( m_bDisabled )
m_state = KIcon::DisabledState;
m_state = TDEIcon::DisabledState;
else
m_state = state;
@ -121,7 +121,7 @@ void KFileIVI::setIcon( int size, int state, bool recalc, bool redraw )
else {
int halfSize;
if (m_size == 0) {
halfSize = IconSize(KIcon::Desktop) / 2;
halfSize = IconSize(TDEIcon::Desktop) / 2;
} else {
halfSize = m_size / 2;
}
@ -165,13 +165,13 @@ void KFileIVI::setPixmapDirect( const TQPixmap& pixmap, bool recalc, bool redraw
TQIconSet::Mode mode;
switch( m_state )
{
case KIcon::DisabledState:
case TDEIcon::DisabledState:
mode = TQIconSet::Disabled;
break;
case KIcon::ActiveState:
case TDEIcon::ActiveState:
mode = TQIconSet::Active;
break;
case KIcon::DefaultState:
case TDEIcon::DefaultState:
default:
mode = TQIconSet::Normal;
break;
@ -193,9 +193,9 @@ void KFileIVI::setDisabled( bool disabled )
if ( m_bDisabled != disabled )
{
m_bDisabled = disabled;
bool active = ( m_state == KIcon::ActiveState );
setEffect( m_bDisabled ? KIcon::DisabledState :
( active ? KIcon::ActiveState : KIcon::DefaultState ) );
bool active = ( m_state == TDEIcon::ActiveState );
setEffect( m_bDisabled ? TDEIcon::DisabledState :
( active ? TDEIcon::ActiveState : TDEIcon::DefaultState ) );
}
}
@ -207,10 +207,10 @@ void KFileIVI::setThumbnailPixmap( const TQPixmap & pixmap )
// so we just create a blank TQIconSet here
d->icons = TQIconSet();
d->icons.setPixmap( TDEGlobal::iconLoader()->iconEffect()->
apply( pixmap, KIcon::Desktop, KIcon::DefaultState ),
apply( pixmap, TDEIcon::Desktop, TDEIcon::DefaultState ),
TQIconSet::Large, TQIconSet::Normal );
m_state = KIcon::DefaultState;
m_state = TDEIcon::DefaultState;
// Recalc when setting this pixmap!
updatePixmapSize();
@ -221,9 +221,9 @@ void KFileIVI::setThumbnailPixmap( const TQPixmap & pixmap )
void KFileIVI::setActive( bool active )
{
if ( active )
setEffect( KIcon::ActiveState );
setEffect( TDEIcon::ActiveState );
else
setEffect( m_bDisabled ? KIcon::DisabledState : KIcon::DefaultState );
setEffect( m_bDisabled ? TDEIcon::DisabledState : TDEIcon::DefaultState );
}
void KFileIVI::setEffect( int state )
@ -231,41 +231,41 @@ void KFileIVI::setEffect( int state )
TQIconSet::Mode mode;
switch( state )
{
case KIcon::DisabledState:
case TDEIcon::DisabledState:
mode = TQIconSet::Disabled;
break;
case KIcon::ActiveState:
case TDEIcon::ActiveState:
mode = TQIconSet::Active;
break;
case KIcon::DefaultState:
case TDEIcon::DefaultState:
default:
mode = TQIconSet::Normal;
break;
}
// Do not update if the fingerprint is identical (prevents flicker)!
KIconEffect *effect = TDEGlobal::iconLoader()->iconEffect();
TDEIconEffect *effect = TDEGlobal::iconLoader()->iconEffect();
bool haveEffect = effect->hasEffect( KIcon::Desktop, m_state ) !=
effect->hasEffect( KIcon::Desktop, state );
bool haveEffect = effect->hasEffect( TDEIcon::Desktop, m_state ) !=
effect->hasEffect( TDEIcon::Desktop, state );
//kdDebug(1203) << "desktop;defaultstate=" <<
// effect->fingerprint(KIcon::Desktop, KIcon::DefaultState) <<
// effect->fingerprint(TDEIcon::Desktop, TDEIcon::DefaultState) <<
// endl;
//kdDebug(1203) << "desktop;activestate=" <<
// effect->fingerprint(KIcon::Desktop, KIcon::ActiveState) <<
// effect->fingerprint(TDEIcon::Desktop, TDEIcon::ActiveState) <<
// endl;
if( haveEffect &&
effect->fingerprint( KIcon::Desktop, m_state ) !=
effect->fingerprint( KIcon::Desktop, state ) )
effect->fingerprint( TDEIcon::Desktop, m_state ) !=
effect->fingerprint( TDEIcon::Desktop, state ) )
{
// Effects on are not applied until they are first accessed to
// save memory. Do this now when needed
if( m_bThumbnail )
{
if( d->icons.isGenerated( TQIconSet::Large, mode ) )
d->icons.setPixmap( effect->apply( d->thumb, KIcon::Desktop, state ),
d->icons.setPixmap( effect->apply( d->thumb, TDEIcon::Desktop, state ),
TQIconSet::Large, mode );
}
else
@ -373,7 +373,7 @@ void KFileIVI::paintItem( TQPainter *p, const TQColorGroup &c )
p->setFont( f );
}*/
KIconViewItem::paintItem( p, cg );
TDEIconViewItem::paintItem( p, cg );
paintOverlay(p);
}
@ -427,7 +427,7 @@ void KFileIVI::setMouseOverAnimation( const TQString& movieFileName )
{
if ( !movieFileName.isEmpty() )
{
//kdDebug(1203) << "KIconViewItem::setMouseOverAnimation " << movieFileName << endl;
//kdDebug(1203) << "TDEIconViewItem::setMouseOverAnimation " << movieFileName << endl;
d->m_animatedIcon = movieFileName;
}
}
@ -459,7 +459,7 @@ int KFileIVI::compare( TQIconViewItem *i ) const
void KFileIVI::updatePixmapSize()
{
int size = m_size ? m_size :
TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
KonqIconViewWidget* view = static_cast<KonqIconViewWidget*>( iconView() );

20
libkonq/tdefileivi.h
Unescape Escape View File

@ -30,12 +30,12 @@ class KIVDirectoryOverlay;
/**
* KFileIVI (short form of "Konq - File - IconViewItem")
* is, as expected, an improved KIconViewItem, because
* is, as expected, an improved TDEIconViewItem, because
* it represents a file.
* All the information about the file is contained in the KFileItem
* pointer.
*/
class LIBKONQ_EXPORT KFileIVI : public KIconViewItem
class LIBKONQ_EXPORT KFileIVI : public TDEIconViewItem
{
public:
/**
@ -67,12 +67,12 @@ public:
/**
* Changes the icon for this item.
* @param size the icon size (0 for default, otherwise size in pixels)
* @param state the state of the icon (enum in KIcon)
* @param state the state of the icon (enum in TDEIcon)
* @param recalc whether to update the layout of the icon view when setting the icon
* @param redraw whether to redraw the item after setting the icon
*/
virtual void setIcon( int size,
int state=KIcon::DefaultState,
int state=TDEIcon::DefaultState,
bool recalc=false,
bool redraw=false);
@ -92,7 +92,7 @@ public:
* e.g. because the effect settings have been changed. The thumb itself
* is assumed to be still valid (use setThumbnailPixmap() instead
* otherwise).
* @param state the state of the icon (enum in KIcon)
* @param state the state of the icon (enum in TDEIcon)
* @param redraw whether to redraw the item after setting the icon
*/
void invalidateThumb( int state, bool redraw = false );
@ -108,7 +108,7 @@ public:
/**
* Return the current state of the icon
* (KIcon::DefaultState, KIcon::ActiveState etc.)
* (TDEIcon::DefaultState, TDEIcon::ActiveState etc.)
*/
int state() const { return m_state; }
@ -128,8 +128,8 @@ public:
void setThumbnailPixmap( const TQPixmap & pixmap );
/**
* Set the icon to use the specified KIconEffect
* See the docs for KIconEffect for details.
* Set the icon to use the specified TDEIconEffect
* See the docs for TDEIconEffect for details.
*/
void setEffect( /*int group,*/ int state );
@ -214,9 +214,9 @@ protected:
private:
/** You are not supposed to call this on a KFileIVI, from the outside,
* it bypasses the icons cache */
virtual void setPixmap ( const TQPixmap & icon ) { KIconViewItem::setPixmap( icon ); }
virtual void setPixmap ( const TQPixmap & icon ) { TDEIconViewItem::setPixmap( icon ); }
virtual void setPixmap ( const TQPixmap & icon, bool recalc, bool redraw = TRUE )
{ KIconViewItem::setPixmap( icon, recalc, redraw ); }
{ TDEIconViewItem::setPixmap( icon, recalc, redraw ); }
/** Check if a thumbnail will be generated and calc the size of the icon */
void updatePixmapSize();

2
tdeioslave/info/info.cc
Unescape Escape View File

@ -92,7 +92,7 @@ void InfoProtocol::get( const KURL& url )
// extract the path and node from url
decodeURL( url );
TQString path = TDEGlobal::iconLoader()->iconPath("up", KIcon::Toolbar, true);
TQString path = TDEGlobal::iconLoader()->iconPath("up", TDEIcon::Toolbar, true);
int revindex = path.findRev('/');
path = path.left(revindex);

2
tdeioslave/media/mediamanager/dialog.cpp
Unescape Escape View File

@ -34,7 +34,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
enableButton( User1, false );
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge);
decryptDialog->encryptedIcon->setPixmap( pixmap );
connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));

2
tdeioslave/media/mounthelper/dialog.cpp
Unescape Escape View File

@ -34,7 +34,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
enableButton( User1, false );
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge);
decryptDialog->encryptedIcon->setPixmap( pixmap );
connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));

2
tdeioslave/media/tdecmodule/serviceview.ui
Unescape Escape View File

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

6
tdeioslave/thumbnail/thumbnail.cpp
Unescape Escape View File

@ -195,7 +195,7 @@ void ThumbnailProtocol::get(const KURL &url)
#endif
if (!iconSize)
iconSize = TDEGlobal::iconLoader()->currentSize(KIcon::Desktop);
iconSize = TDEGlobal::iconLoader()->currentSize(TDEIcon::Desktop);
if (iconSize != m_iconSize)
m_iconDict.clear();
m_iconSize = iconSize;
@ -341,7 +341,7 @@ void ThumbnailProtocol::get(const KURL &url)
}
#endif
if ((flags & ThumbCreator::BlendIcon) && TDEGlobal::iconLoader()->alphaBlending(KIcon::Desktop))
if ((flags & ThumbCreator::BlendIcon) && TDEGlobal::iconLoader()->alphaBlending(TDEIcon::Desktop))
{
// blending the mimetype icon in
TQImage icon = getIcon();
@ -420,7 +420,7 @@ const TQImage& ThumbnailProtocol::getIcon()
TQImage* icon = m_iconDict.find(m_mimeType);
if ( !icon ) // generate it!
{
icon = new TQImage( KMimeType::mimeType(m_mimeType)->pixmap( KIcon::Desktop, m_iconSize ).convertToImage() );
icon = new TQImage( KMimeType::mimeType(m_mimeType)->pixmap( TDEIcon::Desktop, m_iconSize ).convertToImage() );
icon->setAlphaBuffer( true );
int w = icon->width();

2
tdeprint/slave/tdeio_print.cpp
Unescape Escape View File

@ -796,7 +796,7 @@ TQString KIO_Print::locateData(const TQString& item)
{
TQString path = locate("data", "tdeprint/template/"+item);
if (path.isEmpty())
path = TDEGlobal::iconLoader()->iconPath(item, KIcon::Desktop, true);
path = TDEGlobal::iconLoader()->iconPath(item, TDEIcon::Desktop, true);
return path;
}

2
tdeprint/tdeprintfax/tdeprintfax.cpp
Unescape Escape View File

@ -276,7 +276,7 @@ void KdeprintFax::addURL(KURL url)
TQString target;
if (TDEIO::NetAccess::download(url,target,this))
{
m_files->insertItem(KMimeType::pixmapForURL(url,0,KIcon::Small),target);
m_files->insertItem(KMimeType::pixmapForURL(url,0,TDEIcon::Small),target);
actionCollection()->action("file_remove")->setEnabled(true);
slotCurrentChanged();
}

6
twin/clients/b2/b2client.cpp
Unescape Escape View File

@ -1063,16 +1063,16 @@ static void redraw_pixmaps()
}
// Apply the hilight effect to the 'Hover' icons
KIconEffect ie;
TDEIconEffect ie;
TQPixmap hilighted;
for (i = 0; i < P_NUM_BUTTON_TYPES; i++) {
int offset = i * NumStates;
hilighted = ie.apply(*pixmap[offset + Norm],
KIcon::Small, KIcon::ActiveState);
TDEIcon::Small, TDEIcon::ActiveState);
*pixmap[offset + Hover] = hilighted;
hilighted = ie.apply(*pixmap[offset + INorm],
KIcon::Small, KIcon::ActiveState);
TDEIcon::Small, TDEIcon::ActiveState);
*pixmap[offset + IHover] = hilighted;
}

4
twin/clients/keramik/keramik.cpp
Unescape Escape View File

@ -633,7 +633,7 @@ TQImage *KeramikHandler::loadImage( const TQString &name, const TQColor &col )
{
if ( col.isValid() ) {
TQImage *img = new TQImage( imageDb->image(name)->copy() );
KIconEffect::colorize( *img, col, 1.0 );
TDEIconEffect::colorize( *img, col, 1.0 );
return img;
} else
return new TQImage( imageDb->image(name)->copy() );
@ -1268,7 +1268,7 @@ void KeramikClient::updateCaptionBuffer()
} else {
if ( ! inactiveIcon ) {
TQImage img = this->icon().pixmap( TQIconSet::Small, TQIconSet::Normal ).convertToImage();
KIconEffect::semiTransparent( img );
TDEIconEffect::semiTransparent( img );
inactiveIcon = new TQPixmap( img );
}
icon = inactiveIcon;

4
twin/kcmtwin/twindecoration/preview.cpp
Unescape Escape View File

@ -321,8 +321,8 @@ NET::WindowType KDecorationPreviewBridge::windowType( unsigned long ) const
TQIconSet KDecorationPreviewBridge::icon() const
{
return TQIconSet( TDEGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ),
TDEGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 ));
return TQIconSet( TDEGlobal::iconLoader()->loadIcon( "xapp", TDEIcon::NoGroup, 16 ),
TDEGlobal::iconLoader()->loadIcon( "xapp", TDEIcon::NoGroup, 32 ));
}
TQString KDecorationPreviewBridge::caption() const

2
twin/tabbox.cpp
Unescape Escape View File

@ -434,7 +434,7 @@ void TabBox::drawContents( TQPainter * )
if( !icon.isNull())
{
if( (*it)->isMinimized())
KIconEffect::semiTransparent( icon );
TDEIconEffect::semiTransparent( icon );
p.drawPixmap( x+5, y + (lineHeight - iconWidth)/2, icon );
}

Write Preview
Loading…
Cancel
Save