[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=bbe1326

The following commit has been merged in the master branch:
commit bbe1326a59dee02053078b0bcb7bd5db74f6f23a
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Dec 2 18:00:56 2014 +0100

    Unport QMessageBox back to KMessageBox
    
    KMessageBox is not deprecated and can do much more than QMessageBox
---
 KTp/Widgets/contact-info-dialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/KTp/Widgets/contact-info-dialog.cpp b/KTp/Widgets/contact-info-dialog.cpp
index 4cf5df6..123cad3 100644
--- a/KTp/Widgets/contact-info-dialog.cpp
+++ b/KTp/Widgets/contact-info-dialog.cpp
@@ -39,12 +39,12 @@
 #include <QDebug>
 #include <QPushButton>
 #include <QLineEdit>
-#include <QMessageBox>
 #include <QFileDialog>
 #include <QMimeType>
 #include <QMimeDatabase>
 #include <QDialogButtonBox>
 
+#include <KMessageBox>
 #include <KTitleWidget>
 #include <KLocalizedString>
 #include <KDateComboBox>
@@ -225,7 +225,7 @@ void ContactInfoDialog::Private::onChangeAvatarButtonClicked()
 
         QPixmap avatar(newAvatarFile);
         if (avatar.isNull()) {
-            QMessageBox::critical(q, QString(), i18n("Failed to load the new avatar image"));
+            KMessageBox::error(q, i18n("Failed to load the new avatar image"));
             newAvatarFile.clear();
             delete fileDialog;
             return;

-- 
ktp-common-internals packaging