[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-frameworks-devel
Subject: Re: Review Request 119444: Replacing also kicon.h header include
From: David_Narváez <david.narvaez () computer ! org>
Date: 2014-07-24 10:16:16
Message-ID: 20140724101616.14617.21 () probe ! kde ! org
[Download RAW message or body]
--===============8250819855634329981==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/119444/
-----------------------------------------------------------
(Updated July 24, 2014, 10:16 a.m.)
Status
------
This change has been marked as submitted.
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
--===============8250819855634329981==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/119444/">https://git.reviewboard.kde.org/r/119444/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#e0e0e0" width="100%" cellpadding="12" style="border: 1px gray solid; \
border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> <tr>
<td>
<h1 style="margin: 0; padding: 0; font-size: 10pt;">This change has been marked as \
submitted.</h1> </td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for KDE Frameworks.</div>
<div>By David Narváez.</div>
<p style="color: grey;"><i>Updated July 24, 2014, 10:16 a.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kde-dev-scripts
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Replacing also kicon.h header include</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Sample diff with this script</p> <p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">diff \
--git a/filters/exporter.cc b/filters/exporter.cc<br style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;" /> \
index 2cbecc6..8218d3f 100644<br style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: normal;" />
--- a/filters/exporter.cc<br style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: normal;" />
+++ b/filters/exporter.cc<br style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: normal;" /> @@ -35,7 +35,7 @@</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">#include <kactionmenu.h><br style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;" /> \
#include <kactioncollection.h><br style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: normal;" />
-#include <kicon.h><br style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: normal;" /> +#include <QIcon><br \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
normal;" /> #include <kimageio.h><br style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: normal;" /> #include \
<klocale.h><br style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: normal;" /> #include <kmessagebox.h><br style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;" /> @@ \
-48,7 +48,7 @@ ExporterAction::ExporterAction( const KigPart<em style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;"> doc, \
KigWidget</em> w,<br style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: normal;" /> {<br style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: normal;" /> QString iconstr = \
exp->menuIcon();<br style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: normal;" /> if ( !iconstr.isEmpty() )<br \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
normal;" />
- setIcon( KIcon( iconstr, const_cast<KigPart<em style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;">>( \
doc )->iconLoader() ) );<br style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: normal;" /> + setIcon( QIcon::fromTheme( \
iconstr, const_cast<KigPart</em>>( doc )->iconLoader() ) );<br \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
normal;" /> connect( this, SIGNAL( triggered() ), this, SLOT( slotActivated() ) \
);<br style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: normal;" /> if(parent)<br style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: normal;" />
parent->addAction("action", this );<br style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: normal;" /> @@ -156,7 +156,7 @@ \
void KigExportManager::addMenuAction( const KigPart<em style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;"> doc, \
KigWidget</em> w,<br style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: normal;" /> KActionCollection<em style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;"> coll \
)<br style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: normal;" /> {<br style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: normal;" /> KActionMenu</em> m = \
new KActionMenu( i18n( "&Export To" ), w );<br style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: normal;" />
- m->setIcon( KIcon( "document-export", const_cast<KigPart<em style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;">>( \
doc )->iconLoader() ) );<br style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: normal;" /> + m->setIcon( QIcon::fromTheme( \
"document-export", const_cast<KigPart</em>>( doc )->iconLoader() ) );<br \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
normal;" /> for ( uint i = 0; i < mexporters.size(); ++i )<br style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;" /> \
m->addAction( new ExporterAction( doc, w, coll, mexporters[i] ) );<br \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
normal;" /> if(coll)</p></pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>kf5/convert-kicon.pl <span style="color: \
grey">(bb4b76945f4c75c342f12401fc80a4cadbef03dd)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/119444/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============8250819855634329981==--
_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic