Review Request 109835: Move AdiumContentInfo to be internal to AdiumThemeView

[Commit Hook]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/109835/
-----------------------------------------------------------

(Updated April 18, 2013, 1:33 a.m.)


Status
------

This change has been marked as submitted.


Review request for Telepathy.


Description
-------

Move AdiumContentInfo to be internal to AdiumThemeView

AdiumThemeView now takes a KTp::Message which contains all the information needed to present information in the view.
/me messages are passed as KTp::Messages, in future status messages will be too.

I also had to fix entity model to take KTp::ContactPtr because of a conflict in Qt MetaTypes after including KTp code. 


Diffs
-----

  config/appearance-config-tab.cpp fadfd474a9b702c5e24046790eb19ceb0e34a8b5 
  lib/adium-theme-view.h a3e5db2bf20cf008f798650095e4357da6649d46 
  lib/adium-theme-view.cpp db688a556b83569a6c81c5f7f44a0e0121f3403c 
  lib/chat-widget.h 95b86f8c52429c4cd759fb46538a67d40161f6de 
  lib/chat-widget.cpp a08f5e87978e121e2541480f3e9b5fdb5e5b753d 
  lib/logmanager.h 9b1d010717a153206fabf448dd1502d3d61a7917 
  lib/logmanager.cpp a570adfaaf7b1b03aab246ddbf1ba4cd5ae22733 
  logviewer/entity-model-item.h 47d98cdb7ac90efc54ca9ee1df880b8e7b6f9843 
  logviewer/entity-model-item.cpp a08ccc221e89510ca2057b63d0fffdc7ca459ce2 
  logviewer/entity-model.h 5c9aa73d621c8d21601fab892890f5ae7c60e28c 
  logviewer/entity-model.cpp 1c10c1d758a4eb0f7792fa1660effefccecc24f2 
  logviewer/entity-proxy-model.cpp 67811f61c1c5a2d2fa35534af1228f7b726e8706 
  logviewer/log-viewer.cpp 5c2e2140b03da68d64177b0ef1ea994b95e6e94c 
  logviewer/main.cpp 48d5ee2813241e6659eb032a517994dcb4220b63 
  logviewer/message-view.cpp 6a59caa0b40b528fc69497e8ba4d42f683a74e65 

Diff: http://git.reviewboard.kde.org/r/109835/diff/


Testing
-------


Thanks,

David Edmundson

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-telepathy/attachments/20130418/98891e64/attachment.html>