diff --git a/KDE2PORTING.html b/KDE2PORTING.html index 47e00c03b..1c8f95e38 100644 --- a/KDE2PORTING.html +++ b/KDE2PORTING.html @@ -23,7 +23,7 @@ or this page online.
#include <kglobal.h> #include <tdeconfig.h> // Needed to use TDEConfig #include <klocale.h> // Needed to use TDELocale - #include <kiconloader.h> // Needed to use KIconLoader + #include <kiconloader.h> // Needed to use TDEIconLoader @@ -219,7 +219,7 @@ must have created a TDEApplication object before the methods can be used.
TQString mystr = i18n( "This is a string" ); - KIconLoader *loader = TDEGlobal::iconLoader(); + TDEIconLoader *loader = TDEGlobal::iconLoader(); @@ -227,9 +227,9 @@ must have created a TDEApplication object before the methods can be used.
Return to the Table of Contents
-If you need icons for applications, use loadApplicationIcon.
diff --git a/KDE3PORTING.html b/KDE3PORTING.html index 912f81b60..edd317c11 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -211,10 +211,10 @@ The preferred means of defining a shortcut, however, is to use TDEAction. -
Return to the Table of Contents
@@ -323,13 +323,13 @@ present in Qt3/KDE3. KThemeBase is no longer in tdeui, but in kstyles/kthemestyl as its use is basically limited to KThemeStyle.Method TDEAction::hasIconSet() has been renamed to TDEAction::hasIcon(), the old name will still work unless KDE_NO_COMPAT is defined. TDEAction::iconSet() now has an argument specifying icon group, the old TDEAction::iconSet() is still available unless KDE_NO_COMPAT -is defined and returns KIcon::Small iconset, just like in KDE2. +is defined and returns TDEIcon::Small iconset, just like in KDE2.
TDEToolBarButton methods setPixmap(), setDefaultPixmap(), setDisabledPixmap(), setDefaultIcon() and setDisabledIcon() are deprecated. Use TDEToolBarButton::setIcon() (preferred) or TDEToolBarButton::setIconSet() instead. @@ -420,7 +420,7 @@ The merging of libtdeio, libtdesycoca, libtdefile and libkssl into a single libt allowed to fix this dependency problem: KRun can now use the OpenWith dialog directly.
Return to the Table of Contents
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index 4cc9a2553..a5b736608 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -591,11 +591,11 @@ bool KNotify::notifyByPassivePopup( const TQString &text, TDEConfig* eventsFile, WId senderWinId ) { - KIconLoader iconLoader( appName ); + TDEIconLoader iconLoader( appName ); if ( eventsFile != NULL ) { TDEConfigGroup config( eventsFile, "!Global!" ); TQString iconName = config.readEntry( "IconName", appName ); - TQPixmap icon = iconLoader.loadIcon( iconName, KIcon::Small ); + TQPixmap icon = iconLoader.loadIcon( iconName, TDEIcon::Small ); TQString title = config.readEntry( "Comment", appName ); KPassivePopup::message(title, text, icon, senderWinId); } else diff --git a/interfaces/tdetexteditor/configinterfaceextension.h b/interfaces/tdetexteditor/configinterfaceextension.h index d139ba696..23fa5bb38 100644 --- a/interfaces/tdetexteditor/configinterfaceextension.h +++ b/interfaces/tdetexteditor/configinterfaceextension.h @@ -95,7 +95,7 @@ class KTEXTEDITOR_EXPORT ConfigInterfaceExtension 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: diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index 0bf1d7ea7..35a836072 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -1226,7 +1226,7 @@ void KatePartPluginConfigPage::slotConfigure() path.clear(); path << cife->configPageName( i ); page = kd->addVBoxPage( path, cife->configPageFullName (i), - cife->configPagePixmap(i, KIcon::SizeMedium) ); + cife->configPagePixmap(i, TDEIcon::SizeMedium) ); } else { diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index fbfc43eef..22a207fac 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -1998,7 +1998,7 @@ void KateDocument::configDialog() path.clear(); path << KTextEditor::configInterfaceExtension (this)->configPageName (i); TQVBox *page = kd->addVBoxPage(path, KTextEditor::configInterfaceExtension (this)->configPageFullName (i), - KTextEditor::configInterfaceExtension (this)->configPagePixmap(i, KIcon::SizeMedium) ); + KTextEditor::configInterfaceExtension (this)->configPagePixmap(i, TDEIcon::SizeMedium) ); editorPages.append (KTextEditor::configInterfaceExtension (this)->configPage(i, page)); } diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h index c04ede651..a2a2c6408 100644 --- a/kate/part/katedocument.h +++ b/kate/part/katedocument.h @@ -163,7 +163,7 @@ class KateDocument : public Kate::Document, KTextEditor::ConfigPage *configPage (uint number = 0, TQWidget *parent = 0, const char *name=0 ); TQString configPageName (uint number = 0) const; TQString configPageFullName (uint number = 0) const; - TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const; + TQPixmap configPagePixmap (uint number = 0, int size = TDEIcon::SizeSmall) const; // // KTextEditor::EditInterface stuff diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets index 2ea458449..c81df5394 100644 --- a/kdewidgets/kde.widgets +++ b/kdewidgets/kde.widgets @@ -145,12 +145,12 @@ Group=Buttons (KDE) ToolTip=Line Edit for restricted input (KDE) Group=Input (KDE) -[KIconButton] +[TDEIconButton] IncludeFile=kicondialog.h ToolTip=Button for selecting an icon (KDE) Group=Buttons (KDE) -[KIconView] +[TDEIconView] IncludeFile=kiconview.h ToolTip=Extended Icon View (KDE) WhatsThis=An improved version of the TQIconView that allows certain KDE extensions diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets index d223f8995..30758f69e 100644 --- a/kdewidgets/tests/test.widgets +++ b/kdewidgets/tests/test.widgets @@ -134,12 +134,12 @@ Group=Buttons (KDE) ToolTip=Line Edit for restricted input (KDE) Group=Input (KDE) -[KIconButton] +[TDEIconButton] IncludeFile=kicondialog.h ToolTip=Button for selecting an icon (KDE) Group=Buttons (KDE) -[KIconView] +[TDEIconView] IncludeFile=kiconview.h ToolTip=Extended Icon View (KDE) WhatsThis=An improved version of the QIconView that allows certain KDE extensions diff --git a/kdoctools/customization/entities/general.entities b/kdoctools/customization/entities/general.entities index eb43dc8c7..313b848fc 100644 --- a/kdoctools/customization/entities/general.entities +++ b/kdoctools/customization/entities/general.entities @@ -223,7 +223,7 @@ KHelpCenter"> KHexEdit"> Kicker"> -KIconEdit"> +TDEIconEdit"> Kig"> kikbd"> KInfoCenter"> diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities index a54a96fcb..518ba097b 100644 --- a/kdoctools/customization/obsolete/general.entities +++ b/kdoctools/customization/obsolete/general.entities @@ -213,7 +213,7 @@ KHelpCenter"> KHexEdit"> Kicker"> -KIconEdit"> +TDEIconEdit"> kikbd"> Kit"> Kiten"> diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp index af5b2c7c3..4ca68fbcb 100644 --- a/knewstuff/downloaddialog.cpp +++ b/knewstuff/downloaddialog.cpp @@ -242,11 +242,11 @@ void DownloadDialog::addProvider(Provider *p) } else { - pix = TDEGlobal::iconLoader()->loadIcon(p->icon().path(), KIcon::Panel); + pix = TDEGlobal::iconLoader()->loadIcon(p->icon().path(), TDEIcon::Panel); ret = true; } } - if(!ret) pix = TDEGlobal::iconLoader()->loadIcon("knewstuff", KIcon::Panel); + if(!ret) pix = TDEGlobal::iconLoader()->loadIcon("knewstuff", TDEIcon::Panel); frame = addPage(p->name(), p->name(), pix); m_frame = frame; @@ -415,8 +415,8 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants) installed = installStatus(entry); - if(installed > 0) pix = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); - else if(installed < 0) pix = TDEGlobal::iconLoader()->loadIcon("history", KIcon::Small); + if(installed > 0) pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small); + else if(installed < 0) pix = TDEGlobal::iconLoader()->loadIcon("history", TDEIcon::Small); else pix = TQPixmap(); TQString lang = TDEGlobal::locale()->language(); @@ -550,7 +550,7 @@ void DownloadDialog::install(Entry *e) kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(Qt::ISODate))); kapp->config()->sync(); - TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small); TQString lang = TDEGlobal::locale()->language(); diff --git a/tdecore/AUTHORS b/tdecore/AUTHORS index ce19e095b..dbe44b9ca 100644 --- a/tdecore/AUTHORS +++ b/tdecore/AUTHORS @@ -40,7 +40,7 @@ Christian Czezatke" "Click on the button to select a different icon.