Review Request 119444: Replacing also kicon.h header include

David Narváez david.narvaez at computer.org
Wed Jul 23 23:06:46 UTC 2014


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/119444/
-----------------------------------------------------------

Review request for KDE Frameworks.


Repository: kde-dev-scripts


Description
-------

Replacing also kicon.h header include


Diffs
-----

  kf5/convert-kicon.pl bb4b76945f4c75c342f12401fc80a4cadbef03dd 

Diff: https://git.reviewboard.kde.org/r/119444/diff/


Testing
-------

Sample diff with this script

diff --git a/filters/exporter.cc b/filters/exporter.cc
index 2cbecc6..8218d3f 100644
--- a/filters/exporter.cc
+++ b/filters/exporter.cc
@@ -35,7 +35,7 @@
 
 #include <kactionmenu.h>
 #include <kactioncollection.h>
-#include <kicon.h>
+#include <QIcon>
 #include <kimageio.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -48,7 +48,7 @@ ExporterAction::ExporterAction( const KigPart* doc, KigWidget* w,
 {
   QString iconstr = exp->menuIcon();
   if ( !iconstr.isEmpty() )
-    setIcon( KIcon( iconstr, const_cast<KigPart*>( doc )->iconLoader() ) );
+    setIcon( QIcon::fromTheme( iconstr, const_cast<KigPart*>( doc )->iconLoader() ) );
   connect( this, SIGNAL( triggered() ), this, SLOT( slotActivated() ) );
   if(parent)
     parent->addAction("action", this );
@@ -156,7 +156,7 @@ void KigExportManager::addMenuAction( const KigPart* doc, KigWidget* w,
                                       KActionCollection* coll )
 {
   KActionMenu* m = new KActionMenu( i18n( "&Export To" ), w );
-  m->setIcon( KIcon( "document-export", const_cast<KigPart*>( doc )->iconLoader() ) );
+  m->setIcon( QIcon::fromTheme( "document-export", const_cast<KigPart*>( doc )->iconLoader() ) );
   for ( uint i = 0; i < mexporters.size(); ++i )
     m->addAction( new ExporterAction( doc, w, coll, mexporters[i] ) );
   if(coll)


Thanks,

David Narváez

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20140723/a38610d8/attachment.html>


More information about the Kde-frameworks-devel mailing list