[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:19:15 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=f910e8b
The following commit has been merged in the master branch:
commit f910e8b292758f72da4416529ff2f332f73b2731
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Mon Apr 4 00:33:22 2011 +0100
Code tidying
---
config/main-window.cpp | 1 +
lib/adium-theme-header-info.h | 14 +++++++-------
lib/adium-theme-view.cpp | 2 +-
lib/adium-theme-view.h | 11 +++++------
lib/chat-search-bar.h | 4 ++--
lib/chat-widget.h | 19 ++++++++++---------
lib/chat-window-style-manager.h | 2 +-
lib/chat-window-style.h | 2 +-
8 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/config/main-window.cpp b/config/main-window.cpp
index bb0b274..3a79da4 100644
--- a/config/main-window.cpp
+++ b/config/main-window.cpp
@@ -21,6 +21,7 @@
#include "ui_chatwindowconfig.h"
#include <KDETelepathy/ChatWindowStyleManager>
+#include <KDETelepathy/ChatWindowStyle>
#include <KDETelepathy/AdiumThemeHeaderInfo>
#include <KDETelepathy/AdiumThemeContentInfo>
#include <KDETelepathy/AdiumThemeStatusInfo>
diff --git a/lib/adium-theme-header-info.h b/lib/adium-theme-header-info.h
index c15add9..e0d8dd2 100644
--- a/lib/adium-theme-header-info.h
+++ b/lib/adium-theme-header-info.h
@@ -41,19 +41,19 @@ public:
/** 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;
- void setChatName(const QString& chatName);
+ void setChatName(const QString &chatName);
/** The name of the source account for this chat. (i.e MSN)*/
QString sourceName() const;
- void setSourceName(const QString& sourceName);
+ void setSourceName(const QString &sourceName);
/** The name of the chat's destination.*/
QString destinationName() const;
- void setDestinationName(const QString& destinationName);
+ void setDestinationName(const QString &destinationName);
/** The serverside (remotely set) name of the chat's destination, such as an MSN display name. */
QString destinationDisplayName() const;
- void setDestinationDisplayName(const QString& destinationDisplayName);
+ void setDestinationDisplayName(const QString &destinationDisplayName);
//FIXME this documentation should say (optional) - then the handing of not setting it
//should be handled in the getter method - or even the constructor.
@@ -61,17 +61,17 @@ public:
* or this is a group chat so no image is appropriate, this tag will be replaced by
* incoming_icon.png, so you should have that file available if this tag is used. */
QUrl incomingIconPath() const;
- void setIncomingIconPath(const QUrl& incomingIconPath);
+ void setIncomingIconPath(const QUrl &incomingIconPath);
/** A full path to the image for the local user. If the local user does not have an image
* this tag will be replaced by outgoing_icon.png, so you should have that file available
* if this tag is used. */
QUrl outgoingIconPath() const;
- void setOutgoingIconPath(const QUrl& outgoingIconPath);
+ void setOutgoingIconPath(const QUrl &outgoingIconPath);
/** The time at which the chat was opened. */
QDateTime timeOpened() const;
- void setTimeOpened(const QDateTime& timeOpened);
+ void setTimeOpened(const QDateTime &timeOpened);
private:
AdiumThemeHeaderInfoPrivate* const d;
diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 3cd889f..0b8a7db 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -23,8 +23,8 @@
#include "adium-theme-content-info.h"
#include "adium-theme-message-info.h"
#include "adium-theme-status-info.h"
-
#include "chat-window-style-manager.h"
+#include "chat-window-style.h"
#include <QtCore/QFile>
#include <QtCore/QTextCodec>
diff --git a/lib/adium-theme-view.h b/lib/adium-theme-view.h
index 2a54794..d7c6cb2 100644
--- a/lib/adium-theme-view.h
+++ b/lib/adium-theme-view.h
@@ -20,9 +20,10 @@
#ifndef ADIUMTHEMEVIEW_H
#define ADIUMTHEMEVIEW_H
-#include "chat-window-style.h"
-#include "adium-theme-header-info.h"
#include <QtWebKit/QWebView>
+
+#include "adium-theme-header-info.h"
+
#include <KEmoticons>
#include "kdetelepathychat_export.h"
@@ -31,6 +32,7 @@ class AdiumThemeContentInfo;
class AdiumThemeHeaderInfo;
class AdiumThemeMessageInfo;
class AdiumThemeStatusInfo;
+class ChatWindowStyle;
class KDE_TELEPATHY_CHAT_EXPORT AdiumThemeView : public QWebView
{
@@ -39,14 +41,11 @@ public:
explicit AdiumThemeView(QWidget *parent = 0);
void initialise(const AdiumThemeHeaderInfo&);
- //override various parts loaded from the config file.
- //note that the following will clear the contents of the chat window.
-
const QString variantPath() const;
const QString variantName() const;
void setVariant(const QString& variant);
-
ChatWindowStyle *chatStyle() const;
+
/** Set the theme to use. Display will only change once initialise() is called.*/
void setChatStyle(ChatWindowStyle* chatStyle);
void setUseCustomFont(bool);
diff --git a/lib/chat-search-bar.h b/lib/chat-search-bar.h
index 796280f..00fcaa6 100644
--- a/lib/chat-search-bar.h
+++ b/lib/chat-search-bar.h
@@ -22,8 +22,8 @@
#include "kdetelepathychat_export.h"
-#include <QWebPage>
-#include <QWidget>
+#include <QtWebKit/QWebPage>
+#include <QtGui/QWidget>
class KLineEdit;
class KPushButton;
diff --git a/lib/chat-widget.h b/lib/chat-widget.h
index 3973326..eba76aa 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -24,7 +24,8 @@
#include <QtCore/QString>
#include <QtGui/QWidget>
-#include <QWebPage>
+#include <QtWebKit/QWebPage>
+
#include <KIcon>
#include <KColorScheme>
@@ -70,24 +71,24 @@ protected:
protected slots:
/** Show the received message in the chat window*/
- void handleIncomingMessage(const Tp::ReceivedMessage & message);
+ void handleIncomingMessage(const Tp::ReceivedMessage &message);
/** Show notification about a received message */
- void notifyAboutIncomingMessage(const Tp::ReceivedMessage & message);
+ void notifyAboutIncomingMessage(const Tp::ReceivedMessage &message);
/** Show the message sent in the chat window*/
- void handleMessageSent(const Tp::Message & message,
+ void handleMessageSent(const Tp::Message &message,
Tp::MessageSendingFlags flags,
- const QString & sentMessageToken);
+ const QString &sentMessageToken);
/** send the text in the text area widget to the client handler*/
void sendMessage();
void onChatStatusChanged(const Tp::ContactPtr & contact, Tp::ChannelChatState state);
- void onContactPresenceChange(const Tp::ContactPtr & contact, const Tp::Presence & presence);
+ void onContactPresenceChange(const Tp::ContactPtr & contact, const Tp::Presence &presence);
- void onContactAliasChanged(const Tp::ContactPtr & contact, const QString & alias);
+ void onContactAliasChanged(const Tp::ContactPtr & contact, const QString &alias);
void onInputBoxChanged();
@@ -95,10 +96,10 @@ protected slots:
signals:
/** Emitted whenever the title for the chat changes, normally the name of the contact or a topic*/
- void titleChanged(const QString & title);
+ void titleChanged(const QString &title);
/** Emmitted if the icon for this channel changes*/
- void iconChanged(const KIcon & icon);
+ void iconChanged(const KIcon &icon);
/** Emmited whenever a message is received in this channel*/
void messageReceived();
diff --git a/lib/chat-window-style-manager.h b/lib/chat-window-style-manager.h
index b07b4c2..21efa90 100644
--- a/lib/chat-window-style-manager.h
+++ b/lib/chat-window-style-manager.h
@@ -61,7 +61,7 @@ public:
/**
* Destructor.
*/
- ~ChatWindowStyleManager();
+ virtual ~ChatWindowStyleManager();
/**
* Singleton access to this class.
diff --git a/lib/chat-window-style.h b/lib/chat-window-style.h
index 41a0c15..32fe4fd 100644
--- a/lib/chat-window-style.h
+++ b/lib/chat-window-style.h
@@ -52,7 +52,7 @@ public:
explicit ChatWindowStyle(const QString &styleId, StyleBuildMode styleBuildMode = StyleBuildNormal);
ChatWindowStyle(const QString &styleId, const QString &variantPath,
StyleBuildMode styleBuildMode = StyleBuildFast);
- ~ChatWindowStyle();
+ virtual ~ChatWindowStyle();
/**
* Checks if the style is valid
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list