[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=76bb4f7

The following commit has been merged in the master branch:
commit 76bb4f7a017133d9bf901546595f807e92f70cad
Author: Lasath Fernando <kde at lasath.org>
Date:   Sun Feb 13 11:48:43 2011 +1100

    Code style tidying
---
 haze/haze-icq-account.cpp          |  3 +-
 haze/haze-yahoo-account.cpp        | 22 ++++++------
 haze/icq-main-options-widget.h     |  4 +--
 haze/yahoo-main-options-widget.cpp | 69 +++++++++++++++++++-------------------
 haze/yahoo-main-options-widget.h   | 15 ++++-----
 5 files changed, 55 insertions(+), 58 deletions(-)

diff --git a/haze/haze-icq-account.cpp b/haze/haze-icq-account.cpp
index 2284388..5bc662a 100644
--- a/haze/haze-icq-account.cpp
+++ b/haze/haze-icq-account.cpp
@@ -41,8 +41,7 @@ public:
 };
 
 HazeIcqAccountUi::HazeIcqAccountUi(QObject *parent)
- : AbstractAccountUi(parent),
-   d(new Private)
+ : AbstractAccountUi(parent), d(new Private)
 {
     kDebug();
 
diff --git a/haze/haze-yahoo-account.cpp b/haze/haze-yahoo-account.cpp
index e8737ec..ac9d30c 100644
--- a/haze/haze-yahoo-account.cpp
+++ b/haze/haze-yahoo-account.cpp
@@ -30,7 +30,7 @@ public:
 };
 
 HazeYahooAccount::HazeYahooAccount(QObject* parent)
-  : AbstractAccountUi(parent), d(new Private)
+        : AbstractAccountUi(parent), d(new Private)
 {
     kDebug();
 
@@ -42,9 +42,8 @@ HazeYahooAccount::HazeYahooAccount(QObject* parent)
 
 HazeYahooAccount::~HazeYahooAccount()
 {
-  kDebug();
-  
-  delete d;
+    kDebug();
+    delete d;
 }
 
 bool HazeYahooAccount::hasAdvancedOptionsWidget() const
@@ -52,15 +51,16 @@ bool HazeYahooAccount::hasAdvancedOptionsWidget() const
     return false;
 }
 
-AbstractAccountParametersWidget* HazeYahooAccount::mainOptionsWidget(ParameterEditModel* model, QWidget* parent) const
+AbstractAccountParametersWidget* HazeYahooAccount::mainOptionsWidget(
+	ParameterEditModel* model,
+	QWidget* parent) const
 {
-  return new YahooMainOptionsWidget(model,parent);
+    return new YahooMainOptionsWidget(model,parent);
 }
 
-AbstractAccountParametersWidget* HazeYahooAccount::advancedOptionsWidget(ParameterEditModel* model, QWidget* parent) const
+AbstractAccountParametersWidget* HazeYahooAccount::advancedOptionsWidget(
+	ParameterEditModel* model, 
+	QWidget* parent) const
 {
-//     return AbstractAccountUi::advancedOptionsWidget(model, parent);
-  return NULL;
-//   return new YahooMainOptionsWidget(model,parent);
-
+    return NULL;
 }
diff --git a/haze/icq-main-options-widget.h b/haze/icq-main-options-widget.h
index f42c689..ffe340b 100644
--- a/haze/icq-main-options-widget.h
+++ b/haze/icq-main-options-widget.h
@@ -28,12 +28,10 @@
 class IcqMainOptionsWidget : public AbstractAccountParametersWidget
 {
     Q_OBJECT
-
 public:
     explicit IcqMainOptionsWidget(ParameterEditModel *model,
-                               QWidget *parent = 0);
+                                  QWidget *parent = 0);
     virtual ~IcqMainOptionsWidget();
-
 private:
     Q_DISABLE_COPY(IcqMainOptionsWidget);
 
diff --git a/haze/yahoo-main-options-widget.cpp b/haze/yahoo-main-options-widget.cpp
index 637697e..1b40140 100644
--- a/haze/yahoo-main-options-widget.cpp
+++ b/haze/yahoo-main-options-widget.cpp
@@ -1,20 +1,22 @@
 /*
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ * This file is part of telepathy-accounts-kcm
+ *
+ * Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 
 #include "yahoo-main-options-widget.h"
@@ -24,34 +26,33 @@
 class YahooMainOptionsWidget::Private
 {
 public:
-  
-  Ui::YahooMainOptionsWidget* ui;
-  
+    Ui::YahooMainOptionsWidget* ui;
+
     Private()
-      : ui(0)
+	: ui(0)
     {
         kDebug();
     }
 };
 
 YahooMainOptionsWidget::YahooMainOptionsWidget(ParameterEditModel* model, QWidget* parent)
-  : AbstractAccountParametersWidget(model, parent), d(new Private)
+        : AbstractAccountParametersWidget(model, parent), d(new Private)
 {
-  kDebug();
-  
-  //setup the Ui
-  d->ui = new Ui::YahooMainOptionsWidget;
-  d->ui->setupUi(this);
-  
-  //map the widgets to their data
-  handleParameter("account", QVariant::String, d->ui->accountLineEdit, d->ui->accountLabel);
-  handleParameter("password", QVariant::String, d->ui->passwordLineEdit, d->ui->passwordLabel);
+    kDebug();
+
+    //setup the Ui
+    d->ui = new Ui::YahooMainOptionsWidget;
+    d->ui->setupUi(this);
+
+    //map the widgets to their data
+    handleParameter("account", QVariant::String, d->ui->accountLineEdit, d->ui->accountLabel);
+    handleParameter("password", QVariant::String, d->ui->passwordLineEdit, d->ui->passwordLabel);
 }
 
 YahooMainOptionsWidget::~YahooMainOptionsWidget()
 {
-  kDebug();
-  
-  delete d->ui;
-  delete d;
+    kDebug();
+
+    delete d->ui;
+    delete d;
 }
diff --git a/haze/yahoo-main-options-widget.h b/haze/yahoo-main-options-widget.h
index 39618f9..5cde313 100644
--- a/haze/yahoo-main-options-widget.h
+++ b/haze/yahoo-main-options-widget.h
@@ -25,18 +25,17 @@
 #include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
 
 class YahooMainOptionsWidget
-  : public AbstractAccountParametersWidget
+            : public AbstractAccountParametersWidget
 {
-  Q_OBJECT
-  
-  public:
+    Q_OBJECT
+
+public:
     YahooMainOptionsWidget(ParameterEditModel* model, QWidget* parent = 0);
     virtual ~YahooMainOptionsWidget();
-    
 private:
-  Q_DISABLE_COPY(YahooMainOptionsWidget);
-  
-  class Private;
+    Q_DISABLE_COPY(YahooMainOptionsWidget);
+
+    class Private;
     Private * const d;
 };
 

-- 
ktp-accounts-kcm packaging