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

List:       kde-commits
Subject:    extragear/base/konq-plugins/uachanger
From:       Pino Toscano <pino () kde ! org>
Date:       2008-02-29 19:13:23
Message-ID: 1204312403.349862.3576.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780687 by pino:

less qt3support


 M  +12 -12    uachangerplugin.cpp  


--- trunk/extragear/base/konq-plugins/uachanger/uachangerplugin.cpp #780686:780687
@@ -104,13 +104,13 @@
   QStringList languageList = KGlobal::locale()->languageList();
   if ( languageList.count() )
   {
-     QStringList::Iterator it = languageList.find(QFL1("C"));
-     if( it != languageList.end() )
+     const int index = languageList.indexOf(QFL1("C"));
+     if(index > -1)
      {
-       if( languageList.contains( QFL1("en") ) > 0 )
-         languageList.remove( it );
+       if( languageList.contains( QFL1("en") ) )
+         languageList.removeAt(index);
        else
-         (*it) = QFL1("en");
+         languageList[index] = QFL1("en");
      }
   }
 
@@ -224,14 +224,14 @@
   if( m_currentUserAgent == KProtocolManager::defaultUserAgent() )
      m_pUAMenu->menu()->setItemChecked(id, true);
 
-  m_pUAMenu->menu()->insertSeparator();
+  m_pUAMenu->menu()->addSeparator();
 
   AliasConstIterator map = m_mapAlias.begin();
   for( ; map != m_mapAlias.end(); ++map )
   {
     KMenu *browserMenu = new KMenu;
-    BrowserGroup::ConstIterator e = map.data().begin();
-    for( ; e != map.data().end(); ++e )
+    BrowserGroup::ConstIterator e = map.value().begin();
+    for( ; e != map.value().end(); ++e )
     {
        int id = browserMenu->insertItem( m_lstAlias[*e], this, SLOT(slotItemSelected(int)), 0, *e );
        if (m_lstIdentity[(*e)] == m_currentUserAgent)
@@ -291,7 +291,7 @@
   QStringList partList = m_currentURL.host().split(' ',QString::SkipEmptyParts);
   if ( !partList.isEmpty() )
   {
-    partList.remove(partList.begin());
+    partList.removeFirst();
 
     QStringList domains;
     // Remove the exact name match...
@@ -307,7 +307,7 @@
         break;
 
       domains << partList.join(QFL1("."));
-      partList.remove(partList.begin());
+      partList.removeFirst();
     }
 
     KConfigGroup grp( m_config, QString());
@@ -370,7 +370,7 @@
   QStringList partList =  hostname.split(' ',QString::SkipEmptyParts);
 
   if (partList.count())
-      partList.remove(partList.begin()); // Remove hostname
+      partList.removeFirst(); // Remove hostname
 
   while(partList.count())
   {
@@ -406,7 +406,7 @@
     }
 
     domains.append(partList.join(QFL1(".")));
-    partList.remove(partList.begin()); // Remove part
+    partList.removeFirst(); // Remove part
   }
 
   if( domains.isEmpty() )
[prev in list] [next in list] [prev in thread] [next in thread]