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

List:       kde-commits
Subject:    KDE/kdelibs/khtml/java
From:       Laurent Montel <montel () kde ! org>
Date:       2006-02-17 13:53:34
Message-ID: 1140184414.687306.7237.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 510516 by mlaurent:

Deprecated--


 M  +4 -4      kjavaappletserver.cpp  
 M  +4 -4      kjavaappletviewer.cpp  


--- trunk/KDE/kdelibs/khtml/java/kjavaappletserver.cpp #510515:510516
@@ -586,9 +586,9 @@
             if (it != d->jsstack.end()) {
                 kDebug(6100) << "slotJavaRequest: " << ticket << endl;
                 args.pop_front();
-                it.data()->args.operator=(args); // just in case ..
-                it.data()->ready = true;
-                it.data()->exit = true;
+                it.value()->args.operator=(args); // just in case ..
+                it.value()->ready = true;
+                it.value()->exit = true;
             } else
                 kDebug(6100) << "Error: Missed return member data" << endl;
             return;
@@ -719,7 +719,7 @@
     JSStack::iterator it = d->jsstack.begin();
     JSStack::iterator itEnd = d->jsstack.end();
     for (; it != itEnd; ++it)
-        it.data()->exit = true;
+        it.value()->exit = true;
 }
 
 void KJavaAppletServer::timerEvent(QTimerEvent *) {
--- trunk/KDE/kdelibs/khtml/java/kjavaappletviewer.cpp #510515:510516
@@ -106,7 +106,7 @@
     if (it != m_contextmap.end () && --(*it).second <= 0) {
         kDebug(6100) << "KJavaServerMaintainer::releaseContext" << endl;
         (*it).first->deleteLater ();
-        m_contextmap.remove (it);
+        m_contextmap.erase (it);
     }
 }
 
@@ -148,7 +148,7 @@
     for (int count = 2; it != itEnd; ++it) {
         tit = new Q3TableItem (table, Q3TableItem::Always, it.key ());
         table->setItem (++count, 0, tit);
-        tit = new Q3TableItem(table, Q3TableItem::Always, it.data ());
+        tit = new Q3TableItem(table, Q3TableItem::Always, it.value ());
         table->setItem (count, 1, tit);
     }
     setMainWidget (table);
@@ -232,7 +232,7 @@
     QStringList::const_iterator it = args.begin();
     const QStringList::const_iterator itEnd = args.end();
     for ( ; it != itEnd; ++it) {
-        const int equalPos = (*it).find("=");
+        const int equalPos = (*it).indexOf("=");
         if (equalPos > 0) {
             const QString name = (*it).left (equalPos).toUpper ();
             QString value = (*it).right ((*it).length () - equalPos - 1);
@@ -488,7 +488,7 @@
     const QMap<QString,QString>::const_iterator itEnd = applet->getParams().end();
     for ( ; it != itEnd; ++it) {
         stream << it.key ();
-        stream << it.data ();
+        stream << it.value ();
     }
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]