[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:17:53 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=64d2d22
The following commit has been merged in the master branch:
commit 64d2d2211bf4e0d272fa12119eb939bae1da010e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Wed Sep 22 16:21:52 2010 +0000
Rename TelepathyChatInfo to AdiumThemeHeaderInfo as it has nothing to do
with telepathy in it.
svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1178285
---
config/mainwindow.cpp | 4 +--
lib/CMakeLists.txt | 2 +-
...epathychatinfo.cpp => adiumthemeheaderinfo.cpp} | 38 +++++++++++-----------
...{telepathychatinfo.h => adiumthemeheaderinfo.h} | 10 +++---
lib/adiumthemeview.cpp | 4 +--
lib/adiumthemeview.h | 8 ++---
lib/chatwindow.cpp | 4 +--
7 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/config/mainwindow.cpp b/config/mainwindow.cpp
index 2f50e1c..d81c853 100644
--- a/config/mainwindow.cpp
+++ b/config/mainwindow.cpp
@@ -2,7 +2,7 @@
#include "ui_chatwindowconfig.h"
#include "chatwindowstylemanager.h"
-#include "telepathychatinfo.h"
+#include "adiumthemeheaderinfo.h"
#include "telepathychatmessageinfo.h"
#include <QDebug>
@@ -19,7 +19,7 @@ MainWindow::MainWindow(QWidget *parent) :
connect(manager, SIGNAL(loadStylesFinished()), SLOT(onStylesLoaded()));
//set up a pretend config chat.
- TelepathyChatInfo info;
+ AdiumThemeHeaderInfo info;
info.setChatName("A demo chat");
info.setSourceName("Jabber");
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 77a0ae1..338ddd8 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -5,7 +5,7 @@ set(telepathy_chat_handler_lib_SRCS
chatwindowstylemanager.cpp
adiumthemeview.cpp
telepathychatmessageinfo.cpp
- telepathychatinfo.cpp
+ adiumthemeheaderinfo.cpp
channelcontactlist.cpp
chatstyleplistfilereader.cpp
)
diff --git a/lib/telepathychatinfo.cpp b/lib/adiumthemeheaderinfo.cpp
similarity index 66%
rename from lib/telepathychatinfo.cpp
rename to lib/adiumthemeheaderinfo.cpp
index bf33657..5a51f71 100644
--- a/lib/telepathychatinfo.cpp
+++ b/lib/adiumthemeheaderinfo.cpp
@@ -17,11 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#include "telepathychatinfo.h"
+#include "adiumthemeheaderinfo.h"
//FIXME HTML escaping is maybe needed.
-class TelepathyChatInfoPrivate
+class AdiumThemeHeaderInfoPrivate
{
public:
QString chatName;
@@ -33,80 +33,80 @@ public:
QDateTime timeOpened;
};
-TelepathyChatInfo::TelepathyChatInfo()
- : d(new TelepathyChatInfoPrivate)
+AdiumThemeHeaderInfo::AdiumThemeHeaderInfo()
+ : d(new AdiumThemeHeaderInfoPrivate)
{
}
-TelepathyChatInfo::~TelepathyChatInfo()
+AdiumThemeHeaderInfo::~AdiumThemeHeaderInfo()
{
delete d;
}
-QString TelepathyChatInfo::chatName() const
+QString AdiumThemeHeaderInfo::chatName() const
{
return d->chatName;
};
-void TelepathyChatInfo::setChatName(const QString& chatName)
+void AdiumThemeHeaderInfo::setChatName(const QString& chatName)
{
d->chatName = chatName;
};
-QString TelepathyChatInfo::sourceName() const
+QString AdiumThemeHeaderInfo::sourceName() const
{
return d->sourceName;
};
-void TelepathyChatInfo::setSourceName(const QString& sourceName)
+void AdiumThemeHeaderInfo::setSourceName(const QString& sourceName)
{
d->sourceName = sourceName;
};
-QString TelepathyChatInfo::destinationName() const
+QString AdiumThemeHeaderInfo::destinationName() const
{
return d->destinationName;
}
-void TelepathyChatInfo::setDestinationName(const QString& destinationName)
+void AdiumThemeHeaderInfo::setDestinationName(const QString& destinationName)
{
d->destinationName = destinationName;
};
-QString TelepathyChatInfo::destinationDisplayName() const
+QString AdiumThemeHeaderInfo::destinationDisplayName() const
{
return d->destinationDisplayName;
}
-void TelepathyChatInfo::setDestinationDisplayName(const QString& destinationDisplayName)
+void AdiumThemeHeaderInfo::setDestinationDisplayName(const QString& destinationDisplayName)
{
d->destinationDisplayName = destinationDisplayName;
}
-QUrl TelepathyChatInfo::incomingIconPath() const
+QUrl AdiumThemeHeaderInfo::incomingIconPath() const
{
return d->incomingIconPath;
};
-void TelepathyChatInfo::setIncomingIconPath(const QUrl& incomingIconPath)
+void AdiumThemeHeaderInfo::setIncomingIconPath(const QUrl& incomingIconPath)
{
d->incomingIconPath = incomingIconPath;
};
-QUrl TelepathyChatInfo::outgoingIconPath() const
+QUrl AdiumThemeHeaderInfo::outgoingIconPath() const
{
return d->outgoingIconPath;
};
-void TelepathyChatInfo::setOutgoingIconPath(const QUrl& outgoingIconPath)
+void AdiumThemeHeaderInfo::setOutgoingIconPath(const QUrl& outgoingIconPath)
{
d->outgoingIconPath = outgoingIconPath;
};
-QDateTime TelepathyChatInfo::timeOpened() const
+QDateTime AdiumThemeHeaderInfo::timeOpened() const
{
return d->timeOpened;
};
-void TelepathyChatInfo::setTimeOpened(const QDateTime& timeOpened)
+void AdiumThemeHeaderInfo::setTimeOpened(const QDateTime& timeOpened)
{
d->timeOpened = timeOpened;
};
diff --git a/lib/telepathychatinfo.h b/lib/adiumthemeheaderinfo.h
similarity index 95%
rename from lib/telepathychatinfo.h
rename to lib/adiumthemeheaderinfo.h
index 1a3ba04..bf007da 100644
--- a/lib/telepathychatinfo.h
+++ b/lib/adiumthemeheaderinfo.h
@@ -26,13 +26,13 @@
/** Containts all the information needed for the header generation from the Adium/Kopete templates */
-class TelepathyChatInfoPrivate;
+class AdiumThemeHeaderInfoPrivate;
-class TelepathyChatInfo
+class AdiumThemeHeaderInfo
{
public:
- TelepathyChatInfo();
- ~TelepathyChatInfo();
+ AdiumThemeHeaderInfo();
+ ~AdiumThemeHeaderInfo();
/** A name for the chat. For a one-on-one chat, this will be the display name of the remote user. For a group chat, it is the group chat name or topic, as appropriate. */
QString chatName() const;
@@ -64,7 +64,7 @@ public:
void setTimeOpened(const QDateTime& timeOpened);
private:
- TelepathyChatInfoPrivate* const d;
+ AdiumThemeHeaderInfoPrivate* const d;
};
diff --git a/lib/adiumthemeview.cpp b/lib/adiumthemeview.cpp
index 80c89c6..663bcac 100644
--- a/lib/adiumthemeview.cpp
+++ b/lib/adiumthemeview.cpp
@@ -68,7 +68,7 @@ AdiumThemeView::AdiumThemeView(QWidget *parent) :
m_webInspector = appearanceConfig.readEntry("debug", false);
}
-void AdiumThemeView::initialise(const TelepathyChatInfo &chatInfo)
+void AdiumThemeView::initialise(const AdiumThemeHeaderInfo &chatInfo)
{
QString templateHtml;
QString templateFileName(KGlobal::dirs()->findResource("data", "ktelepathy/template.html"));
@@ -258,7 +258,7 @@ void AdiumThemeView::addMessage(const TelepathyChatMessageInfo &message)
}
-QString AdiumThemeView::replaceHeaderKeywords(QString htmlTemplate, const TelepathyChatInfo & info)
+QString AdiumThemeView::replaceHeaderKeywords(QString htmlTemplate, const AdiumThemeHeaderInfo & info)
{
htmlTemplate.replace("%chatName%", info.chatName());
htmlTemplate.replace("%sourceName%", info.sourceName());
diff --git a/lib/adiumthemeview.h b/lib/adiumthemeview.h
index d01dfca..8d172e8 100644
--- a/lib/adiumthemeview.h
+++ b/lib/adiumthemeview.h
@@ -23,7 +23,7 @@
#include <QWebView>
#include "chatwindowstyle.h"
#include "telepathychatmessageinfo.h"
-#include "telepathychatinfo.h"
+#include "adiumthemeheaderinfo.h"
#include <KEmoticons>
@@ -33,7 +33,7 @@ class AdiumThemeView : public QWebView
Q_OBJECT
public:
explicit AdiumThemeView(QWidget *parent = 0);
- void initialise(const TelepathyChatInfo&);
+ void initialise(const AdiumThemeHeaderInfo&);
//override various parts loaded from the config file.
//note that the following will clear the contents of the chat window.
@@ -58,12 +58,12 @@ private:
QString m_variantPath;
QString m_variantName;
KEmoticons m_emoticons;
- QString replaceHeaderKeywords(QString htmlTemplate, const TelepathyChatInfo&);
+ QString replaceHeaderKeywords(QString htmlTemplate, const AdiumThemeHeaderInfo&);
//QString replaceMessageKeywords(QString htmlTemplate, const TelepathyChatMessageInfo&);
QString formatTime(const QString&, const QDateTime&);
- TelepathyChatInfo m_chatInfo;
+ AdiumThemeHeaderInfo m_chatInfo;
QString m_lastSender;
bool m_displayHeader;
diff --git a/lib/chatwindow.cpp b/lib/chatwindow.cpp
index 67cd48a..0363eb9 100644
--- a/lib/chatwindow.cpp
+++ b/lib/chatwindow.cpp
@@ -20,7 +20,7 @@
#include "chatwindow.h"
#include "ui_chatwindow.h"
#include "telepathychatmessageinfo.h"
-#include "telepathychatinfo.h"
+#include "adiumthemeheaderinfo.h"
#include "channelcontactlist.h"
#include <QKeyEvent>
@@ -215,7 +215,7 @@ void ChatWindow::updateEnabledState(bool enable)
//set up the initial chat window details.
if (enable) {
- TelepathyChatInfo info;
+ AdiumThemeHeaderInfo info;
Tp::Contacts allContacts = m_chatConnection->channel()->groupContacts();
//normal chat - self and one other person.
if (allContacts.size() == 2) {
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list