[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:06:06 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=9b7e0e4
The following commit has been merged in the master branch:
commit 9b7e0e43ee9ba841c19189d136637afa3c410b12
Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date: Fri Apr 22 14:38:19 2011 +0200
Includes done right: own include must always go first, moc should go to the bottom - and remember a newline at the end of the file
---
account-button.cpp | 6 ++++--
account-filter-model.cpp | 2 ++
accounts-model-item.cpp | 5 ++++-
accounts-model.cpp | 5 ++++-
accounts-model.h | 2 +-
add-contact-dialog.cpp | 2 ++
contact-delegate-overlay.cpp | 5 +++--
contact-delegate.cpp | 2 ++
contact-model-item.cpp | 5 ++++-
contact-overlays.cpp | 6 ++++--
contact-view-hover-button.cpp | 6 ++++--
contact-view-hover-button.h | 2 +-
main-widget.cpp | 6 +++---
remove-contact-dialog.cpp | 2 ++
tree-node.cpp | 4 +++-
15 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/account-button.cpp b/account-button.cpp
index db00d7b..ce12e94 100644
--- a/account-button.cpp
+++ b/account-button.cpp
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "account-button.h"
+
#include <QtGui/QPainter>
#include <QtGui/QPixmap>
@@ -32,8 +34,6 @@
#include <TelepathyQt4/Account>
#include <TelepathyQt4/PendingOperation>
-#include "account-button.h"
-
AccountButton::AccountButton(const Tp::AccountPtr &account, QWidget* parent)
: QToolButton(parent), m_busyOverlay(0)
{
@@ -261,3 +261,5 @@ void AccountButton::setCustomPresenceMessage(const QString& message)
m_presenceMessageWidget->setText(message);
}
+
+#include "account-button.moc"
diff --git a/account-filter-model.cpp b/account-filter-model.cpp
index 8ca6561..75f2126 100644
--- a/account-filter-model.cpp
+++ b/account-filter-model.cpp
@@ -138,3 +138,5 @@ bool AccountFilterModel::isSortedByPresence() const
{
return sortRole() == AccountsModel::PresenceTypeRole;
}
+
+#include "account-filter-model.moc"
diff --git a/accounts-model-item.cpp b/accounts-model-item.cpp
index 33e4467..bb1beea 100644
--- a/accounts-model-item.cpp
+++ b/accounts-model-item.cpp
@@ -20,10 +20,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "accounts-model-item.h"
+
#include <TelepathyQt4/Account>
#include <TelepathyQt4/ContactManager>
-#include "accounts-model-item.h"
#include "accounts-model.h"
#include "contact-model-item.h"
@@ -381,3 +382,5 @@ void AccountsModelItem::addKnownContacts()
emit childrenAdded(this, newNodes);
}
}
+
+#include "accounts-model-item.moc"
diff --git a/accounts-model.cpp b/accounts-model.cpp
index 366c46f..3bb821e 100644
--- a/accounts-model.cpp
+++ b/accounts-model.cpp
@@ -20,10 +20,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "accounts-model.h"
+
#include <TelepathyQt4/ContactManager>
#include <TelepathyQt4/PendingReady>
-#include "accounts-model.h"
#include "accounts-model-item.h"
#include "contact-model-item.h"
@@ -303,3 +304,5 @@ QModelIndex AccountsModel::parent(const QModelIndex &index) const
return QModelIndex();
}
}
+
+#include "accounts-model.moc"
diff --git a/accounts-model.h b/accounts-model.h
index 42cc2b2..0a04d23 100644
--- a/accounts-model.h
+++ b/accounts-model.h
@@ -124,4 +124,4 @@ private:
Private *mPriv;
};
-#endif // TELEPATHY_ACCOUNTS_MODEL_H
\ No newline at end of file
+#endif // TELEPATHY_ACCOUNTS_MODEL_H
diff --git a/add-contact-dialog.cpp b/add-contact-dialog.cpp
index 6dd32d2..a555017 100644
--- a/add-contact-dialog.cpp
+++ b/add-contact-dialog.cpp
@@ -80,3 +80,5 @@ const QString AddContactDialog::screenName() const
{
return ui->screenNameLineEdit->text();
}
+
+#include "add-contact-dialog.moc"
diff --git a/contact-delegate-overlay.cpp b/contact-delegate-overlay.cpp
index 9346e21..2b8dd4c 100644
--- a/contact-delegate-overlay.cpp
+++ b/contact-delegate-overlay.cpp
@@ -19,13 +19,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "contact-delegate-overlay.h"
+
#include <QEvent>
#include <QTimer>
#include <QMouseEvent>
#include <KDebug>
-#include "contact-delegate-overlay.h"
#include "contact-view-hover-button.h"
ContactDelegateOverlay::ContactDelegateOverlay(QObject* parent)
@@ -388,4 +389,4 @@ void ContactDelegateOverlayContainer::drawDelegates(QPainter* p, const QStyleOpt
}
}
-#include "contact-delegate-overlay.moc"
\ No newline at end of file
+#include "contact-delegate-overlay.moc"
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index 705f800..d8e6dbe 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -335,3 +335,5 @@ bool ContactDelegate::helpEvent(QHelpEvent *event, QAbstractItemView *view, cons
return true;
}
+
+#include "contact-delegate.moc"
diff --git a/contact-model-item.cpp b/contact-model-item.cpp
index e77b8ed..f46343b 100644
--- a/contact-model-item.cpp
+++ b/contact-model-item.cpp
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "contact-model-item.h"
+
#include <QImage>
#include <TelepathyQt4/AvatarData>
@@ -28,7 +30,6 @@
#include <TelepathyQt4/RequestableChannelClassSpec>
#include "accounts-model.h"
-#include "contact-model-item.h"
struct ContactModelItem::Private
{
@@ -172,3 +173,5 @@ Tp::ContactPtr ContactModelItem::contact() const
{
return mPriv->mContact;
}
+
+#include "contact-model-item.moc"
diff --git a/contact-overlays.cpp b/contact-overlays.cpp
index 7965961..ef85634 100644
--- a/contact-overlays.cpp
+++ b/contact-overlays.cpp
@@ -19,7 +19,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "contact-overlays.moc"
+#include "contact-overlays.h"
#include <KLocale>
#include <KIconLoader>
@@ -427,4 +427,6 @@ bool FileTransferContactOverlay::checkIndex(const QModelIndex& index) const
}
return false;
-}
\ No newline at end of file
+}
+
+#include "contact-overlays.moc"
diff --git a/contact-view-hover-button.cpp b/contact-view-hover-button.cpp
index d6bde9e..fd411b2 100644
--- a/contact-view-hover-button.cpp
+++ b/contact-view-hover-button.cpp
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "contact-view-hover-button.moc"
+#include "contact-view-hover-button.h"
// Qt includes
@@ -209,4 +209,6 @@ void ContactViewHoverButton::stopFading()
{
m_fadingTimeLine->stop();
m_fadingValue = 0;
-}
\ No newline at end of file
+}
+
+#include "contact-view-hover-button.moc"
diff --git a/contact-view-hover-button.h b/contact-view-hover-button.h
index a3e8a9d..4248987 100644
--- a/contact-view-hover-button.h
+++ b/contact-view-hover-button.h
@@ -20,7 +20,7 @@
*/
#ifndef CONTACTVIEWHOVERBUTTON_H
-#define COTNACTVIEWHOVERBUTTON_H
+#define CONTACTVIEWHOVERBUTTON_H
// Qt includes
diff --git a/main-widget.cpp b/main-widget.cpp
index 70d1877..d5ed3dc 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "main-widget.moc"
+#include "main-widget.h"
#include <QtGui/QSortFilterProxyModel>
#include <QtGui/QPainter>
@@ -47,10 +47,8 @@
#include <KSettings/Dialog>
#include <KSharedConfig>
#include <KFileDialog>
-#include <KMessageBox>
#include <KStandardShortcut>
-#include "main-widget.h"
#include "ui_main-widget.h"
#include "account-button.h"
#include "contact-overlays.h"
@@ -980,3 +978,5 @@ void MainWidget::onPresencePublicationRequested(const Tp::Contacts& contacts)
}
}
}
+
+#include "main-widget.moc"
diff --git a/remove-contact-dialog.cpp b/remove-contact-dialog.cpp
index e6c6a86..2e40ca1 100644
--- a/remove-contact-dialog.cpp
+++ b/remove-contact-dialog.cpp
@@ -54,3 +54,5 @@ bool RemoveContactDialog::blockContact() const
{
return ui->blockCheckbox->isChecked();
}
+
+#include "remove-contact-dialog.moc"
diff --git a/tree-node.cpp b/tree-node.cpp
index 804f439..fbcc4e9 100644
--- a/tree-node.cpp
+++ b/tree-node.cpp
@@ -122,4 +122,6 @@ void TreeNode::remove()
}
deleteLater();
-}
\ No newline at end of file
+}
+
+#include "tree-node.moc"
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list