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

List:       kde-commits
Subject:    kdeextragear-2/konversation/konversation
From:       Shintaro Matsuoka <shin () shoegazed ! org>
Date:       2004-10-01 3:13:22
Message-ID: 20041001031322.BB6B89970 () office ! kde ! org
[Download RAW message or body]

CVS commit by shin: 

remove utf16 and ucs2 from encodings list as they doesn't work on IRC


  M +12 -2     ledtabbar.cpp   1.41
  M +9 -2      prefspageidentity.cpp   1.39


--- kdeextragear-2/konversation/konversation/ledtabbar.cpp  #1.40:1.41
@@ -83,6 +83,16 @@ LedTabBar::LedTabBar(QWidget* parent,con
     // Encoding {
     QStringList encodingsListDesc=KGlobal::charsets()->descriptiveEncodingNames();
-    for(QStringList::iterator it=encodingsListDesc.begin(); it!=encodingsListDesc.end(); ++it)
-      encodingsList.append(KGlobal::charsets()->encodingForName(*it));
+    QStringList::Iterator it=encodingsListDesc.begin();
+    while(it != encodingsListDesc.end())
+    {
+      QString encodingName=KGlobal::charsets()->encodingForName(*it);
+      if( encodingName == "utf16" || encodingName.startsWith("iso-10646") )
+        it=encodingsListDesc.remove(it);
+      else
+      {
+        encodingsList.append(encodingName);
+        ++it;
+      }
+    }
     popupEncoding=new KPopupMenu(this,"ledtabbar_context_menu_encoding");
     popupEncoding->setCheckable(true);

--- kdeextragear-2/konversation/konversation/prefspageidentity.cpp  #1.38:1.39
@@ -71,6 +71,13 @@ PrefsPageIdentity::PrefsPageIdentity(QFr
 
   // from ksirc: remove utf16/ucs2 as it just doesn't work for IRC
-  encodings.remove( "utf16" );
-  encodings.remove( "iso-10646" );
+  QStringList::Iterator it=encodings.begin();
+  while(it != encodings.end())
+  {
+    QString encoding=KGlobal::charsets()->encodingForName(*it);
+    if( encoding=="utf16" || encoding.startsWith("iso-10646") )
+      it=encodings.remove(it);
+    else
+      ++it;
+  }
 
   // add encodings to combo box


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