[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.6/kdelibs/khtml/java
From:       Maks Orlovich <maksim () kde ! org>
Date:       2011-01-18 23:49:44
Message-ID: 20110118234944.1DE84AC8B7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1215532 by orlovich:

Merged revision:r1215531 | orlovich | 2011-01-18 18:48:59 -0500 (Tue, 18 Jan 2011) | 5 lines

Unbreak KJavaAppletViewer. QStringList::begin is not an output iterator.

CCMAIL: ervin@kde.org
BUG: 258452

 M  +2 -6      kjavaappletviewer.cpp  


--- branches/KDE/4.6/kdelibs/khtml/java/kjavaappletviewer.cpp #1215531:1215532
@@ -23,7 +23,6 @@
 #include "kjavaappletwidget.h"
 #include "kjavaappletserver.h"
 
-#include <algorithm>
 #include <stdio.h>
 
 #ifdef KDE_USE_FINAL
@@ -63,14 +62,11 @@
     delete s_componentData;
 }
 
-QString variant2StringHelper(const QVariant &variant) {
-    return variant.toString();
-}
-
 QObject *KJavaAppletViewerFactory::create(const char *, QWidget *wparent, QObject *parent,
                                           const QVariantList & args, const QString &) {
     QStringList argsStrings;
-    std::transform(args.begin(), args.end(), argsStrings.begin(), variant2StringHelper);
+    for (int i = 0; i < args.size(); ++i)
+        argsStrings.append(args[i].toString());
     return new KJavaAppletViewer (wparent, parent, argsStrings);
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]