From de9b6c9ad15f9f51812daae17cce635d1050a9ba Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:14:55 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kcontrol/access/kaccess.cpp | 2 +- kcontrol/filetypes/filetypedetails.cpp | 4 +- kcontrol/filetypes/filetypedetails.h | 4 +- kcontrol/filetypes/filetypesview.h | 2 +- kcontrol/filetypes/typeslistitem.cpp | 2 +- kcontrol/hwmanager/deviceiconview.cpp | 4 +- kcontrol/hwmanager/deviceiconview.h | 2 +- kcontrol/hwmanager/devicepropsdlg.cpp | 2 +- kcontrol/icons/icons.cpp | 174 ++++++++++----------- kcontrol/icons/icons.h | 26 +-- kcontrol/icons/iconthemes.cpp | 48 +++--- kcontrol/icons/main.cpp | 2 +- kcontrol/icons/testicons.cpp | 2 +- kcontrol/joystick/joywidget.cpp | 4 +- kcontrol/kcontrol/aboutwidget.cpp | 6 +- kcontrol/kcontrol/dockcontainer.cpp | 4 +- kcontrol/kcontrol/global.cpp | 2 +- kcontrol/kcontrol/global.h | 6 +- kcontrol/kcontrol/modulemenu.cpp | 4 +- kcontrol/kcontrol/moduletreeview.cpp | 8 +- kcontrol/kcontrol/searchwidget.cpp | 2 +- kcontrol/kcontrol/toplevel.cpp | 32 ++-- kcontrol/kicker/menutab_impl.cpp | 12 +- kcontrol/konsole/sessiondialog.ui | 2 +- kcontrol/kthememanager/ktheme.cpp | 4 +- kcontrol/kthememanager/kthememanager.cpp | 16 +- kcontrol/kthememanager/kthememanager.h | 8 +- kcontrol/locale/kcmlocale.cpp | 4 +- kcontrol/style/menupreview.cpp | 4 +- kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp | 8 +- kcontrol/tdeio/kmanualproxydlg.cpp | 2 +- kcontrol/tdm/tdm-appear.cpp | 2 +- 32 files changed, 202 insertions(+), 202 deletions(-) (limited to 'kcontrol') diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 8c6717e63..161f4c319 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -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); diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp index 3aa961b4c..93c294393 100644 --- a/kcontrol/filetypes/filetypedetails.cpp +++ b/kcontrol/filetypes/filetypedetails.cpp @@ -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); diff --git a/kcontrol/filetypes/filetypedetails.h b/kcontrol/filetypes/filetypedetails.h index 354419e0e..936e1c535 100644 --- a/kcontrol/filetypes/filetypedetails.h +++ b/kcontrol/filetypes/filetypedetails.h @@ -3,7 +3,7 @@ #include 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; diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h index 405238e0e..16e7bff3e 100644 --- a/kcontrol/filetypes/filetypesview.h +++ b/kcontrol/filetypes/filetypesview.h @@ -14,7 +14,7 @@ class TDEListView; class TQListViewItem; class TQListBox; class TQPushButton; -class KIconButton; +class TDEIconButton; class TQLineEdit; class TQComboBox; class FileTypeDetails; diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp index b5ccd26ef..63d65e4ec 100644 --- a/kcontrol/filetypes/typeslistitem.cpp +++ b/kcontrol/filetypes/typeslistitem.cpp @@ -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(); } diff --git a/kcontrol/hwmanager/deviceiconview.cpp b/kcontrol/hwmanager/deviceiconview.cpp index d5ebbabce..0255c01c1 100644 --- a/kcontrol/hwmanager/deviceiconview.cpp +++ b/kcontrol/hwmanager/deviceiconview.cpp @@ -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; } \ No newline at end of file diff --git a/kcontrol/hwmanager/deviceiconview.h b/kcontrol/hwmanager/deviceiconview.h index 2046c165f..913c4c9ef 100644 --- a/kcontrol/hwmanager/deviceiconview.h +++ b/kcontrol/hwmanager/deviceiconview.h @@ -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*); diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index c271fa13b..80a930e02 100644 --- a/kcontrol/hwmanager/devicepropsdlg.cpp +++ b/kcontrol/hwmanager/devicepropsdlg.cpp @@ -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(""):m_device->deviceNode()); base->labelSystemPath->setText(m_device->systemPath()); diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index 710927b8a..4287725b3 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -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; iquerySizes(i); mTheme = mpTheme->current(); @@ -238,7 +238,7 @@ void KIconConfig::read() } else { - for (KIcon::Group i=KIcon::FirstGroup; i(); 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::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; idcopClient()->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; icurrentText() == 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(); diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h index aafa31748..1438a9f1a 100644 --- a/kcontrol/icons/icons.h +++ b/kcontrol/icons/icons.h @@ -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; diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index cb0d23508..f1b5ada9e 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -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."). 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; iaddTab(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))); diff --git a/kcontrol/icons/testicons.cpp b/kcontrol/icons/testicons.cpp index 64f326ebf..85adb7b35 100644 --- a/kcontrol/icons/testicons.cpp +++ b/kcontrol/icons/testicons.cpp @@ -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(); diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index 0214b2791..d6533aefb 100644 --- a/kcontrol/joystick/joywidget.cpp +++ b/kcontrol/joystick/joywidget.cpp @@ -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(); diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index ad2b11463..8068023a5 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -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 += "
 " + _caption + "
