[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-frameworks-devel
Subject: Re: Review Request 110264: Change uses of QCoreApplication::translate() with
From: "Oswald Buddenhagen" <ossi () kde ! org>
Date: 2013-05-04 7:09:46
Message-ID: 20130504070946.15942.57998 () vidsolbach ! de
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/110264/#review31987
-----------------------------------------------------------
tier1/kcodecs/src/kcharsets.h
<http://git.reviewboard.kde.org/r/110264/#comment23840>
you have some weird indentation here ...
repeats below
tier1/kcodecs/src/kencodingprober.cpp
<http://git.reviewboard.kde.org/r/110264/#comment23841>
not needed
tier1/kcodecs/src/kencodingprober.cpp
<http://git.reviewboard.kde.org/r/110264/#comment23842>
you could add the missing spaces around the equal signs as you are changing this \
code ...
- Oswald Buddenhagen
On May 3, 2013, 8:35 p.m., George Goldberg wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/110264/
> -----------------------------------------------------------
>
> (Updated May 3, 2013, 8:35 p.m.)
>
>
> Review request for KDE Frameworks and David Faure.
>
>
> Description
> -------
>
> Change uses of QCoreApplication::translate() with no context to QObject::tr() in \
> tier1 frameworks.
> There are no changes needed in tier 2.
>
> Issues outstanding:
> * What do we do with the QT_TRANSLATE_NOOP_3 macro usage that we put in when \
> changing it to QCoreApplication::translate() previously? I'd propose leaving it as \
> is, because it seems like it would still work the same, but maybe that's not the \
> neatest plan
> * kconfig/src/core/kconfig.cpp uses QCoreApplication::translate with the "KConfig" \
> context in one instance. Should this be left alone?
>
> Diffs
> -----
>
> tier1/kcodecs/src/kcharsets.h a075e5348b6ca9305cf77f3d05062fed2ca5b229
> tier1/kcodecs/src/kcharsets.cpp 45f80b609abfdd131eded0cbe91e2287973046ca
> tier1/kcodecs/src/kencodingprober.h d6a940b275317f75e53f097e25bc92ecf2fd4435
> tier1/kcodecs/src/kencodingprober.cpp 3008f3ba5fc833ae999194f7d33b9a8d95170398
> tier1/solid/src/solid/backends/fstab/fstabmanager.cpp \
> 46415e0776fcef4a8576ccc1f57417f5465d5484 \
> tier1/solid/src/solid/backends/hal/haldevice.cpp \
> 8e433d9a96a9e15245f0c2d735950dfca8730ae6 \
> tier1/solid/src/solid/backends/kupnp/internetgatewaydevice1.cpp \
> 2cff30781764dcadde045fbed1f8a5ea24aa1b1f \
> tier1/solid/src/solid/backends/kupnp/kupnprootdevice.cpp \
> 664e72e5fbffb246402f7f1c87132125f7d87720 \
> tier1/solid/src/solid/backends/kupnp/mediaserver1.cpp \
> 28e8267afefe23382898dac5c86242db41746d6f \
> tier1/solid/src/solid/backends/kupnp/mediaserver2.cpp \
> 9967680429accc7fe7e45a73d65e7c33a6b308d5 \
> tier1/solid/src/solid/backends/kupnp/mediaserver3.cpp \
> 3805a5c52d89043046d66c2aaaf01b3699e5a13f \
> tier1/solid/src/solid/backends/udev/udevdevice.cpp \
> e00c37c816cb1c7c94a3460341f5b0b13088eb3a \
> tier1/solid/src/solid/backends/udev/udevmanager.cpp \
> 1446868cca7a42155478be0dc75be2fd47725e7f \
> tier1/solid/src/solid/backends/udisks/udisksdevice.cpp \
> e1c47afc952bf232b9fce1ffe053cce1b3b80a67 \
> tier1/solid/src/solid/backends/udisks/udisksmanager.cpp \
> 31e581656d98c0e103d6ceb605b3b0bfb4b00a54 \
> tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp \
> 1aa7b6d139be3ba5dc6d78e1ae55b2d0841dbfbd \
> tier1/solid/src/solid/backends/udisks2/udisksmanager.cpp \
> e76dfd1c94b39009ae4522ce9d3f535fc2c5eac2 \
> tier1/solid/src/solid/backends/upnp/upnpdevicemanager.cpp \
> e3cf29954da081bb5f23b859310f4f5a57e2702c \
> tier1/solid/src/solid/backends/upower/upowerdevice.cpp \
> c61bee940cf5e8295d99f055582317e7e626eedd \
> tier1/solid/src/solid/backends/upower/upowermanager.cpp \
> ee198a0ae0da44e35cc911e9fd830a78241bc867 \
> tier1/solid/src/solid/backends/wmi/wmibattery.cpp \
> 4b72f80514afa7fd7bbfe706d231ec669ed2f8d4 \
> tier1/solid/src/solid/backends/wmi/wmidevice.cpp \
> 0e85ae9c31eaab8c863e86845733dff17453456a tier1/solid/src/solid/deviceinterface.cpp \
> 0cfc8e84ddbcbf31b44e881055ae173a6c589fdb
> Diff: http://git.reviewboard.kde.org/r/110264/diff/
>
>
> Testing
> -------
>
> Everything still compiles.
>
>
> Thanks,
>
> George Goldberg
>
>
[Attachment #5 (text/html)]
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;"> <tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/110264/">http://git.reviewboard.kde.org/r/110264/</a>
</td>
</tr>
</table>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="http://git.reviewboard.kde.org/r/110264/diff/2/?file=141926#file141926line45" \
style="color: black; font-weight: bold; text-decoration: \
underline;">tier1/kcodecs/src/kcharsets.h</a> <span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">class \
QTextCodec;</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">45</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="tb"> </span><span class="n">Q_DECLARE_TR_FUNCTIONS</span><span \
class="p">(</span><span class="n">KCharsets</span><span class="p">)</span></pre></td> \
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">you have \
some weird indentation here ...
repeats below</pre>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="http://git.reviewboard.kde.org/r/110264/diff/2/?file=141929#file141929line33" \
style="color: black; font-weight: bold; text-decoration: \
underline;">tier1/kcodecs/src/kencodingprober.cpp</a> <span style="font-weight: \
normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">33</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="cp">#include \
<QtCore/Q<span class="hl">CoreApplication</span>></span></pre></td> <th \
bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">33</font></th> <td bgcolor="#fdfebc" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="cp">#include <QtCore/Q<span class="hl">Object</span>></span></pre></td> \
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">not \
needed</pre> </div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="http://git.reviewboard.kde.org/r/110264/diff/2/?file=141929#file141929line228" \
style="color: black; font-weight: bold; text-decoration: \
underline;">tier1/kcodecs/src/kencodingprober.cpp</a> <span style="font-weight: \
normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">void \
KEncodingProber::setProberType(KEncodingProber::ProberType proberType)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">228</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="k">else</span> <span class="k">if</span> <span class="p">(</span><span \
class="n">lang</span><span class="o">==</span><span class="n"><span \
class="hl">QCoreApplication</span></span><span class="o"><span \
class="hl">::</span></span><span class="n"><span \
class="hl">translate</span></span><span class="p"><span \
class="hl">(</span></span><span class="s"><span \
class="hl">""</span></span><span class="p"><span \
class="hl">,</span></span><span class="hl"> </span><span \
class="s">"Disabled"</span><span class="p">,</span> <span \
class="s">"@item Text character set"</span><span \
class="p">))</span></pre></td> <th bgcolor="#e9eaa8" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">228</font></th> <td bgcolor="#fdfebc" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="k">else</span> <span \
class="k">if</span> <span class="p">(</span><span class="n">lang</span><span \
class="o">==</span><span class="n"><span class="hl">tr</span></span><span \
class="p"><span class="hl">(</span></span><span \
class="s">"Disabled"</span><span class="p">,</span> <span \
class="s">"@item Text character set"</span><span \
class="p">))</span></pre></td> </tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">you could \
add the missing spaces around the equal signs as you are changing this code ...</pre> \
</div> <br />
<p>- Oswald</p>
<br />
<p>On May 3rd, 2013, 8:35 p.m. UTC, George Goldberg wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for KDE Frameworks and David Faure.</div>
<div>By George Goldberg.</div>
<p style="color: grey;"><i>Updated May 3, 2013, 8:35 p.m.</i></p>
<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;">Change uses of QCoreApplication::translate() with no context to \
QObject::tr() in tier1 frameworks.
There are no changes needed in tier 2.
Issues outstanding:
* What do we do with the QT_TRANSLATE_NOOP_3 macro usage that we put in when changing \
it to QCoreApplication::translate() previously? I'd propose leaving it as is, \
because it seems like it would still work the same, but maybe that's not the \
neatest plan
* kconfig/src/core/kconfig.cpp uses QCoreApplication::translate with the \
"KConfig" context in one instance. Should this be left alone?</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;">Everything still compiles.</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>tier1/kcodecs/src/kcharsets.h <span style="color: \
grey">(a075e5348b6ca9305cf77f3d05062fed2ca5b229)</span></li>
<li>tier1/kcodecs/src/kcharsets.cpp <span style="color: \
grey">(45f80b609abfdd131eded0cbe91e2287973046ca)</span></li>
<li>tier1/kcodecs/src/kencodingprober.h <span style="color: \
grey">(d6a940b275317f75e53f097e25bc92ecf2fd4435)</span></li>
<li>tier1/kcodecs/src/kencodingprober.cpp <span style="color: \
grey">(3008f3ba5fc833ae999194f7d33b9a8d95170398)</span></li>
<li>tier1/solid/src/solid/backends/fstab/fstabmanager.cpp <span style="color: \
grey">(46415e0776fcef4a8576ccc1f57417f5465d5484)</span></li>
<li>tier1/solid/src/solid/backends/hal/haldevice.cpp <span style="color: \
grey">(8e433d9a96a9e15245f0c2d735950dfca8730ae6)</span></li>
<li>tier1/solid/src/solid/backends/kupnp/internetgatewaydevice1.cpp <span \
style="color: grey">(2cff30781764dcadde045fbed1f8a5ea24aa1b1f)</span></li>
<li>tier1/solid/src/solid/backends/kupnp/kupnprootdevice.cpp <span style="color: \
grey">(664e72e5fbffb246402f7f1c87132125f7d87720)</span></li>
<li>tier1/solid/src/solid/backends/kupnp/mediaserver1.cpp <span style="color: \
grey">(28e8267afefe23382898dac5c86242db41746d6f)</span></li>
<li>tier1/solid/src/solid/backends/kupnp/mediaserver2.cpp <span style="color: \
grey">(9967680429accc7fe7e45a73d65e7c33a6b308d5)</span></li>
<li>tier1/solid/src/solid/backends/kupnp/mediaserver3.cpp <span style="color: \
grey">(3805a5c52d89043046d66c2aaaf01b3699e5a13f)</span></li>
<li>tier1/solid/src/solid/backends/udev/udevdevice.cpp <span style="color: \
grey">(e00c37c816cb1c7c94a3460341f5b0b13088eb3a)</span></li>
<li>tier1/solid/src/solid/backends/udev/udevmanager.cpp <span style="color: \
grey">(1446868cca7a42155478be0dc75be2fd47725e7f)</span></li>
<li>tier1/solid/src/solid/backends/udisks/udisksdevice.cpp <span style="color: \
grey">(e1c47afc952bf232b9fce1ffe053cce1b3b80a67)</span></li>
<li>tier1/solid/src/solid/backends/udisks/udisksmanager.cpp <span style="color: \
grey">(31e581656d98c0e103d6ceb605b3b0bfb4b00a54)</span></li>
<li>tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp <span style="color: \
grey">(1aa7b6d139be3ba5dc6d78e1ae55b2d0841dbfbd)</span></li>
<li>tier1/solid/src/solid/backends/udisks2/udisksmanager.cpp <span style="color: \
grey">(e76dfd1c94b39009ae4522ce9d3f535fc2c5eac2)</span></li>
<li>tier1/solid/src/solid/backends/upnp/upnpdevicemanager.cpp <span style="color: \
grey">(e3cf29954da081bb5f23b859310f4f5a57e2702c)</span></li>
<li>tier1/solid/src/solid/backends/upower/upowerdevice.cpp <span style="color: \
grey">(c61bee940cf5e8295d99f055582317e7e626eedd)</span></li>
<li>tier1/solid/src/solid/backends/upower/upowermanager.cpp <span style="color: \
grey">(ee198a0ae0da44e35cc911e9fd830a78241bc867)</span></li>
<li>tier1/solid/src/solid/backends/wmi/wmibattery.cpp <span style="color: \
grey">(4b72f80514afa7fd7bbfe706d231ec669ed2f8d4)</span></li>
<li>tier1/solid/src/solid/backends/wmi/wmidevice.cpp <span style="color: \
grey">(0e85ae9c31eaab8c863e86845733dff17453456a)</span></li>
<li>tier1/solid/src/solid/deviceinterface.cpp <span style="color: \
grey">(0cfc8e84ddbcbf31b44e881055ae173a6c589fdb)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/110264/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
_______________________________________________
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