Commit e0337c53 authored by David Edmundson's avatar David Edmundson

Fix rebase and namespace

parent 4e2e6daf
......@@ -16,11 +16,9 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "kdetelepathychat_export.h"
#include "conversation-target.h"
#include <TelepathyQt4/AvatarData>
#include <TelepathyQt4/Presence>
#include <TelepathyQt/AvatarData>
#include <TelepathyQt/Presence>
#include <KDebug>
#include <KIconLoader>
......
......@@ -20,7 +20,7 @@
#include "conversation.h"
#include "messages-model.h"
#include <TelepathyQt4/TextChannel>
#include <TelepathyQt/TextChannel>
#include <KDebug>
#include "conversation-target.h"
......
......@@ -20,7 +20,7 @@
#include "messages-model.h"
#include <KDebug>
#include <TelepathyQt4/ReceivedMessage>
#include <TelepathyQt/ReceivedMessage>
class MessageItem {
public:
......
......@@ -22,9 +22,9 @@
#include <KDebug>
#include <TelepathyQt4/ChannelClassSpec>
#include <TelepathyQt4/TextChannel>
#include <TelepathyQt4/ClientRegistrar>
#include <TelepathyQt/ChannelClassSpec>
#include <TelepathyQt/TextChannel>
#include <TelepathyQt/ClientRegistrar>
static inline Tp::ChannelClassSpecList channelClassList()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment