<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/120804/">https://git.reviewboard.kde.org/r/120804/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On October 27th, 2014, 12:43 a.m. UTC, <b>Aleix Pol Gonzalez</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<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="https://git.reviewboard.kde.org/r/120804/diff/1/?file=322076#file322076line139" style="color: black; font-weight: bold; text-decoration: underline;">src/telepathy-base-job.cpp</a>
<span style="font-weight: normal;">
(Diff revision 1)
</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 TelepathyBaseJobPrivate::__k__doEmitResult()</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">139</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="cp">#include "telepathy-base-job.<span class="hl">moc</span>"</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">139</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="cp">#include "<span class="hl">moc_</span>telepathy-base-job.<span class="hl">cpp</span>"</span></pre></td>
</tr>
</tbody>
</table>
<pre style="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;">That change shouldn't be needed...?</p></pre>
</blockquote>
<p>On October 27th, 2014, 7:16 a.m. UTC, <b>Martin Klapetek</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="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;">Yep, in fact you shouldn't need to include .moc files unless there is a Q_OBJECT class declared in the .cpp.</p></pre>
</blockquote>
<p>On October 27th, 2014, 10:30 a.m. UTC, <b>David Edmundson</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="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;">you need this if you use Q_PRIVATE_SLOT</p></pre>
</blockquote>
<p>On October 27th, 2014, 11:06 a.m. UTC, <b>Martin Klapetek</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="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;">No; that's also handled by autmoc. The problem here in particular is because of header inclusions - building without this #include fails because the .h file does not have #include ".._p.h" and so the moc file does not have the _p.h and fails with "unknown class" while the .cpp file has the #include "_p.h" and so when the moc is included here, it does not fail.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Given this would require changes in the other #includes in 3 files, I'd say let's do it this way.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">(for completness, here's how it would need changing:</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">src/telepathy-base-job.cpp | 2 +-
src/telepathy-base-job.h | 3 ++-
src/telepathy-base-job_p.h | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">diff --git a/src/telepathy-base-job.cpp b/src/telepathy-base-job.cpp
index 3dab71e..eef3cc5 100644
--- a/src/telepathy-base-job.cpp
+++ b/src/telepathy-base-job.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">-#include "telepathy-base-job_p.h"
+#include "telepathy-base-job.h"</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">#include <TelepathyQt/PendingOperation></p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">diff --git a/src/telepathy-base-job.h b/src/telepathy-base-job.h
index 66fab23..e181358 100644
--- a/src/telepathy-base-job.h
+++ b/src/telepathy-base-job.h
@@ -21,6 +21,8 @@
#ifndef LIBKTP_TELEPATHY_BASE_JOB_H
#define LIBKTP_TELEPATHY_BASE_JOB_H</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">+#include "telepathy-base-job_p.h"
+
#include <kdemacros.h>
#include <KJob></p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">@@ -82,7 +84,6 @@ enum JobError {
KTpError = 300
};</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">-class TelepathyBaseJobPrivate;
class KDE_EXPORT TelepathyBaseJob : public KJob
{
Q_OBJECT
diff --git a/src/telepathy-base-job_p.h b/src/telepathy-base-job_p.h
index 455ac2a..cfa0059 100644
--- a/src/telepathy-base-job_p.h
+++ b/src/telepathy-base-job_p.h
@@ -20,7 +20,6 @@
#ifndef LIBKTP_TELEPATHY_BASE_JOB_P_H
#define LIBKTP_TELEPATHY_BASE_JOB_P_H</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">-#include "telepathy-base-job.h"</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">#include <QTime></p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">@@ -32,6 +31,8 @@ class PendingOperation;
namespace KTp
{</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">+class TelepathyBaseJob;
+
class TelepathyBaseJobPrivate
{
Q_DECLARE_PUBLIC(TelepathyBaseJob)</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">)</p></pre>
</blockquote>
<p>On October 27th, 2014, 11:28 a.m. UTC, <b>David Edmundson</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="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;">You can't put #include "foo_p.h" in foo.h. That just defeats the enitre point of having it private.</p></pre>
</blockquote>
<p>On October 27th, 2014, 11:31 a.m. UTC, <b>Martin Klapetek</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="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;">Right, I meant let's keep the #include moc, I was just pointing out that including the moc is not needed for Q_PRIVATE_SLOT</p></pre>
</blockquote>
</blockquote>
<pre style="margin-left: 1em; 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;">FWIW, when I said the change was not necessary is because cmake moc implementation uses "#include "filename.moc"</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Sometimes the include is indeed necessary.</p></pre>
<br />
<p>- Aleix</p>
<br />
<p>On October 26th, 2014, 12:26 a.m. UTC, David Edmundson wrote:</p>
<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 Telepathy.</div>
<div>By David Edmundson.</div>
<p style="color: grey;"><i>Updated Oct. 26, 2014, 12:26 a.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
ktp-filetransfer-handler
</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;">Initial port to KF5</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>CMakeLists.txt <span style="color: grey">(5664e52)</span></li>
<li>src/CMakeLists.txt <span style="color: grey">(ebd892c)</span></li>
<li>src/handle-incoming-file-transfer-channel-job.cpp <span style="color: grey">(36b8310)</span></li>
<li>src/handle-outgoing-file-transfer-channel-job.cpp <span style="color: grey">(762bd12)</span></li>
<li>src/main.cpp <span style="color: grey">(5382122)</span></li>
<li>src/telepathy-base-job.cpp <span style="color: grey">(3dab71e)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/120804/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>