[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=89fe2c5

The following commit has been merged in the master branch:
commit 89fe2c54700467deeaa2ea968e10f6143948dce7
Author: Lasath Fernando <kde at lasath.org>
Date:   Sun Feb 20 00:29:39 2011 +1100

    minor fixes according to review
---
 haze/haze-yahoo-account.cpp           | 5 ++---
 haze/yahoo-main-options-widget.cpp    | 6 ++----
 haze/yahoo-server-settings-widget.cpp | 1 -
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/haze/haze-yahoo-account.cpp b/haze/haze-yahoo-account.cpp
index d4d1250..8841c59 100644
--- a/haze/haze-yahoo-account.cpp
+++ b/haze/haze-yahoo-account.cpp
@@ -23,6 +23,7 @@
 
 #include <KDebug>
 #include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
+#include <KLocalizedString>
 
 HazeYahooAccount::HazeYahooAccount(QObject* parent)
         : AbstractAccountUi(parent)
@@ -32,11 +33,9 @@ HazeYahooAccount::HazeYahooAccount(QObject* parent)
     //register that all options are supported
     registerSupportedParameter("account", QVariant::String);
     registerSupportedParameter("password", QVariant::String);
-    
     registerSupportedParameter("port", QVariant::UInt);
     registerSupportedParameter("xfer-host", QVariant::String);
     registerSupportedParameter("xfer-port", QVariant::UInt);
-    
     registerSupportedParameter("room-list-locale", QVariant::String);
     registerSupportedParameter("charset", QVariant::String);
     registerSupportedParameter("proxy-ssl", QVariant::Bool);
@@ -66,6 +65,6 @@ AbstractAccountParametersWidget* HazeYahooAccount::advancedOptionsWidget(
 {
     GenericAdvancedOptionsWidget *advancedOptionsWidget = new GenericAdvancedOptionsWidget(model, parent);
     AbstractAccountParametersWidget* yahooserversettings = new YahooServerSettingsWidget(model, parent);
-    advancedOptionsWidget->addTab(yahooserversettings, "Advanced");
+    advancedOptionsWidget->addTab(yahooserversettings, i18n("Advanced"));
     return advancedOptionsWidget;
 }
diff --git a/haze/yahoo-main-options-widget.cpp b/haze/yahoo-main-options-widget.cpp
index 8b171bd..8beec3c 100644
--- a/haze/yahoo-main-options-widget.cpp
+++ b/haze/yahoo-main-options-widget.cpp
@@ -21,16 +21,14 @@
 #include "yahoo-main-options-widget.h"
 
 #include <KDebug>
-#include <KCMTelepathyAccounts/parameter-edit-model.h>
+#include <KCMTelepathyAccounts/ParameterEditModel>
 
 YahooMainOptionsWidget::YahooMainOptionsWidget(ParameterEditModel* model, QWidget* parent)
         : AbstractAccountParametersWidget(model, parent)
 {
     kDebug();
-    
     kDebug() << "Creating Yahoo Account";
-    
-    foreach (Tp::ProtocolParameter param, model->parameters()) {
+    foreach (const Tp::ProtocolParameter &param, model->parameters()) {
         kDebug() << "Found parameter: " << param.name() << param.type() << param.defaultValue();
     }
 
diff --git a/haze/yahoo-server-settings-widget.cpp b/haze/yahoo-server-settings-widget.cpp
index 710704b..3286cff 100644
--- a/haze/yahoo-server-settings-widget.cpp
+++ b/haze/yahoo-server-settings-widget.cpp
@@ -31,7 +31,6 @@ YahooServerSettingsWidget::YahooServerSettingsWidget(ParameterEditModel *model,
     // Set up the UI.
     m_ui = new Ui::YahooServerSettingsWidget;
     m_ui->setupUi(this);
-    
     //server
     handleParameter("port", QVariant::UInt, m_ui->serverPort, m_ui->serverPortLabel);
     //file transfer

-- 
ktp-accounts-kcm packaging