[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:20:50 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=8fc8085
The following commit has been merged in the master branch:
commit 8fc8085f14fadb719630ffb55f7f8e86a1f0cfb9
Author: Lasath Fernando <kde at lasath.org>
Date: Tue Jan 10 12:44:59 2012 +1100
Parented MessagesModel and ConversationTarget properly, so that Conversation doesn't have to explicitly delete them.
---
lib/chat-window-style.cpp | 314 ++++++++++++++++++++++----------------------
lib/conversation-target.cpp | 5 +-
lib/conversation-target.h | 2 +-
lib/conversation.cpp | 9 +-
lib/conversation.h | 8 +-
5 files changed, 171 insertions(+), 167 deletions(-)
diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index 1666b42..7b770cf 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -45,40 +45,40 @@ public:
QHash<QString, bool> compactVariants;
};
-ChatWindowStyle::ChatWindowStyle ( const QString &styleId, StyleBuildMode styleBuildMode )
- : QObject(), d ( new Private )
+ChatWindowStyle::ChatWindowStyle(const QString &styleId, StyleBuildMode styleBuildMode)
+ : QObject(), d(new Private)
{
- init ( styleId, styleBuildMode );
+ init(styleId, styleBuildMode);
}
-ChatWindowStyle::ChatWindowStyle ( const QString &styleId, const QString &variantPath,
- StyleBuildMode styleBuildMode )
- : QObject(), d ( new Private )
+ChatWindowStyle::ChatWindowStyle(const QString &styleId, const QString &variantPath,
+ StyleBuildMode styleBuildMode)
+ : QObject(), d(new Private)
{
- Q_UNUSED ( variantPath );
- init ( styleId, styleBuildMode );
+ Q_UNUSED(variantPath);
+ init(styleId, styleBuildMode);
}
-void ChatWindowStyle::init ( const QString &styleId, StyleBuildMode styleBuildMode )
+void ChatWindowStyle::init(const QString &styleId, StyleBuildMode styleBuildMode)
{
- QStringList styleDirs = KGlobal::dirs()->findDirs ( "data",
- QString ( QLatin1String ( "ktelepathy/styles/%1/Contents/Resources/" ) ).arg ( styleId )
- );
+ QStringList styleDirs = KGlobal::dirs()->findDirs("data",
+ QString(QLatin1String("ktelepathy/styles/%1/Contents/Resources/")).arg(styleId)
+ );
- if ( styleDirs.isEmpty() ) {
+ if (styleDirs.isEmpty()) {
kDebug() << "Failed to find style" << styleId;
return;
}
d->styleId = styleId;
- if ( styleDirs.count() > 1 ) {
+ if (styleDirs.count() > 1) {
kDebug() << "found several styles with the same name. using first";
}
- d->baseHref = styleDirs.at ( 0 );
+ d->baseHref = styleDirs.at(0);
kDebug() << "Using style:" << d->baseHref;
readStyleFiles();
- if ( styleBuildMode & StyleBuildNormal ) {
+ if (styleBuildMode & StyleBuildNormal) {
listVariants();
- if ( d->defaultVariantName.isEmpty() && !d->variantsList.isEmpty() ) {
+ if(d->defaultVariantName.isEmpty() && !d->variantsList.isEmpty()) {
d->defaultVariantName = d->variantsList.keys().first();
}
}
@@ -93,21 +93,21 @@ ChatWindowStyle::~ChatWindowStyle()
bool ChatWindowStyle::isValid() const
{
kDebug();
- bool statusHtml = !content ( Status ).isEmpty();
- bool fileTransferIncomingHtml = !content ( FileTransferIncoming ).isEmpty();
- bool nextIncomingHtml = !content ( IncomingNext ).isEmpty();
- bool incomingHtml = !content ( Incoming ).isEmpty();
- bool nextOutgoingHtml = !content ( OutgoingNext ).isEmpty();
- bool outgoingHtml = !content ( Outgoing ).isEmpty();
+ bool statusHtml = !content(Status).isEmpty();
+ bool fileTransferIncomingHtml = !content(FileTransferIncoming).isEmpty();
+ bool nextIncomingHtml = !content(IncomingNext).isEmpty();
+ bool incomingHtml = !content(Incoming).isEmpty();
+ bool nextOutgoingHtml = !content(OutgoingNext).isEmpty();
+ bool outgoingHtml = !content(Outgoing).isEmpty();
- return ( statusHtml && fileTransferIncomingHtml && nextIncomingHtml
- && incomingHtml && nextOutgoingHtml && outgoingHtml );
+ return (statusHtml && fileTransferIncomingHtml && nextIncomingHtml
+ && incomingHtml && nextOutgoingHtml && outgoingHtml);
}
ChatWindowStyle::StyleVariants ChatWindowStyle::getVariants()
{
// If the variantList is empty, list available variants.
- if ( d->variantsList.isEmpty() ) {
+ if (d->variantsList.isEmpty()) {
listVariants();
}
return d->variantsList;
@@ -141,163 +141,164 @@ QString ChatWindowStyle::getStyleBaseHref() const
bool ChatWindowStyle::hasHeader() const
{
- return ! content ( Header ).isEmpty();
+ return ! content(Header).isEmpty();
}
QString ChatWindowStyle::getTemplateHtml() const
{
- return content ( Template );
+ return content(Template);
}
QString ChatWindowStyle::getHeaderHtml() const
{
- return content ( Header );
+ return content(Header);
}
QString ChatWindowStyle::getFooterHtml() const
{
- return content ( Footer );
+ return content(Footer);
}
QString ChatWindowStyle::getIncomingHtml() const
{
- return content ( Incoming );
+ return content(Incoming);
}
QString ChatWindowStyle::getNextIncomingHtml() const
{
- return content ( IncomingNext );
+ return content(IncomingNext);
}
QString ChatWindowStyle::getOutgoingHtml() const
{
- return content ( Outgoing );
+ return content(Outgoing);
}
QString ChatWindowStyle::getNextOutgoingHtml() const
{
- return content ( OutgoingNext );
+ return content(OutgoingNext);
}
QString ChatWindowStyle::getStatusHtml() const
{
- return content ( Status );
+ return content(Status);
}
QString ChatWindowStyle::getHistoryIncomingHtml() const
{
- return content ( HistoryIncoming );
+ return content(HistoryIncoming);
}
QString ChatWindowStyle::getHistoryNextIncomingHtml() const
{
- return content ( HistoryIncomingNext );
+ return content(HistoryIncomingNext);
}
QString ChatWindowStyle::getHistoryOutgoingHtml() const
{
- return content ( HistoryOutgoing );
+ return content(HistoryOutgoing);
}
QString ChatWindowStyle::getHistoryNextOutgoingHtml() const
{
- return content ( HistoryOutgoingNext );
+ return content(HistoryOutgoingNext);
}
QString ChatWindowStyle::getActionIncomingHtml() const
{
- return content ( ActionIncoming );
+ return content(ActionIncoming);
}
QString ChatWindowStyle::getActionOutgoingHtml() const
{
- return content ( ActionOutgoing );
+ return content(ActionOutgoing);
}
QString ChatWindowStyle::getFileTransferIncomingHtml() const
{
- return content ( FileTransferIncoming );
+ return content(FileTransferIncoming);
}
QString ChatWindowStyle::getVoiceClipIncomingHtml() const
{
- return content ( VoiceClipIncoming );
+ return content(VoiceClipIncoming);
}
QString ChatWindowStyle::getOutgoingStateSendingHtml() const
{
- return content ( OutgoingStateSending );
+ return content(OutgoingStateSending);
}
QString ChatWindowStyle::getOutgoingStateSentHtml() const
{
- return content ( OutgoingStateSent );
+ return content(OutgoingStateSent);
}
QString ChatWindowStyle::getOutgoingStateErrorHtml() const
{
- return content ( OutgoingStateError );
+ return content(OutgoingStateError);
}
QString ChatWindowStyle::getOutgoingStateUnknownHtml() const
{
- return content ( OutgoingStateUnknown );
+ return content(OutgoingStateUnknown);
}
bool ChatWindowStyle::hasActionTemplate() const
{
- return ( !content ( ActionIncoming ).isEmpty() && !content ( ActionOutgoing ).isEmpty() );
+ return (!content(ActionIncoming).isEmpty() && !content(ActionOutgoing).isEmpty());
}
void ChatWindowStyle::listVariants()
{
- QString variantDirPath = d->baseHref + QString::fromUtf8 ( "Variants/" );
- QDir variantDir ( variantDirPath );
+ QString variantDirPath = d->baseHref + QString::fromUtf8("Variants/");
+ QDir variantDir(variantDirPath);
- QStringList variantList = variantDir.entryList ( QStringList ( QLatin1String ( "*.css" ) ) );
+ QStringList variantList = variantDir.entryList(QStringList(QLatin1String("*.css")));
QStringList::ConstIterator it, itEnd = variantList.constEnd();
- QLatin1String compactVersionPrefix ( "_compact_" );
- for ( it = variantList.constBegin(); it != itEnd; ++it ) {
+ QLatin1String compactVersionPrefix("_compact_");
+ for (it = variantList.constBegin(); it != itEnd; ++it) {
QString variantName = *it, variantPath;
// Retrieve only the file name.
- variantName = variantName.left ( variantName.lastIndexOf ( QLatin1String ( "." ) ) );
- if ( variantName.startsWith ( compactVersionPrefix ) ) {
- if ( variantName == compactVersionPrefix ) {
- d->compactVariants.insert ( QLatin1String ( "" ), true );
+ variantName = variantName.left(variantName.lastIndexOf(QLatin1String(".")));
+ if (variantName.startsWith(compactVersionPrefix)) {
+ if (variantName == compactVersionPrefix) {
+ d->compactVariants.insert(QLatin1String(""), true);
}
continue;
}
QString compactVersionFilename = *it;
- QString compactVersionPath = variantDirPath + compactVersionFilename.prepend ( compactVersionPrefix );
- if ( QFile::exists ( compactVersionPath ) ) {
- d->compactVariants.insert ( variantName, true );
+ QString compactVersionPath = variantDirPath + compactVersionFilename.prepend(compactVersionPrefix);
+ if (QFile::exists(compactVersionPath)) {
+ d->compactVariants.insert(variantName, true);
}
// variantPath is relative to baseHref.
- variantPath = QString ( QLatin1String ( "Variants/%1" ) ).arg ( *it );
- d->variantsList.insert ( variantName, variantPath );
+ variantPath = QString(QLatin1String("Variants/%1")).arg(*it);
+ d->variantsList.insert(variantName, variantPath);
}
}
-void ChatWindowStyle::setContent ( InternalIdentifier id, const QString& content )
+void ChatWindowStyle::setContent(InternalIdentifier id, const QString& content)
{
- d->templateContents.insert ( id, content );
+ d->templateContents.insert( id, content );
}
-QString ChatWindowStyle::content ( InternalIdentifier id ) const
+QString ChatWindowStyle::content(InternalIdentifier id) const
{
- return d->templateContents.value ( id );
+ return d->templateContents.value( id );
}
-void ChatWindowStyle::inheritContent ( InternalIdentifier subType, InternalIdentifier superType )
+void ChatWindowStyle::inheritContent(InternalIdentifier subType, InternalIdentifier superType)
{
- if ( content ( subType ).isEmpty() ) {
- setContent ( subType, content ( superType ) );
+ if (content(subType).isEmpty()) {
+ setContent(subType, content(superType));
}
}
void ChatWindowStyle::readStyleFiles()
{
+ // load style info
QString infoPlistFile = d->baseHref + QLatin1String("../Info.plist");
ChatStylePlistFileReader plistReader(infoPlistFile);
d->defaultVariantName = plistReader.defaultVariant();
@@ -306,48 +307,48 @@ void ChatWindowStyle::readStyleFiles()
// specify the files for the identifiers
QHash<InternalIdentifier, QLatin1String> templateFiles;
- templateFiles.insert ( Template, QLatin1String ( "Template.html" ) );
- templateFiles.insert ( Status, QLatin1String ( "Status.html" ) );
+ templateFiles.insert(Template, QLatin1String("Template.html"));
+ templateFiles.insert(Status, QLatin1String("Status.html"));
- templateFiles.insert ( Header, QLatin1String ( "Header.html" ) );
- templateFiles.insert ( Footer, QLatin1String ( "Footer.html" ) );
+ templateFiles.insert(Header, QLatin1String("Header.html"));
+ templateFiles.insert(Footer, QLatin1String("Footer.html"));
- templateFiles.insert ( Incoming, QLatin1String ( "Incoming/Content.html" ) );
- templateFiles.insert ( IncomingNext, QLatin1String ( "Incoming/NextContent.html" ) );
- templateFiles.insert ( Outgoing, QLatin1String ( "Outgoing/Content.html" ) );
- templateFiles.insert ( OutgoingNext, QLatin1String ( "Outgoing/NextContent.html" ) );
+ templateFiles.insert(Incoming, QLatin1String("Incoming/Content.html"));
+ templateFiles.insert(IncomingNext, QLatin1String("Incoming/NextContent.html"));
+ templateFiles.insert(Outgoing, QLatin1String("Outgoing/Content.html"));
+ templateFiles.insert(OutgoingNext, QLatin1String("Outgoing/NextContent.html"));
- templateFiles.insert ( HistoryIncoming, QLatin1String ( "Incoming/Context.html" ) );
- templateFiles.insert ( HistoryIncomingNext, QLatin1String ( "Incoming/NextContext.html" ) );
- templateFiles.insert ( HistoryOutgoing, QLatin1String ( "Outgoing/Context.html" ) );
- templateFiles.insert ( HistoryOutgoingNext, QLatin1String ( "Outgoing/NextContext.html" ) );
+ templateFiles.insert(HistoryIncoming, QLatin1String("Incoming/Context.html"));
+ templateFiles.insert(HistoryIncomingNext, QLatin1String("Incoming/NextContext.html"));
+ templateFiles.insert(HistoryOutgoing, QLatin1String("Outgoing/Context.html"));
+ templateFiles.insert(HistoryOutgoingNext, QLatin1String("Outgoing/NextContext.html"));
- templateFiles.insert ( ActionIncoming, QLatin1String ( "Incoming/Action.html" ) );
- templateFiles.insert ( ActionOutgoing, QLatin1String ( "Outgoing/Action.html" ) );
+ templateFiles.insert(ActionIncoming, QLatin1String("Incoming/Action.html"));
+ templateFiles.insert(ActionOutgoing, QLatin1String("Outgoing/Action.html"));
- templateFiles.insert ( FileTransferIncoming, QLatin1String ( "Incoming/FileTransferRequest.html" ) );
- templateFiles.insert ( VoiceClipIncoming, QLatin1String ( "Incoming/voiceClipRequest.html" ) );
+ templateFiles.insert(FileTransferIncoming, QLatin1String("Incoming/FileTransferRequest.html"));
+ templateFiles.insert(VoiceClipIncoming, QLatin1String("Incoming/voiceClipRequest.html"));
- templateFiles.insert ( OutgoingStateUnknown, QLatin1String ( "Outgoing/StateUnknown.html" ) );
- templateFiles.insert ( OutgoingStateSending, QLatin1String ( "Outgoing/StateSending.html" ) );
- templateFiles.insert ( OutgoingStateSent, QLatin1String ( "Outgoing/StateSent.html" ) );
- templateFiles.insert ( OutgoingStateError, QLatin1String ( "Outgoing/StateError.html" ) );
+ templateFiles.insert(OutgoingStateUnknown, QLatin1String("Outgoing/StateUnknown.html"));
+ templateFiles.insert(OutgoingStateSending, QLatin1String("Outgoing/StateSending.html"));
+ templateFiles.insert(OutgoingStateSent, QLatin1String("Outgoing/StateSent.html"));
+ templateFiles.insert(OutgoingStateError, QLatin1String("Outgoing/StateError.html"));
// load all files
QFile fileAccess;
- Q_FOREACH ( const QLatin1String &fileName, templateFiles ) {
+ Q_FOREACH(const QLatin1String &fileName, templateFiles) {
QString path = d->baseHref + fileName;
// Load template file
- if ( QFile::exists ( path ) ) {
- fileAccess.setFileName ( path );
- fileAccess.open ( QIODevice::ReadOnly );
- QTextStream headerStream ( &fileAccess );
- headerStream.setCodec ( QTextCodec::codecForName ( "UTF-8" ) );
+ if (QFile::exists(path)) {
+ fileAccess.setFileName(path);
+ fileAccess.open(QIODevice::ReadOnly);
+ QTextStream headerStream(&fileAccess);
+ headerStream.setCodec(QTextCodec::codecForName("UTF-8"));
QString data = headerStream.readAll();
- if ( !data.isEmpty() ) {
+ if(!data.isEmpty()) {
//kDebug() << fileName << "was found!";
- setContent ( templateFiles.key ( fileName ), data );
+ setContent( templateFiles.key(fileName), data);
} else {
kDebug() << fileName << "was not found!";
}
@@ -357,27 +358,28 @@ void ChatWindowStyle::readStyleFiles()
}
// basic fallbacks
- inheritContent ( IncomingNext, Incoming );
+ inheritContent(IncomingNext, Incoming);
- inheritContent ( Outgoing, Incoming );
- inheritContent ( OutgoingNext, Outgoing );
+ inheritContent(Outgoing, Incoming);
+ inheritContent(OutgoingNext, Outgoing);
- inheritContent ( HistoryIncoming, Incoming );
- inheritContent ( HistoryIncomingNext, HistoryIncoming );
+ inheritContent(HistoryIncoming, Incoming);
+ inheritContent(HistoryIncomingNext, HistoryIncoming);
- inheritContent ( HistoryOutgoing, HistoryIncoming );
- inheritContent ( HistoryOutgoingNext, HistoryIncomingNext );
+ inheritContent(HistoryOutgoing, HistoryIncoming);
+ inheritContent(HistoryOutgoingNext, HistoryIncomingNext);
// Load template file fallback
- if ( content ( Template ).isEmpty() ) {
- QString templateFileName ( KGlobal::dirs()->findResource ( "data", QLatin1String ( "ktelepathy/template.html" ) ) );
-
- if ( ! templateFileName.isEmpty() && QFile::exists ( templateFileName ) ) {
- fileAccess.setFileName ( templateFileName );
- fileAccess.open ( QIODevice::ReadOnly );
- QTextStream headerStream ( &fileAccess );
- headerStream.setCodec ( QTextCodec::codecForName ( "UTF-8" ) );
- setContent ( Template, headerStream.readAll() );
+ if (content(Template).isEmpty())
+ {
+ QString templateFileName(KGlobal::dirs()->findResource("data", QLatin1String("ktelepathy/template.html")));
+
+ if (! templateFileName.isEmpty() && QFile::exists(templateFileName)) {
+ fileAccess.setFileName(templateFileName);
+ fileAccess.open(QIODevice::ReadOnly);
+ QTextStream headerStream(&fileAccess);
+ headerStream.setCodec(QTextCodec::codecForName("UTF-8"));
+ setContent(Template, headerStream.readAll());
fileAccess.close();
}
}
@@ -385,45 +387,45 @@ void ChatWindowStyle::readStyleFiles()
//FIXME: do we have anything like this in telepathy?!
// make sure file transfers are displayed correctly
- if ( content ( FileTransferIncoming ).isEmpty() ||
- ( !content ( FileTransferIncoming ).contains ( QLatin1String ( "saveFileHandlerId" ) ) &&
- !content ( FileTransferIncoming ).contains ( QLatin1String ( "saveFileAsHandlerId" ) ) ) ) { // Create default html
- QString message = QString ( QLatin1String ( "%message%
"
- "<div>
"
- " <div style=\"width:37px; float:left;\">
"
- " <img src=\"%fileIconPath%\" style=\"width:32px; height:32px; vertical-align:middle;\" />
"
- " </div>
"
- " <div>
"
- " <span><b>%fileName%</b> (%fileSize%)</span><br>
"
- " <span>
"
- " <input id=\"%saveFileAsHandlerId%\" type=\"button\" value=\"%1\">
"
- " <input id=\"%cancelRequestHandlerId%\" type=\"button\" value=\"%2\">
"
- " </span>
"
- " </div>
"
- "</div>" ) )
- .arg ( i18n ( "Download" ), i18n ( "Cancel" ) );
- QString incoming = content ( Incoming );
- setContent ( FileTransferIncoming, incoming.replace ( QLatin1String ( "%message%" ), message ) );
+ if (content(FileTransferIncoming).isEmpty() ||
+ (!content(FileTransferIncoming).contains(QLatin1String("saveFileHandlerId")) &&
+ !content(FileTransferIncoming).contains(QLatin1String("saveFileAsHandlerId")))) { // Create default html
+ QString message = QString(QLatin1String("%message%
"
+ "<div>
"
+ " <div style=\"width:37px; float:left;\">
"
+ " <img src=\"%fileIconPath%\" style=\"width:32px; height:32px; vertical-align:middle;\" />
"
+ " </div>
"
+ " <div>
"
+ " <span><b>%fileName%</b> (%fileSize%)</span><br>
"
+ " <span>
"
+ " <input id=\"%saveFileAsHandlerId%\" type=\"button\" value=\"%1\">
"
+ " <input id=\"%cancelRequestHandlerId%\" type=\"button\" value=\"%2\">
"
+ " </span>
"
+ " </div>
"
+ "</div>"))
+ .arg(i18n("Download"), i18n("Cancel"));
+ QString incoming = content(Incoming);
+ setContent(FileTransferIncoming, incoming.replace(QLatin1String("%message%"), message));
}
// make sure VoiceClip is displayed correctly
- if ( content ( VoiceClipIncoming ).isEmpty() ||
- ( !content ( VoiceClipIncoming ).contains ( QLatin1String ( "playVoiceHandlerId" ) ) &&
- !content ( VoiceClipIncoming ).contains ( QLatin1String ( "saveAsVoiceHandlerId" ) ) ) ) { // Create default html
- QString message = QString ( QLatin1String ( "%message%
"
- "<div>
"
- " <div style=\"width:37px; float:left;\">
"
- " <img src=\"%fileIconPath%\" style=\"width:32px; height:32px; vertical-align:middle;\" />
"
- " </div>
"
- " <div>
"
- " <span>
"
- " <input id=\"%playVoiceHandlerId%\" type=\"button\" value=\"%1\">
"
- " <input id=\"%saveAsVoiceHandlerId%\" type=\"button\" value=\"%2\">
"
- " </span>
"
- " </div>
"
- "</div>" ) )
- .arg ( i18n ( "Play" ), i18n ( "Save as" ) );
- setContent ( VoiceClipIncoming, content ( Incoming ).replace ( QLatin1String ( "%message%" ), message ) );
+ if (content(VoiceClipIncoming).isEmpty() ||
+ (!content(VoiceClipIncoming).contains(QLatin1String("playVoiceHandlerId")) &&
+ !content(VoiceClipIncoming).contains(QLatin1String("saveAsVoiceHandlerId")))) { // Create default html
+ QString message = QString(QLatin1String("%message%
"
+ "<div>
"
+ " <div style=\"width:37px; float:left;\">
"
+ " <img src=\"%fileIconPath%\" style=\"width:32px; height:32px; vertical-align:middle;\" />
"
+ " </div>
"
+ " <div>
"
+ " <span>
"
+ " <input id=\"%playVoiceHandlerId%\" type=\"button\" value=\"%1\">
"
+ " <input id=\"%saveAsVoiceHandlerId%\" type=\"button\" value=\"%2\">
"
+ " </span>
"
+ " </div>
"
+ "</div>"))
+ .arg(i18n("Play"), i18n("Save as"));
+ setContent(VoiceClipIncoming, content(Incoming).replace(QLatin1String("%message%"), message));
}
}
@@ -434,20 +436,20 @@ void ChatWindowStyle::reload()
listVariants();
}
-bool ChatWindowStyle::hasCompact ( const QString & styleVariant ) const
+bool ChatWindowStyle::hasCompact(const QString & styleVariant) const
{
- if ( d->compactVariants.contains ( styleVariant ) ) {
- return d->compactVariants.value ( styleVariant );
+ if (d->compactVariants.contains(styleVariant)) {
+ return d->compactVariants.value(styleVariant);
}
return false;
}
-QString ChatWindowStyle::compact ( const QString & styleVariant ) const
+QString ChatWindowStyle::compact(const QString & styleVariant) const
{
QString compacted = styleVariant;
- if ( styleVariant.isEmpty() ) {
- return QLatin1String ( "Variants/_compact_.css" );
+ if (styleVariant.isEmpty()) {
+ return QLatin1String("Variants/_compact_.css");
} else {
- return compacted.insert ( compacted.lastIndexOf ( QLatin1Char ( '/' ) ) + 1, QLatin1String ( "_compact_" ) );
+ return compacted.insert(compacted.lastIndexOf(QLatin1Char('/')) + 1, QLatin1String("_compact_"));
}
}
diff --git a/lib/conversation-target.cpp b/lib/conversation-target.cpp
index 184deea..c8be71b 100644
--- a/lib/conversation-target.cpp
+++ b/lib/conversation-target.cpp
@@ -28,8 +28,9 @@ public:
Tp::ContactPtr contact;
};
-ConversationTarget::ConversationTarget(Tp::ContactPtr contact) :
- d(new ConversationTargetPrivate)
+ConversationTarget::ConversationTarget(Tp::ContactPtr contact, QObject* parent) :
+ QObject(parent),
+ d(new ConversationTargetPrivate)
{
kDebug();
diff --git a/lib/conversation-target.h b/lib/conversation-target.h
index 225f29f..139c007 100644
--- a/lib/conversation-target.h
+++ b/lib/conversation-target.h
@@ -39,7 +39,7 @@ class KDE_TELEPATHY_CHAT_EXPORT ConversationTarget : public QObject
Q_PROPERTY(QString id READ id)
public:
- ConversationTarget(Tp::ContactPtr contact = Tp::ContactPtr());
+ ConversationTarget(Tp::ContactPtr contact, QObject* parent = 0);
virtual ~ConversationTarget();
QIcon avatar() const;
diff --git a/lib/conversation.cpp b/lib/conversation.cpp
index 99a77e1..4ca65b4 100644
--- a/lib/conversation.cpp
+++ b/lib/conversation.cpp
@@ -32,15 +32,16 @@ public:
// Tp::AccountPtr account;
};
-Conversation::Conversation(Tp::TextChannelPtr channel, Tp::AccountPtr account) :
+Conversation::Conversation(Tp::TextChannelPtr channel, Tp::AccountPtr account, QObject* parent) :
+ QObject(parent),
d (new ConversationPrivate)
{
kDebug();
- d->model = new MessagesModel();
+ d->model = new MessagesModel(this);
d->model->setTextChannel(channel);
- d->target = new ConversationTarget(channel->targetContact());
+ d->target = new ConversationTarget(channel->targetContact(), this);
// connect(model(), SIGNAL(unreadCountChanged(int)), SLOT(onUnreadMessagesChanged()));
// d->account = account;
@@ -75,7 +76,5 @@ ConversationTarget* Conversation::target() const
Conversation::~Conversation()
{
kDebug();
- delete d->model;
- delete d->target;
delete d;
}
diff --git a/lib/conversation.h b/lib/conversation.h
index ef1e207..355ce71 100644
--- a/lib/conversation.h
+++ b/lib/conversation.h
@@ -28,19 +28,21 @@
// #include "conversation-model.h"
#include <KIcon>
#include "conversation-que-manager.h"
+#include "conversation-target.h"
-class ConversationTarget;
+// class ConversationTarget;
class MessagesModel;
class KDE_TELEPATHY_CHAT_EXPORT Conversation : public QObject
{
Q_OBJECT
-Q_PROPERTY(ConversationTarget* target READ target CONSTANT);
+// Q_PROPERTY(ConversationTarget* target READ target CONSTANT);
+Q_PROPERTY(QObject* target READ target CONSTANT);
//TODO: rename this to messages
Q_PROPERTY(MessagesModel* model READ model CONSTANT);
public:
- Conversation(Tp::TextChannelPtr channel, Tp::AccountPtr account);
+ Conversation(Tp::TextChannelPtr channel, Tp::AccountPtr account, QObject* parent = 0);
Conversation(QObject* parent = 0);
virtual ~Conversation();
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list