[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=6d5f77d

The following commit has been merged in the master branch:
commit 6d5f77d63f90e9d5e7929212ec1974aedf531547
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Aug 6 13:10:51 2014 +0200

    Change KLocale includes to KLocalizedString as that's what it's used for
---
 src/KCMTelepathyAccounts/account-edit-widget.cpp             | 2 +-
 src/KCMTelepathyAccounts/dictionary.cpp                      | 2 +-
 src/KCMTelepathyAccounts/feedback-widget.cpp                 | 2 +-
 src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp | 2 +-
 src/KCMTelepathyAccounts/parameter-edit-model.cpp            | 2 +-
 src/KCMTelepathyAccounts/validated-line-edit.cpp             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index cc76933..4998a14 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -30,7 +30,7 @@
 #include "dictionary.h"
 #include "feedback-widget.h"
 
-#include <KLocale>
+#include <KLocalizedString>
 #include <KMessageWidget>
 
 #include <TelepathyQt/Profile>
diff --git a/src/KCMTelepathyAccounts/dictionary.cpp b/src/KCMTelepathyAccounts/dictionary.cpp
index 2a00179..2dab8a1 100644
--- a/src/KCMTelepathyAccounts/dictionary.cpp
+++ b/src/KCMTelepathyAccounts/dictionary.cpp
@@ -20,7 +20,7 @@
 
 #include "dictionary.h"
 
-#include <KLocale>
+#include <KLocalizedString>
 
 Dictionary* Dictionary::s_self = 0;
 
diff --git a/src/KCMTelepathyAccounts/feedback-widget.cpp b/src/KCMTelepathyAccounts/feedback-widget.cpp
index d602207..525ca8c 100644
--- a/src/KCMTelepathyAccounts/feedback-widget.cpp
+++ b/src/KCMTelepathyAccounts/feedback-widget.cpp
@@ -23,8 +23,8 @@
 
 #include "feedback-widget.h"
 
-#include <KLocale>
 #include <KPushButton>
+#include <KLocalizedString>
 #include <KColorScheme>
 
 #include <QtGui/QWidget>
diff --git a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
index 005b489..89ce537 100644
--- a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
+++ b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
@@ -19,8 +19,8 @@
  */
 
 #include <KTabWidget>
-#include <KLocale>
 #include <QtGui/QHBoxLayout>
+#include <KLocalizedString>
 
 #include "generic-advanced-options-widget.h"
 
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.cpp b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
index 1a20d3e..5f5bfca 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
@@ -25,7 +25,7 @@
 #include "parameter-item.h"
 
 #include <KApplication>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KMessageWidget>
 
 #include <QtGui/QValidator>
diff --git a/src/KCMTelepathyAccounts/validated-line-edit.cpp b/src/KCMTelepathyAccounts/validated-line-edit.cpp
index 2176cfc..f121333 100644
--- a/src/KCMTelepathyAccounts/validated-line-edit.cpp
+++ b/src/KCMTelepathyAccounts/validated-line-edit.cpp
@@ -22,7 +22,7 @@
 
 #include "parameter-edit-model.h"
 
-#include <KLocale>
+#include <KLocalizedString>
 #include <KIconLoader>
 
 #include <QtGui/QWidget>

-- 
ktp-accounts-kcm packaging