[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=5253391

The following commit has been merged in the master branch:
commit 52533917f1eca426262cf55105c03a0b8c9f2e2f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Sep 19 18:43:16 2010 +0000

    whitespace updating
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1177205
---
 app/main.cpp                     |  2 +-
 app/mainwindow.cpp               |  2 +-
 config/main.cpp                  |  2 +-
 config/mainwindow.cpp            | 10 ++++------
 lib/chatstyleplistfilereader.cpp |  5 ++---
 lib/chatwindowstyle.cpp          | 17 ++++++++---------
 lib/chatwindowstylemanager.cpp   |  3 +--
 7 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/app/main.cpp b/app/main.cpp
index fc39886..698173c 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
                          ki18n("Telepathy Chat Handler"),
                          "0.1");
 
-    KCmdLineArgs::init( argc, argv, &aboutData );
+    KCmdLineArgs::init(argc, argv, &aboutData);
     KApplication app;
 
     registerTypes();
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 532f9fa..af8d40e 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -60,7 +60,7 @@ void MainWindow::handleChannels(const MethodInvocationContextPtr<> &context,
 
     connect(newWindow, SIGNAL(titleChanged(QString)), SLOT(updateTabText(QString)));
     addTab(newWindow, "");
-    resize(newWindow->sizeHint() - QSize(50,50));// FUDGE
+    resize(newWindow->sizeHint() - QSize(50, 50));// FUDGE
 
     context->setFinished();
 }
diff --git a/config/main.cpp b/config/main.cpp
index 179267d..a885ea8 100644
--- a/config/main.cpp
+++ b/config/main.cpp
@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
                          ki18n("Telepathy Chat Window Config"),
                          "0.1");
 
-    KCmdLineArgs::init( argc, argv, &aboutData );
+    KCmdLineArgs::init(argc, argv, &aboutData);
 
     KApplication app;
 
diff --git a/config/mainwindow.cpp b/config/mainwindow.cpp
index 8e13bb5..781edf1 100644
--- a/config/mainwindow.cpp
+++ b/config/mainwindow.cpp
@@ -15,7 +15,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->setupUi(this);
 
     ChatWindowStyleManager* manager = ChatWindowStyleManager::self();
-   // manager->loadStyles();
+    // manager->loadStyles();
     connect(manager, SIGNAL(loadStylesFinished()), SLOT(onStylesLoaded()));
 
     //set up a pretend config chat.
@@ -34,7 +34,7 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(ui->chatView, SIGNAL(loadFinished(bool)), SLOT(sendDemoMessages()));
     connect(ui->styleComboBox, SIGNAL(activated(int)), SLOT(onStyleSelected(int)));
     connect(ui->variantComboBox, SIGNAL(activated(QString)), SLOT(onVariantSelected(QString)));
-    connect(ui->showHeader,SIGNAL(clicked(bool)), SLOT(onShowHeaderChanged(bool)));
+    connect(ui->showHeader, SIGNAL(clicked(bool)), SLOT(onShowHeaderChanged(bool)));
 }
 
 MainWindow::~MainWindow()
@@ -66,8 +66,7 @@ void MainWindow::onStylesLoaded()
     while (i != styles.constEnd()) {
         ui->styleComboBox->addItem(i.value(), i.key());
 
-        if(i.key() == currentStyle->getStyleName())
-        {
+        if (i.key() == currentStyle->getStyleName()) {
             ui->styleComboBox->setCurrentItem(i.value());
         }
 
@@ -102,8 +101,7 @@ void MainWindow::onStyleSelected(int index)
 
     ChatWindowStyle* style = ChatWindowStyleManager::self()->getValidStyleFromPool(styleId);
 
-    if (style)
-    {
+    if (style) {
         ui->chatView->setChatStyle(style);
         updateVariantsList();
         ui->showHeader->setEnabled(style->hasHeader());
diff --git a/lib/chatstyleplistfilereader.cpp b/lib/chatstyleplistfilereader.cpp
index 5e77f30..4c7b7ac 100644
--- a/lib/chatstyleplistfilereader.cpp
+++ b/lib/chatstyleplistfilereader.cpp
@@ -35,10 +35,9 @@ void ChatStylePlistFileReader::readFile(QString &fileName)
     QFile file(fileName);
 
     QDomDocument document = QDomDocument();
-    if (!file.open(QIODevice::ReadOnly))
-    {
+    if (!file.open(QIODevice::ReadOnly)) {
         return;
-    }if (!document.setContent(&file)) {
+    } if (!document.setContent(&file)) {
         file.close();
         return;
     }
diff --git a/lib/chatwindowstyle.cpp b/lib/chatwindowstyle.cpp
index b3a091c..3c21ef1 100644
--- a/lib/chatwindowstyle.cpp
+++ b/lib/chatwindowstyle.cpp
@@ -132,7 +132,7 @@ QString ChatWindowStyle::getStyleBaseHref() const
 
 bool ChatWindowStyle::hasHeader() const
 {
-   return ! d->headerHtml.isEmpty();
+    return ! d->headerHtml.isEmpty();
 }
 
 QString ChatWindowStyle::getTemplateHtml() const
@@ -271,8 +271,7 @@ void ChatWindowStyle::readStyleFiles()
     QFile fileAccess;
 
     //Load template file
-    if (QFile::exists(templateFile))
-    {
+    if (QFile::exists(templateFile)) {
         fileAccess.setFileName(templateFile);
         fileAccess.open(QIODevice::ReadOnly);
         QTextStream headerStream(&fileAccess);
@@ -318,8 +317,8 @@ void ChatWindowStyle::readStyleFiles()
         fileAccess.close();
     }
 
-    if(d->nextIncomingHtml.isEmpty()) {
-      d->nextIncomingHtml = d->incomingHtml;
+    if (d->nextIncomingHtml.isEmpty()) {
+        d->nextIncomingHtml = d->incomingHtml;
     }
 
 
@@ -333,8 +332,8 @@ void ChatWindowStyle::readStyleFiles()
         fileAccess.close();
     }
 
-    if(d->outgoingHtml.isEmpty()) {
-      d->outgoingHtml = d->incomingHtml;
+    if (d->outgoingHtml.isEmpty()) {
+        d->outgoingHtml = d->incomingHtml;
     }
 
     // Load next outgoing file
@@ -347,8 +346,8 @@ void ChatWindowStyle::readStyleFiles()
         fileAccess.close();
     }
 
-    if(d->nextOutgoingHtml.isEmpty()) {
-      d->nextOutgoingHtml = d->outgoingHtml;
+    if (d->nextOutgoingHtml.isEmpty()) {
+        d->nextOutgoingHtml = d->outgoingHtml;
     }
 
     // Load status file
diff --git a/lib/chatwindowstylemanager.cpp b/lib/chatwindowstylemanager.cpp
index 3592efa..4ff98fc 100644
--- a/lib/chatwindowstylemanager.cpp
+++ b/lib/chatwindowstylemanager.cpp
@@ -352,8 +352,7 @@ void ChatWindowStyleManager::slotNewStyles(const KFileItemList &dirList)
                 d->stylePool[styleId]->reload();
 
                 // Add to available if required.
-                if (! d->availableStyles.contains(styleId))
-                {
+                if (! d->availableStyles.contains(styleId)) {
 
                     //FIXME this code is in two places.. this sucks!!!
                     ChatStylePlistFileReader plistReader(item.url().path().append("/Contents/Info.plist"));

-- 
ktp-text-ui packaging