From f2bfcad7ffdd09911f282afe2a2051b3708601c9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:16:51 -0600 Subject: [PATCH] Rename KIcon to enhance compatibility with KDE4 --- KDE2PORTING.html | 10 +- KDE3PORTING.html | 18 +- arts/knotify/knotify.cpp | 4 +- .../tdetexteditor/configinterfaceextension.h | 2 +- kate/part/katedialogs.cpp | 2 +- kate/part/katedocument.cpp | 2 +- kate/part/katedocument.h | 2 +- kdewidgets/kde.widgets | 4 +- kdewidgets/tests/test.widgets | 4 +- .../customization/entities/general.entities | 2 +- .../customization/obsolete/general.entities | 2 +- knewstuff/downloaddialog.cpp | 10 +- tdecore/AUTHORS | 2 +- tdecore/kapplication.cpp | 4 +- tdecore/kapplication.h | 2 +- tdecore/kdebug.areas | 4 +- tdecore/kdebugrc | 2 +- tdecore/kglobal.cpp | 2 +- tdecore/kglobal.h | 4 +- tdecore/kiconeffect.cpp | 58 +-- tdecore/kiconeffect.h | 42 +- tdecore/kiconloader.cpp | 382 +++++++++--------- tdecore/kiconloader.h | 152 +++---- tdecore/kiconloader_p.h | 36 +- tdecore/kicontheme.cpp | 168 ++++---- tdecore/kicontheme.h | 66 +-- tdecore/kinstance.cpp | 6 +- tdecore/kinstance.h | 6 +- tdecore/kmimesourcefactory.cpp | 18 +- tdecore/kmimesourcefactory.h | 4 +- tdecore/kpixmapprovider.h | 2 +- tdecore/kstandarddirs.h | 2 +- tdecore/tdehardwaredevices.cpp | 8 +- tdecore/tdehardwaredevices.h | 14 +- tdecore/tests/kiconloadertest.cpp | 8 +- tdecore/twin.cpp | 8 +- tdehtml/ecma/kjs_debugwin.cpp | 8 +- tdehtml/misc/loader.cpp | 2 +- tdehtml/tdehtml_part.cpp | 14 +- tdehtml/tdehtmlview.cpp | 10 +- tdeio/Mainpage.dox | 8 +- tdeio/tdefile/kcustommenueditor.cpp | 4 +- tdeio/tdefile/kicondialog.cpp | 184 ++++----- tdeio/tdefile/kicondialog.h | 100 ++--- tdeio/tdefile/kimagefilepreview.cpp | 4 +- tdeio/tdefile/knotifydialog.cpp | 2 +- tdeio/tdefile/kopenwith.cpp | 2 +- tdeio/tdefile/kpropertiesdialog.cpp | 18 +- tdeio/tdefile/kpropertiesdialog.h | 8 +- tdeio/tdefile/kurlbar.cpp | 32 +- tdeio/tdefile/kurlbar.h | 30 +- tdeio/tdefile/kurlcombobox.cpp | 2 +- tdeio/tdefile/tdefiledetailview.cpp | 8 +- tdeio/tdefile/tdefiledialog.cpp | 8 +- tdeio/tdefile/tdefileiconview.cpp | 48 +-- tdeio/tdefile/tdefileiconview.h | 20 +- tdeio/tdefile/tdefilespeedbar.cpp | 2 +- tdeio/tdefile/tdefiletreebranch.cpp | 2 +- tdeio/tdefile/tdefiletreeview.cpp | 8 +- tdeio/tdefile/tdefiletreeviewitem.cpp | 4 +- tdeio/tdefile/tests/kfstest.cpp | 2 +- tdeio/tdefile/tests/kicondialogtest.cpp | 4 +- tdeio/tdefile/tests/tdefiletreeviewtest.cpp | 6 +- tdeio/tdeio/defaultprogress.cpp | 4 +- tdeio/tdeio/kmimetype.cpp | 14 +- tdeio/tdeio/kmimetype.h | 24 +- tdeio/tdeio/kservice.cpp | 4 +- tdeio/tdeio/kservice.h | 2 +- tdeio/tdeio/kurifilter.cpp | 4 +- tdeio/tdeio/kurlpixmapprovider.cpp | 2 +- tdeio/tdeio/kurlpixmapprovider.h | 2 +- tdeio/tdeio/passdlg.cpp | 2 +- tdeio/tdeio/tdefileitem.cpp | 12 +- tdeio/tdeio/tdefileitem.h | 6 +- tdeio/tests/tdesycocatest.cpp | 2 +- tdeprint/ChangeLog | 2 +- tdeprint/cups/cupsdconf2/cupsddialog.cpp | 4 +- tdeprint/kprintdialog.cpp | 2 +- tdeprint/management/kiconselectaction.cpp | 22 +- tdeprint/management/kiconselectaction.h | 10 +- tdeprint/management/kmconfigdialog.cpp | 4 +- tdeprint/management/kmiconview.cpp | 6 +- tdeprint/management/kmiconview.h | 2 +- tdeprint/management/kmlistview.cpp | 2 +- tdeprint/management/kmmainview.cpp | 4 +- tdeprint/management/kmpropertypage.cpp | 4 +- tdeprint/management/kmspecialprinterdlg.cpp | 2 +- tdeprint/management/kmspecialprinterdlg.h | 4 +- tdeprint/tdefilelist.cpp | 4 +- tdeui/AUTHORS | 2 +- tdeui/kanimwidget.cpp | 2 +- tdeui/kanimwidget.h | 2 +- tdeui/kcombobox.cpp | 4 +- tdeui/kdialog.cpp | 4 +- tdeui/kedittoolbar.cpp | 16 +- tdeui/kguiitem.cpp | 2 +- tdeui/kguiitem.h | 6 +- tdeui/khelpmenu.cpp | 2 +- tdeui/kiconview.cpp | 116 +++--- tdeui/kiconview.h | 48 +-- tdeui/kiconviewsearchline.cpp | 40 +- tdeui/kiconviewsearchline.h | 18 +- tdeui/kmessagebox.cpp | 2 +- tdeui/kpassdlg.cpp | 2 +- tdeui/ksystemtray.cpp | 4 +- tdeui/ktabbar.cpp | 2 +- tdeui/ktip.cpp | 6 +- tdeui/tdeaction.cpp | 10 +- tdeui/tdeaction.h | 6 +- tdeui/tdeactionclasses.cpp | 4 +- tdeui/tdeactionselector.cpp | 2 +- tdeui/tdeactionselector.h | 4 +- tdeui/tdemainwindow.h | 2 +- tdeui/tdetoolbar.cpp | 14 +- tdeui/tdetoolbar.h | 4 +- tdeui/tdetoolbarbutton.cpp | 16 +- tdeui/tests/itemcontainertest.cpp | 16 +- tdeui/tests/itemcontainertest.h | 4 +- tdeutils/kcmultidialog.cpp | 4 +- tdeutils/kpluginselector.cpp | 2 +- tdeutils/ksettings/componentsdialog.cpp | 4 +- tdeutils/ksettings/dialog.cpp | 2 +- tdeutils/tdecmodulecontainer.cpp | 2 +- 123 files changed, 1063 insertions(+), 1063 deletions(-) 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.

  • TDECmdLineArgs
  • TDELocale
  • TDEGlobal: access to KDE global objects.
  • -
  • KIconLoader
  • +
  • TDEIconLoader
  • KTMainWindow
  • KHelpMenu
  • TDEToolBar
  • @@ -207,7 +207,7 @@ must have created a TDEApplication object before the methods can be used.

    #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

    -

    KIconLoader

    +

    TDEIconLoader

    -KIconLoader in 1.1 used to mix icons for applications and for toolbars. +TDEIconLoader in 1.1 used to mix icons for applications and for toolbars. This has changed, so you may notice that your application doesn't find the right icons. loadIcon (used by BarIcon) returns only toolbar icons.

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

    KIconLoader, KIconTheme

    -Methods now use KIcon::Group and KIcon::Context instead of int as types for group and context arguments. +

    TDEIconLoader, TDEIconTheme

    +Methods now use TDEIcon::Group and TDEIcon::Context instead of int as types for group and context arguments. The change should affect only code using hardcoded numeric values instead of using the proper enum constants. -This applies to classes KIconLoader, KIconTheme and (in kio and tdefile) KMimeType, KService, KIconDialog, KIconButton, +This applies to classes TDEIconLoader, TDEIconTheme and (in kio and tdefile) KMimeType, KService, TDEIconDialog, TDEIconButton, KURLBar and KURLBarItem.

    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.

    TDEAction, TDEToolBar, TDEToolBarButton and icons

    -The preferred way for specifying icons is passing the icon names (and the icons will be loaded by KIconLoader), +The preferred way for specifying icons is passing the icon names (and the icons will be loaded by TDEIconLoader), instead of using TQIconSet or TQPixmap. This results in always using the correct icon size and allows delayed on-demand icon loading.

    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.

    KMimeType, KService

    -Methods now use KIcon::Group and KIcon::Context instead of int as types for group and context arguments. +Methods now use TDEIcon::Group and TDEIcon::Context instead of int as types for group and context arguments. The change should affect only code using hardcoded numeric values instead of using the proper enum constants.

    KFilterDev

    @@ -563,7 +563,7 @@ flexibility and efficiency.

    Sorting has changed radically. Previously, KFileView had protected methods QuickSort, compareItems() and mergeLists() to sort directory entries for displaying in the views. Now, -KFileView does not do any sorting anymore. Instead, the view's (i.e. KIconView, TDEListView) +KFileView does not do any sorting anymore. Instead, the view's (i.e. TDEIconView, TDEListView) sorting is utilized by letting its view-items provide a TQString key() method. Therefore, KFileView offers the two methods