[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:16:15 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=ed4658c
The following commit has been merged in the master branch:
commit ed4658c0da663becddf02089f7ddec901a8c02f9
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Tue Aug 17 22:43:37 2010 +0000
reapplied KDE coding style
svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1164904
---
app/mainwindow.cpp | 6 +++---
config/mainwindow.cpp | 4 ++--
lib/chatview.cpp | 9 +++------
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 6e30673..19b7b34 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -30,15 +30,15 @@ inline ChannelClassList channelClassList()
filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
QDBusVariant((uint) Tp::HandleTypeContact));
filters.append(filter);
-
+
filter.clear();
filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT));
filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
QDBusVariant((uint) Tp::HandleTypeRoom));
filters.append(filter);
-
-
+
+
return filters;
}
diff --git a/config/mainwindow.cpp b/config/mainwindow.cpp
index 6d9afb2..a8fe437 100644
--- a/config/mainwindow.cpp
+++ b/config/mainwindow.cpp
@@ -32,8 +32,8 @@ MainWindow::MainWindow(QWidget *parent) :
ui->chatView->initialise(info);
connect(ui->chatView, SIGNAL(loadFinished(bool)), SLOT(sendDemoMessages()));
- connect(ui->styleComboBox,SIGNAL(activated(const QString&)),SLOT(onStyleSelected(QString)));
- connect(ui->variantComboBox,SIGNAL(activated(const QString&)),SLOT(onVariantSelected(const QString&)));
+ connect(ui->styleComboBox, SIGNAL(activated(const QString&)), SLOT(onStyleSelected(QString)));
+ connect(ui->variantComboBox, SIGNAL(activated(const QString&)), SLOT(onVariantSelected(const QString&)));
}
MainWindow::~MainWindow()
diff --git a/lib/chatview.cpp b/lib/chatview.cpp
index 1c6fa45..e720dac 100644
--- a/lib/chatview.cpp
+++ b/lib/chatview.cpp
@@ -48,7 +48,7 @@ ChatView::ChatView(QWidget *parent) :
KConfig config(KGlobal::dirs()->findResource("config", "kopeterc"));
KConfigGroup appearanceConfig = config.group("Appearance");
- QString chatStyleName = appearanceConfig.readEntry("styleName","Renkoo.AdiumMessageStyle");
+ QString chatStyleName = appearanceConfig.readEntry("styleName", "Renkoo.AdiumMessageStyle");
m_chatStyle = ChatWindowStyleManager::self()->getValidStyleFromPool(chatStyleName);
@@ -127,12 +127,9 @@ void ChatView::setChatStyle(ChatWindowStyle *chatStyle)
//load the first variant
QHash<QString, QString> variants = chatStyle->getVariants();
- if(variants.keys().length() > 0)
- {
+ if (variants.keys().length() > 0) {
m_variantPath = variants.values()[0];
- }
- else
- {
+ } else {
m_variantPath = "";
}
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list