[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:07:48 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=bdfed54
The following commit has been merged in the master branch:
commit bdfed543cdd82bedaec47cc7c44d4b72bab2c849
Author: Siddhartha Sahu <sh.siddhartha at gmail.com>
Date: Thu Nov 7 10:07:10 2013 +0530
Rename LogManager to ScrollbackManager
---
KTp/CMakeLists.txt | 2 +-
KTp/Declarative/messages-model.cpp | 14 ++++++-------
KTp/Declarative/messages-model.h | 4 +---
KTp/Logger/CMakeLists.txt | 4 ++--
.../{logmanager.cpp => scrollback-manager.cpp} | 24 +++++++++++-----------
KTp/Logger/{logmanager.h => scrollback-manager.h} | 12 +++++------
6 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index 363220c..ec1760d 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -117,10 +117,10 @@ install (FILES ${ktp_common_internals_private_HDRS}
DESTINATION ${INCLUDE_INSTALL_DIR}/KTp
)
+add_subdirectory(Declarative)
add_subdirectory(Models)
add_subdirectory(Widgets)
add_subdirectory(Logger)
-add_subdirectory(Declarative)
# API docs
find_package(Doxygen)
diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index e8ff036..d46cd32 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -27,9 +27,9 @@
#include <TelepathyQt/TextChannel>
#include <TelepathyQt/Account>
-#include "../message-processor.h"
-#include "../message-context.h"
-#include <../Logger/logmanager.h>
+#include <KTp/message-processor.h>
+#include <KTp/message-context.h>
+#include <KTp/Logger/scrollback-manager.h>
class MessagePrivate
{
@@ -52,7 +52,7 @@ class MessagesModel::MessagesModelPrivate
public:
Tp::TextChannelPtr textChannel;
Tp::AccountPtr account;
- LogManager *logManager;
+ ScrollbackManager *logManager;
QList<MessagePrivate> messages;
// For fast lookup of original messages upon receipt of a message delivery report.
QHash<QString /*messageToken*/, QPersistentModelIndex> messagesByMessageToken;
@@ -79,7 +79,7 @@ MessagesModel::MessagesModel(const Tp::AccountPtr &account, QObject *parent) :
d->account = account;
d->visible = false;
- d->logManager = new LogManager(this);
+ d->logManager = new ScrollbackManager(this);
connect(d->logManager, SIGNAL(fetched(QList<KTp::Message>)), SLOT(onHistoryFetched(QList<KTp::Message>)));
d->logManager->setScrollbackLength(10);
}
@@ -127,7 +127,6 @@ void MessagesModel::setTextChannel(const Tp::TextChannelPtr &channel)
d->textChannel = channel;
d->logManager->setTextChannel(d->account, d->textChannel);
- m_previousConversationAvailable = d->logManager->exists();
d->logManager->fetchScrollback();
QList<Tp::ReceivedMessage> messageQueue = channel->messageQueue();
@@ -154,8 +153,7 @@ void MessagesModel::onHistoryFetched(const QList<KTp::Message> &messages)
//Add all messages before the ones already present in the channel
for(int i=messages.size()-1;i>=0;i--) {
beginInsertRows(QModelIndex(), 0, 0);
- d->messages.prepend(KTp::MessageProcessor::instance()->processIncomingMessage(
- messages[i], KTp::MessageContext(d->account, d->textChannel)));
+ d->messages.prepend(messages[i]);
endInsertRows();
}
}
diff --git a/KTp/Declarative/messages-model.h b/KTp/Declarative/messages-model.h
index 53103ca..b7ee113 100644
--- a/KTp/Declarative/messages-model.h
+++ b/KTp/Declarative/messages-model.h
@@ -25,7 +25,7 @@
#include <TelepathyQt/Types>
#include <TelepathyQt/ReceivedMessage>
-#include "../message.h"
+#include <KTp/message.h>
class MessagesModel : public QAbstractListModel
{
@@ -99,8 +99,6 @@ class MessagesModel : public QAbstractListModel
class MessagesModelPrivate;
MessagesModelPrivate *d;
-
- bool m_previousConversationAvailable;
};
#endif // CONVERSATION_MODEL_H
diff --git a/KTp/Logger/CMakeLists.txt b/KTp/Logger/CMakeLists.txt
index 5b77c80..3b3b35f 100644
--- a/KTp/Logger/CMakeLists.txt
+++ b/KTp/Logger/CMakeLists.txt
@@ -9,7 +9,6 @@ set (ktp_logger_private_SRCS
abstract-logger-plugin.cpp
log-entity.cpp
log-manager.cpp
- logmanager.cpp
log-message.cpp
log-search-hit.cpp
pending-logger-dates.cpp
@@ -21,13 +20,13 @@ set (ktp_logger_private_SRCS
pending-logger-operation.cpp
pending-logger-search.cpp
pending-logger-search-impl.cpp
+ scrollback-manager.cpp
)
set (ktp_logger_private_HDRS
abstract-logger-plugin.h
log-entity.h
log-manager.h
- logmanager.h
log-message.h
log-search-hit.h
pending-logger-dates.h
@@ -35,6 +34,7 @@ set (ktp_logger_private_HDRS
pending-logger-logs.h
pending-logger-operation.h
pending-logger-search.h
+ scrollback-manager.h
)
kde4_add_library (ktploggerprivate SHARED
diff --git a/KTp/Logger/logmanager.cpp b/KTp/Logger/scrollback-manager.cpp
similarity index 88%
rename from KTp/Logger/logmanager.cpp
rename to KTp/Logger/scrollback-manager.cpp
index 34bb7ef..ae8a89a 100644
--- a/KTp/Logger/logmanager.cpp
+++ b/KTp/Logger/scrollback-manager.cpp
@@ -18,7 +18,7 @@
*/
-#include "logmanager.h"
+#include "scrollback-manager.h"
#include "../message-processor.h"
#include "log-entity.h"
@@ -33,7 +33,7 @@
#include <TelepathyQt/TextChannel>
#include <TelepathyQt/ReceivedMessage>
-class LogManager::Private
+class ScrollbackManager::Private
{
public:
Private(): scrollbackLength(10)
@@ -46,18 +46,18 @@ class LogManager::Private
int scrollbackLength;
};
-LogManager::LogManager(QObject *parent)
+ScrollbackManager::ScrollbackManager(QObject *parent)
: QObject(parent),
d(new Private)
{
}
-LogManager::~LogManager()
+ScrollbackManager::~ScrollbackManager()
{
delete d;
}
-bool LogManager::exists() const
+bool ScrollbackManager::exists() const
{
if (d->account.isNull() || d->textChannel.isNull() ) {
return false;
@@ -66,7 +66,7 @@ bool LogManager::exists() const
return KTp::LogManager::instance()->logsExist(d->account, d->contactEntity);
}
-void LogManager::setTextChannel(const Tp::AccountPtr &account, const Tp::TextChannelPtr &textChannel)
+void ScrollbackManager::setTextChannel(const Tp::AccountPtr &account, const Tp::TextChannelPtr &textChannel)
{
d->textChannel = textChannel;
d->account = account;
@@ -86,22 +86,22 @@ void LogManager::setTextChannel(const Tp::AccountPtr &account, const Tp::TextCha
}
}
-void LogManager::setScrollbackLength(int n)
+void ScrollbackManager::setScrollbackLength(int n)
{
d->scrollbackLength = n;
}
-int LogManager::scrollbackLength() const
+int ScrollbackManager::scrollbackLength() const
{
return d->scrollbackLength;
}
-void LogManager::fetchScrollback()
+void ScrollbackManager::fetchScrollback()
{
fetchHistory(d->scrollbackLength);
}
-void LogManager::fetchHistory(int n)
+void ScrollbackManager::fetchHistory(int n)
{
if (n > 0 && !d->account.isNull() && !d->textChannel.isNull()) {
if (d->contactEntity.isValid()) {
@@ -118,7 +118,7 @@ void LogManager::fetchHistory(int n)
Q_EMIT fetched(messages);
}
-void LogManager::onDatesFinished(KTp::PendingLoggerOperation* po)
+void ScrollbackManager::onDatesFinished(KTp::PendingLoggerOperation* po)
{
KTp::PendingLoggerDates *datesOp = qobject_cast<KTp::PendingLoggerDates*>(po);
if (datesOp->hasError()) {
@@ -140,7 +140,7 @@ void LogManager::onDatesFinished(KTp::PendingLoggerOperation* po)
this, SLOT(onEventsFinished(KTp::PendingLoggerOperation*)));
}
-void LogManager::onEventsFinished(KTp::PendingLoggerOperation *op)
+void ScrollbackManager::onEventsFinished(KTp::PendingLoggerOperation *op)
{
KTp::PendingLoggerLogs *logsOp = qobject_cast<KTp::PendingLoggerLogs*>(op);
if (logsOp->hasError()) {
diff --git a/KTp/Logger/logmanager.h b/KTp/Logger/scrollback-manager.h
similarity index 88%
rename from KTp/Logger/logmanager.h
rename to KTp/Logger/scrollback-manager.h
index eb71320..4e03cf3 100644
--- a/KTp/Logger/logmanager.h
+++ b/KTp/Logger/scrollback-manager.h
@@ -18,8 +18,8 @@
*/
-#ifndef LOGMANAGER_H
-#define LOGMANAGER_H
+#ifndef SCROLLBACKMANAGER_H
+#define SCROLLBACKMANAGER_H
#include <KTp/message.h>
@@ -27,13 +27,13 @@ namespace KTp {
class PendingLoggerOperation;
}
-class KTP_EXPORT LogManager : public QObject
+class KTP_EXPORT ScrollbackManager : public QObject
{
Q_OBJECT
public:
- explicit LogManager(QObject *parent = 0);
- virtual ~LogManager();
+ explicit ScrollbackManager(QObject *parent = 0);
+ virtual ~ScrollbackManager();
bool exists() const;
@@ -68,4 +68,4 @@ private:
Private * const d;
};
-#endif // LOGMANAGER_H
+#endif // SCROLLBACKMANAGER_H
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list