[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=ed1b73c

The following commit has been merged in the master branch:
commit ed1b73c4d893f2eaaab423e9c736127e1431399c
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Dec 31 13:25:18 2013 +0100

    Sort emoticons to appear in order
    
    REVIEW: 114275
---
 app/emoticon-text-edit-selector.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/emoticon-text-edit-selector.cpp b/app/emoticon-text-edit-selector.cpp
index 1fad99b..61192f5 100644
--- a/app/emoticon-text-edit-selector.cpp
+++ b/app/emoticon-text-edit-selector.cpp
@@ -97,9 +97,11 @@ void EmoticonTextEditSelector::slotCreateEmoticonList()
   }
   const QHash<QString, QStringList> list = sEmoticons->theme( cachedEmoticonsThemeName ).emoticonsMap();
 
-  QHash<QString, QStringList>::const_iterator end = list.constEnd();
-  for ( QHash<QString, QStringList>::const_iterator it = list.constBegin(); it != end; ++it ) {
-    new EmoticonTextEditItem( it.value().first(), it.key(), d->listEmoticon );
+  QStringList emoticonKeys = list.keys();
+  qSort(emoticonKeys);
+
+  Q_FOREACH(const QString &emoticonPath, emoticonKeys) {
+    new EmoticonTextEditItem(list[emoticonPath].first(), emoticonPath, d->listEmoticon);
   }
 
   d->listEmoticon->setIconSize( QSize( 32, 32 ) );

-- 
ktp-text-ui packaging