[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] /: Make sure KJob is fully-defined when used in slots
From:       Dan_Vrátil <dvratil () redhat ! com>
Date:       2015-09-22 19:34:08
Message-ID: E1ZeTKK-0005jJ-2Q () scm ! kde ! org
[Download RAW message or body]

Git commit e8a44a7360dcb558bca6982c449df101df6931b0 by Dan Vrátil.
Committed on 22/09/2015 at 19:33.
Pushed by dvratil into branch 'master'.

Make sure KJob is fully-defined when used in slots

The new connect() syntax mandates this. It compiled magically because we
included Job in tag.h in kdepimlibs.

M  +2    -0    kmail/configuredialog/configureappearancepage.h
M  +0    -1    mailcommon/src/tag/addtagdialog.cpp
M  +3    -1    mailcommon/src/tag/addtagdialog.h

http://commits.kde.org/kdepim/e8a44a7360dcb558bca6982c449df101df6931b0

diff --git a/kmail/configuredialog/configureappearancepage.h \
b/kmail/configuredialog/configureappearancepage.h index 71c88db..677c378 100644
--- a/kmail/configuredialog/configureappearancepage.h
+++ b/kmail/configuredialog/configureappearancepage.h
@@ -22,6 +22,8 @@
 #include "MailCommon/Tag"
 #include <QListWidgetItem>
 
+#include <AkonadiCore/TagFetchJob>
+
 class QPushButton;
 class QCheckBox;
 class KComboBox;
diff --git a/mailcommon/src/tag/addtagdialog.cpp \
b/mailcommon/src/tag/addtagdialog.cpp index 5414e2a..84d064d 100644
--- a/mailcommon/src/tag/addtagdialog.cpp
+++ b/mailcommon/src/tag/addtagdialog.cpp
@@ -18,7 +18,6 @@
 #include "addtagdialog.h"
 #include "tag/tagwidget.h"
 #include "mailcommon_debug.h"
-#include <AkonadiCore/tagcreatejob.h>
 
 #include <KLocalizedString>
 #include <KLineEdit>
diff --git a/mailcommon/src/tag/addtagdialog.h b/mailcommon/src/tag/addtagdialog.h
index 9311d54..c27e3bd 100644
--- a/mailcommon/src/tag/addtagdialog.h
+++ b/mailcommon/src/tag/addtagdialog.h
@@ -21,8 +21,10 @@
 #include "mailcommon_export.h"
 #include "tag.h"
 #include <QDialog>
-#include <AkonadiCore/tag.h>
+#include <AkonadiCore/Tag>
+#include <AkonadiCore/TagCreateJob>
 #include <KConfigGroup>
+
 class QPushButton;
 class KActionCollection;
 


[prev in list] [next in list] [prev in thread] [next in thread]