"; } @@ -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 += " " + szName + "" + szComment; KURL moduleURL( TQString("kcm://%1").arg(TQString().sprintf("%p",module)) ); diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index d6cdd91d1..a929df229 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -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() ); diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp index 09f0e4047..2c7266468 100644 --- a/kcontrol/kcontrol/global.cpp +++ b/kcontrol/kcontrol/global.cpp @@ -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() diff --git a/kcontrol/kcontrol/global.h b/kcontrol/kcontrol/global.h index 551b3fcb6..0fbc1d9b7 100644 --- a/kcontrol/kcontrol/global.h +++ b/kcontrol/kcontrol/global.h @@ -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; }; diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp index 77e442a98..f899eb4c7 100644 --- a/kcontrol/kcontrol/modulemenu.cpp +++ b/kcontrol/kcontrol/modulemenu.cpp @@ -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); diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index 982cef297..df69395ee 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -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; diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp index cee6cbfd4..e53c899da 100644 --- a/kcontrol/kcontrol/searchwidget.cpp +++ b/kcontrol/kcontrol/searchwidget.cpp @@ -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) { diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index 87661f8d5..13c7a6f56 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -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(); } diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index 58cade0cc..b1b0c8f88 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -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; diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui index 9322aad42..1f9eae293 100644 --- a/kcontrol/konsole/sessiondialog.ui +++ b/kcontrol/konsole/sessiondialog.ui @@ -180,7 +180,7 @@ - + previewIcon diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index e686ef347..94d9bf7bd 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -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 ); } diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 87be37c02..23a89ca01 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -385,20 +385,20 @@ void kthememanager::queryLNFModules() if ( p->isType( KST_KService ) ) { KService *s = static_cast( 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 ) diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h index 56b25f94c..2c5e494f4 100644 --- a/kcontrol/kthememanager/kthememanager.h +++ b/kcontrol/kthememanager/kthememanager.h @@ -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() { diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index 288946faf..3d1736676 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -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 ); } diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp index bad8270e0..ecb26816a 100644 --- a/kcontrol/style/menupreview.cpp +++ b/kcontrol/style/menupreview.cpp @@ -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 ); } diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp index fb45b44ca..7732873de 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp @@ -260,7 +260,7 @@ void CKFileFontView::updateView(bool b) { CFontListViewItem *item=static_cast(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)); diff --git a/kcontrol/tdeio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp index eed6d6f7c..9a3bf46c7 100644 --- a/kcontrol/tdeio/kmanualproxydlg.cpp +++ b/kcontrol/tdeio/kmanualproxydlg.cpp @@ -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 ); diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index 2a217fb86..3457a2308 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -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()); -- cgit v1.2.1