From kde-commits  Fri May 31 18:17:51 2013
From: David Edmundson <kde () davidedmundson ! co ! uk>
Date: Fri, 31 May 2013 18:17:51 +0000
To: kde-commits
Subject: [ktp-contact-list/kpeople] /: Fix compile to renamed includes
Message-Id: <20130531181751.520CAA6067 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=137002428103300

Git commit e2127c011269dbf1f8bc94acb25745c65714d2ca by David Edmundson.
Committed on 31/05/2013 at 20:16.
Pushed by davidedmundson into branch 'kpeople'.

Fix compile to renamed includes

M  +0    -2    contact-delegate-compact.cpp
M  +24   -24   contact-list-widget.cpp

http://commits.kde.org/telepathy-contact-list/e2127c011269dbf1f8bc94acb2574=
5c65714d2ca

diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 8ae8317..b656524 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -37,8 +37,6 @@
 =

 #include <KTp/types.h>
 =

-#include <kpeople/persons-model.h>
-
 ContactDelegateCompact::ContactDelegateCompact(ContactDelegateCompact::Lis=
tSize size, QObject * parent)
     : AbstractContactDelegate(parent)
 {
diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 0ffb66d..bc4d04f 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -58,11 +58,11 @@
 =

 #include <QAction>
 =

-#include <kpeople/persons-model.h>
-#include <kpeople/ktp-translation-proxy.h>
-#include <kpeople/person-plugin-manager.h>
-#include <kpeople/base-persons-data-source.h>
-#include <kpeople/im-persons-data-source.h>
+#include <kpeople/personsmodel.h>
+#include <kpeople/ktptranslationproxy.h>
+#include <kpeople/personpluginmanager.h>
+#include <kpeople/basepersonsdatasource.h>
+#include <kpeople/impersonsdatasource.h>
 =

 #include "contact-delegate.h"
 #include "contact-delegate-compact.h"
@@ -355,65 +355,65 @@ void ContactListWidget::accountEnablingFinished(Tp::P=
endingOperation *op)
 void ContactListWidget::addOverlayButtons()
 {
 //     Q_D(ContactListWidget);
-// =

+//
 //     TextChannelContactOverlay *textOverlay  =3D new TextChannelContactO=
verlay(this);
 //     AudioChannelContactOverlay *audioOverlay =3D new AudioChannelContac=
tOverlay(this);
 //     VideoChannelContactOverlay *videoOverlay =3D new VideoChannelContac=
tOverlay(this);
-// =

+//
 //     FileTransferContactOverlay *fileOverlay  =3D new FileTransferContac=
tOverlay(this);
 //     DesktopSharingContactOverlay *desktopOverlay =3D new DesktopSharing=
ContactOverlay(this);
 //     LogViewerOverlay *logViewerOverlay =3D new LogViewerOverlay(this);
-// =

+//
 //     d->delegate->installOverlay(textOverlay);
 //     d->delegate->installOverlay(audioOverlay);
 //     d->delegate->installOverlay(videoOverlay);
 //     d->delegate->installOverlay(fileOverlay);
 //     d->delegate->installOverlay(desktopOverlay);
 //     d->delegate->installOverlay(logViewerOverlay);
-// =

+//
 //     d->delegate->setViewOnAllOverlays(this);
 //     d->delegate->setAllOverlaysActive(true);
-// =

+//
 //     connect(textOverlay, SIGNAL(overlayActivated(QModelIndex)),
 //             d->delegate, SLOT(hideStatusMessageSlot(QModelIndex)));
-// =

+//
 //     connect(textOverlay, SIGNAL(overlayHidden()),
 //             d->delegate, SLOT(reshowStatusMessageSlot()));
-// =

-// =

+//
+//
 //     connect(textOverlay, SIGNAL(activated(Tp::AccountPtr, Tp::ContactPt=
r)),
 //             this, SLOT(startTextChannel(Tp::AccountPtr, Tp::ContactPtr)=
));
-// =

+//
 //     connect(fileOverlay, SIGNAL(activated(Tp::AccountPtr, Tp::ContactPt=
r)),
 //             this, SLOT(startFileTransferChannel(Tp::AccountPtr, Tp::Con=
tactPtr)));
-// =

+//
 //     connect(audioOverlay, SIGNAL(activated(Tp::AccountPtr, Tp::ContactP=
tr)),
 //             this, SLOT(startAudioChannel(Tp::AccountPtr, Tp::ContactPtr=
)));
-// =

+//
 //     connect(videoOverlay, SIGNAL(activated(Tp::AccountPtr, Tp::ContactP=
tr)),
 //             this, SLOT(startVideoChannel(Tp::AccountPtr, Tp::ContactPtr=
)));
-// =

+//
 //     connect(desktopOverlay, SIGNAL(activated(Tp::AccountPtr, Tp::Contac=
tPtr)),
 //             this, SLOT(startDesktopSharing(Tp::AccountPtr, Tp::ContactP=
tr)));
-// =

+//
 //     connect(logViewerOverlay, SIGNAL(activated(Tp::AccountPtr,Tp::Conta=
ctPtr)),
 //             this, SLOT(startLogViewer(Tp::AccountPtr, Tp::ContactPtr)));
-// =

+//
 //     connect(this, SIGNAL(enableOverlays(bool)),
 //             textOverlay, SLOT(setActive(bool)));
-// =

+//
 //     connect(this, SIGNAL(enableOverlays(bool)),
 //             audioOverlay, SLOT(setActive(bool)));
-// =

+//
 //     connect(this, SIGNAL(enableOverlays(bool)),
 //             videoOverlay, SLOT(setActive(bool)));
-// =

+//
 //     connect(this, SIGNAL(enableOverlays(bool)),
 //             fileOverlay, SLOT(setActive(bool)));
-// =

+//
 //     connect(this, SIGNAL(enableOverlays(bool)),
 //             desktopOverlay, SLOT(setActive(bool)));
-// =

+//
 //     connect(this, SIGNAL(enableOverlays(bool)),
 //             logViewerOverlay, SLOT(setActive(bool)));
 }