[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:06:10 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=054f31b
The following commit has been merged in the master branch:
commit 054f31bf9b734095f3996d59e6777a00f805aeeb
Author: Dan Vrátil <dvratil at redhat.com>
Date: Tue Jan 8 11:10:35 2013 +0100
Rename ConversationQueManager to ConversationQueueManager
And change que to queue everywhere else
---
...-manager.cpp => conversation-queue-manager.cpp} | 57 +++++++++++-----------
...-que-manager.h => conversation-queue-manager.h} | 48 +++++++++---------
KTp/Declarative/conversation.h | 2 +-
KTp/Declarative/messages-model.cpp | 4 +-
KTp/Declarative/messages-model.h | 4 +-
5 files changed, 58 insertions(+), 57 deletions(-)
diff --git a/KTp/Declarative/conversation-que-manager.cpp b/KTp/Declarative/conversation-queue-manager.cpp
similarity index 56%
rename from KTp/Declarative/conversation-que-manager.cpp
rename to KTp/Declarative/conversation-queue-manager.cpp
index a7b347a..81a6ab2 100644
--- a/KTp/Declarative/conversation-que-manager.cpp
+++ b/KTp/Declarative/conversation-queue-manager.cpp
@@ -17,49 +17,50 @@
*/
-#include "conversation-que-manager.h"
+#include "conversation-queue-manager.h"
#include <KDebug>
-class ConversationQueManager::ConversationQueManagerPrivate {
-public:
- QList<Queable*> que;
+class ConversationQueueManager::ConversationQueManagerPrivate
+{
+ public:
+ QList<Queueable*> queue;
KAction *gloablAction;
};
-void Queable::enqueSelf()
+void Queueable::enqueueSelf()
{
- m_queManager->enque(this);
+ m_queueManager->enqueue(this);
}
-void Queable::removeSelfFromQueue()
+void Queueable::removeSelfFromQueue()
{
- m_queManager->remove(this);
+ m_queueManager->remove(this);
}
-Queable::~Queable()
+Queueable::~Queueable()
{
}
-Queable::Queable(ConversationQueManager *que)
- : m_queManager(que)
+Queueable::Queueable(ConversationQueueManager *queue)
+ : m_queueManager(queue)
{
- if(!que) {
- m_queManager = ConversationQueManager::instance();
+ if(!queue) {
+ m_queueManager = ConversationQueueManager::instance();
}
}
-ConversationQueManager *ConversationQueManager::instance()
+ConversationQueueManager *ConversationQueueManager::instance()
{
- static ConversationQueManager *m_instance = 0;
+ static ConversationQueueManager *m_instance = 0;
if(!m_instance) {
- m_instance = new ConversationQueManager();
+ m_instance = new ConversationQueueManager();
}
return m_instance;
}
-ConversationQueManager::ConversationQueManager(QObject *parent):
+ConversationQueueManager::ConversationQueueManager(QObject *parent):
QObject(parent),
d(new ConversationQueManagerPrivate)
{
@@ -70,33 +71,33 @@ ConversationQueManager::ConversationQueManager(QObject *parent):
d->gloablAction->setObjectName(QLatin1String("next-unread-conversation"));
d->gloablAction->setGlobalShortcut(KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_I)/*, KAction::ActiveShortcut | KAction::DefaultShortcut, KAction::NoAutoloading*/);
- connect(d->gloablAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), SLOT(dequeNext()));
+ connect(d->gloablAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), SLOT(dequeueNext()));
}
-void ConversationQueManager::dequeNext()
+void ConversationQueueManager::dequeueNext()
{
kDebug();
- if(!d->que.isEmpty()) {
- d->que.takeLast()->selfDequed();
+ if(!d->queue.isEmpty()) {
+ d->queue.takeLast()->selfDequeued();
}
}
-void ConversationQueManager::enque(Queable *item)
+void ConversationQueueManager::enqueue(Queueable *item)
{
- if(!d->que.contains(item)) {
- d->que.append(item);
+ if(!d->queue.contains(item)) {
+ d->queue.append(item);
}
}
-void ConversationQueManager::remove(Queable *item)
+void ConversationQueueManager::remove(Queueable *item)
{
- if(d->que.contains(item)) {
- d->que.removeAll(item);
+ if(d->queue.contains(item)) {
+ d->queue.removeAll(item);
}
}
-ConversationQueManager::~ConversationQueManager()
+ConversationQueueManager::~ConversationQueueManager()
{
delete d;
}
diff --git a/KTp/Declarative/conversation-que-manager.h b/KTp/Declarative/conversation-queue-manager.h
similarity index 56%
rename from KTp/Declarative/conversation-que-manager.h
rename to KTp/Declarative/conversation-queue-manager.h
index e8ab426..62dbebf 100644
--- a/KTp/Declarative/conversation-que-manager.h
+++ b/KTp/Declarative/conversation-queue-manager.h
@@ -17,48 +17,48 @@
*/
-#ifndef CONVERSATION_QUE_MANAGER_H
-#define CONVERSATION_QUE_MANAGER_H
+#ifndef CONVERSATION_QUEUE_MANAGER_H
+#define CONVERSATION_QUEUE_MANAGER_H
#include <QtCore/QObject>
#include <KAction>
-class ConversationQueManager;
-class Queable
+class ConversationQueueManager;
+class Queueable
{
-friend class ConversationQueManager;
+ friend class ConversationQueueManager;
-protected:
- Queable(ConversationQueManager *queue = 0);
- virtual ~Queable();
+ protected:
+ Queueable(ConversationQueueManager *queue = 0);
+ virtual ~Queueable();
- void enqueSelf();
+ void enqueueSelf();
void removeSelfFromQueue();
- virtual void selfDequed() = 0;
+ virtual void selfDequeued() = 0;
-private:
- ConversationQueManager *m_queManager;
+ private:
+ ConversationQueueManager *m_queueManager;
};
-class ConversationQueManager : public QObject
+class ConversationQueueManager : public QObject
{
-Q_OBJECT
+ Q_OBJECT
-public:
- static ConversationQueManager* instance();
- void enque(Queable *item);
- void remove(Queable *item);
+ public:
+ static ConversationQueueManager* instance();
+ void enqueue(Queueable *item);
+ void remove(Queueable *item);
-public Q_SLOTS:
- void dequeNext();
+ public Q_SLOTS:
+ void dequeueNext();
-private:
- explicit ConversationQueManager(QObject *parent = 0);
- virtual ~ConversationQueManager();
+ private:
+ explicit ConversationQueueManager(QObject *parent = 0);
+ virtual ~ConversationQueueManager();
class ConversationQueManagerPrivate;
ConversationQueManagerPrivate *d;
};
-#endif // CONVERSATION_QUE_MANAGER_H
+#endif // CONVERSATION_QUEUE_MANAGER_H
diff --git a/KTp/Declarative/conversation.h b/KTp/Declarative/conversation.h
index 6eeab86..804ba09 100644
--- a/KTp/Declarative/conversation.h
+++ b/KTp/Declarative/conversation.h
@@ -28,7 +28,7 @@
#include <KIcon>
-#include "conversation-que-manager.h"
+#include "conversation-queue-manager.h"
#include "conversation-target.h"
#include "messages-model.h"
diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index a33b3c4..2f6c979 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -151,7 +151,7 @@ void MessagesModel::onMessageReceived(const Tp::ReceivedMessage &message)
if (d->visible) {
acknowledgeAllMessages();
} else {
- enqueSelf();
+ enqueueSelf();
Q_EMIT unreadCountChanged(unreadCount);
}
}
@@ -269,7 +269,7 @@ void MessagesModel::acknowledgeAllMessages()
Q_EMIT unreadCountChanged(queue.size());
}
-void MessagesModel::selfDequed()
+void MessagesModel::selfDequeued()
{
Q_EMIT popoutRequested();
}
diff --git a/KTp/Declarative/messages-model.h b/KTp/Declarative/messages-model.h
index 233bbfb..b5021b0 100644
--- a/KTp/Declarative/messages-model.h
+++ b/KTp/Declarative/messages-model.h
@@ -22,10 +22,10 @@
#include <QAbstractItemModel>
#include <TelepathyQt/TextChannel>
-#include "conversation-que-manager.h"
+#include "conversation-queue-manager.h"
-class MessagesModel : public QAbstractListModel, public Queable
+class MessagesModel : public QAbstractListModel, public Queueable
{
Q_OBJECT
Q_ENUMS(MessageType)
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list