[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:18:40 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=d116fa8
The following commit has been merged in the master branch:
commit d116fa885c3bacd2078d1b2cd2460fcb0130925d
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date: Thu Feb 3 19:26:18 2011 +0100
Rename ChatWindow to ChatWidget because it actually is a widget and not a window
---
app/mainwindow.cpp | 6 ++--
lib/CMakeLists.txt | 4 +--
lib/{chatwindow.cpp => chatwidget.cpp} | 50 +++++++++++++++++-----------------
lib/{chatwindow.h => chatwidget.h} | 16 +++++------
lib/{chatwindow.ui => chatwidget.ui} | 4 +--
5 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index d215190..5209d03 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -18,7 +18,7 @@
***************************************************************************/
#include "mainwindow.h"
-#include "chatwindow.h"
+#include "chatwidget.h"
#include <KColorScheme>
#include <KDebug>
@@ -72,7 +72,7 @@ void MainWindow::handleChannels(const Tp::MethodInvocationContextPtr<> & context
}
Q_ASSERT(textChannel);
- ChatWindow* newWindow = new ChatWindow(textChannel, this);
+ ChatWidget* newWindow = new ChatWidget(textChannel, this);
addTab(newWindow, newWindow->icon(), newWindow->title());
@@ -118,7 +118,7 @@ void MainWindow::onCurrentIndexChanged(int index)
return;
}
- ChatWindow* chat = qobject_cast<ChatWindow*>(widget(index));
+ ChatWidget* chat = qobject_cast<ChatWidget*>(widget(index));
setWindowTitle(chat->title());
}
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 890dcc5..d0b88a4 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
set(telepathy_chat_handler_lib_SRCS
- chatwindow.cpp
+ chatwidget.cpp
chatwindowstyle.cpp
chatwindowstylemanager.cpp
adiumthemeview.cpp
@@ -13,7 +13,7 @@ set(telepathy_chat_handler_lib_SRCS
)
set(telepathy_chat_handler_lib_UI
- chatwindow.ui)
+ chatwidget.ui)
kde4_add_ui_files(telepathy_chat_handler_lib_SRCS ${telepathy_chat_handler_lib_UI})
diff --git a/lib/chatwindow.cpp b/lib/chatwidget.cpp
similarity index 94%
rename from lib/chatwindow.cpp
rename to lib/chatwidget.cpp
index 2752cff..6183233 100644
--- a/lib/chatwindow.cpp
+++ b/lib/chatwidget.cpp
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#include "chatwindow.h"
-#include "ui_chatwindow.h"
+#include "chatwidget.h"
+#include "ui_chatwidget.h"
#include "adiumthemeheaderinfo.h"
#include "adiumthemecontentinfo.h"
#include "adiumthememessageinfo.h"
@@ -66,7 +66,7 @@ Q_SIGNALS:
};
-class ChatWindowPrivate
+class ChatWidgetPrivate
{
public:
/** Stores whether the channel is ready with all contacts upgraded*/
@@ -75,33 +75,33 @@ public:
bool isGroupChat;
QString title;
Tp::TextChannelPtr channel;
- Ui::ChatWindow ui;
+ Ui::ChatWidget ui;
KComponentData telepathyComponentData();
};
//FIXME I would like this to be part of the main KDE Telepathy library as a static function somewhere.
-KComponentData ChatWindowPrivate::telepathyComponentData()
+KComponentData ChatWidgetPrivate::telepathyComponentData()
{
KAboutData telepathySharedAboutData("ktelepathy",0,KLocalizedString(),0);
return KComponentData(telepathySharedAboutData);
}
-ChatWindow::ChatWindow(const Tp::TextChannelPtr & channel, QWidget *parent)
+ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, QWidget *parent)
: QWidget(parent),
- d(new ChatWindowPrivate)
+ d(new ChatWidgetPrivate)
{
d->channel = channel;
init();
}
-ChatWindow::~ChatWindow()
+ChatWidget::~ChatWidget()
{
delete d;
}
-void ChatWindow::init()
+void ChatWidget::init()
{
d->chatviewlInitialised = false;
d->showFormatToolbarAction = new QAction(i18n("Show format options"), this);
@@ -201,7 +201,7 @@ void ChatWindow::init()
}
-void ChatWindow::changeEvent(QEvent *e)
+void ChatWidget::changeEvent(QEvent *e)
{
QWidget::changeEvent(e);
switch (e->type()) {
@@ -214,12 +214,12 @@ void ChatWindow::changeEvent(QEvent *e)
}
-QString ChatWindow::title() const
+QString ChatWidget::title() const
{
return d->title;
}
-KIcon ChatWindow::icon() const
+KIcon ChatWidget::icon() const
{
//normal chat - self and one other person.
if (!d->isGroupChat) {
@@ -235,7 +235,7 @@ KIcon ChatWindow::icon() const
return iconForPresence(Tp::ConnectionPresenceTypeAvailable);
}
-void ChatWindow::handleIncomingMessage(const Tp::ReceivedMessage &message)
+void ChatWidget::handleIncomingMessage(const Tp::ReceivedMessage &message)
{
if (d->chatviewlInitialised) {
AdiumThemeContentInfo messageInfo(AdiumThemeMessageInfo::RemoteToLocal);
@@ -266,7 +266,7 @@ void ChatWindow::handleIncomingMessage(const Tp::ReceivedMessage &message)
//if the window isn't ready, we don't acknowledge the mesage. We process them as soon as we are ready.
}
-void ChatWindow::notifyAboutIncomingMessage(const Tp::ReceivedMessage & message)
+void ChatWidget::notifyAboutIncomingMessage(const Tp::ReceivedMessage & message)
{
//send the correct notification:
QString notificationType;
@@ -308,7 +308,7 @@ void ChatWindow::notifyAboutIncomingMessage(const Tp::ReceivedMessage & message)
notification->sendEvent();
}
-void ChatWindow::handleMessageSent(const Tp::Message &message, Tp::MessageSendingFlags, const QString&) /*Not sure what these other args are for*/
+void ChatWidget::handleMessageSent(const Tp::Message &message, Tp::MessageSendingFlags, const QString&) /*Not sure what these other args are for*/
{
AdiumThemeContentInfo messageInfo(AdiumThemeMessageInfo::LocalToRemote);
messageInfo.setMessage(message.text());
@@ -333,7 +333,7 @@ void ChatWindow::handleMessageSent(const Tp::Message &message, Tp::MessageSendin
notification->sendEvent();
}
-void ChatWindow::chatViewReady()
+void ChatWidget::chatViewReady()
{
d->chatviewlInitialised = true;
@@ -344,7 +344,7 @@ void ChatWindow::chatViewReady()
}
-void ChatWindow::sendMessage()
+void ChatWidget::sendMessage()
{
if (!d->ui.sendMessageBox->toPlainText().isEmpty()) {
d->channel->send(d->ui.sendMessageBox->toPlainText());
@@ -352,7 +352,7 @@ void ChatWindow::sendMessage()
}
}
-void ChatWindow::onChatStatusChanged(const Tp::ContactPtr & contact, Tp::ChannelChatState state)
+void ChatWidget::onChatStatusChanged(const Tp::ContactPtr & contact, Tp::ChannelChatState state)
{
//don't show our own status changes.
if (contact == d->channel->connection()->selfContact()) {
@@ -405,7 +405,7 @@ void ChatWindow::onChatStatusChanged(const Tp::ContactPtr & contact, Tp::Channel
-void ChatWindow::onContactPresenceChange(const Tp::ContactPtr & contact, const Tp::Presence & presence)
+void ChatWidget::onContactPresenceChange(const Tp::ContactPtr & contact, const Tp::Presence & presence)
{
QString message;
bool isYou = (contact == d->channel->groupSelfContact());
@@ -460,7 +460,7 @@ void ChatWindow::onContactPresenceChange(const Tp::ContactPtr & contact, const T
}
}
-void ChatWindow::onContactAliasChanged(const Tp::ContactPtr & contact, const QString& alias)
+void ChatWidget::onContactAliasChanged(const Tp::ContactPtr & contact, const QString& alias)
{
QString message;
bool isYou = (contact == d->channel->groupSelfContact());
@@ -488,7 +488,7 @@ void ChatWindow::onContactAliasChanged(const Tp::ContactPtr & contact, const QSt
}
}
-void ChatWindow::onInputBoxChanged()
+void ChatWidget::onInputBoxChanged()
{
//if the box is empty
bool currentlyTyping = !d->ui.sendMessageBox->toPlainText().isEmpty();
@@ -502,14 +502,14 @@ void ChatWindow::onInputBoxChanged()
}
}
-void ChatWindow::onFormatColorReleased()
+void ChatWidget::onFormatColorReleased()
{
QColor color;
KColorDialog::getColor(color,this);
d->ui.sendMessageBox->setTextColor(color);
}
-KIcon ChatWindow::iconForPresence(Tp::ConnectionPresenceType presence)
+KIcon ChatWidget::iconForPresence(Tp::ConnectionPresenceType presence)
{
QString iconName;
@@ -537,5 +537,5 @@ KIcon ChatWindow::iconForPresence(Tp::ConnectionPresenceType presence)
return KIcon(iconName);
}
-#include "chatwindow.moc" //for MessageBoxEventFilter
-#include "moc_chatwindow.cpp" //for ChatWindow
+#include "chatwidget.moc" //for MessageBoxEventFilter
+#include "moc_chatwidget.cpp" //for ChatWidget
diff --git a/lib/chatwindow.h b/lib/chatwidget.h
similarity index 93%
rename from lib/chatwindow.h
rename to lib/chatwidget.h
index 11bc023..62c6a0c 100644
--- a/lib/chatwindow.h
+++ b/lib/chatwidget.h
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#ifndef CHATWINDOW_H
-#define CHATWINDOW_H
+#ifndef CHATWIDGET_H
+#define CHATWIDGET_H
#include <QtCore/QString>
#include <QtGui/QWidget>
@@ -26,15 +26,15 @@
#include <TelepathyQt4/ReceivedMessage>
-class ChatWindowPrivate;
+class ChatWidgetPrivate;
-class ChatWindow : public QWidget
+class ChatWidget : public QWidget
{
Q_OBJECT
public:
- explicit ChatWindow(const Tp::TextChannelPtr & channel, QWidget *parent = 0);
- virtual ~ChatWindow();
+ explicit ChatWidget(const Tp::TextChannelPtr & channel, QWidget *parent = 0);
+ virtual ~ChatWidget();
/** Returns the name of this chat window*/
QString title() const;
@@ -91,7 +91,7 @@ private:
//FIXME this should be in the ktelepathy lib
static KIcon iconForPresence(Tp::ConnectionPresenceType presence);
- ChatWindowPrivate * const d;
+ ChatWidgetPrivate * const d;
};
-#endif // CHATWINDOW_H
+#endif // CHATWIDGET_H
diff --git a/lib/chatwindow.ui b/lib/chatwidget.ui
similarity index 98%
rename from lib/chatwindow.ui
rename to lib/chatwidget.ui
index cfe60fd..8d95066 100644
--- a/lib/chatwindow.ui
+++ b/lib/chatwidget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>ChatWindow</class>
- <widget class="QWidget" name="ChatWindow">
+ <class>ChatWidget</class>
+ <widget class="QWidget" name="ChatWidget">
<property name="geometry">
<rect>
<x>0</x>
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list