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

List:       kde-commits
Subject:    kdebase/kcontrol
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2004-12-27 20:46:08
Message-ID: 20041227204608.08DBE1BBCF () office ! kde ! org
[Download RAW message or body]

CVS commit by bmeyer: 

KDE_NO_COMPAT fixes


  M +2 -2      kfontinst/kio/KioFonts.cpp   1.50
  M +1 -1      kfontinst/lib/FcEngine.cpp   1.6
  M +1 -1      konq/rootopts.cpp   1.121
  M +2 -2      konqhtml/khttpoptdlg.cpp   1.10


--- kdebase/kcontrol/kfontinst/kio/KioFonts.cpp  #1.49:1.50
@@ -877,5 +877,5 @@ void CKioFonts::put(const KURL &u, int m
                     nrs=nonRootSys(url);
     EFolder         destFolder=itsRoot || \
                i18n(KFI_KIO_FONTS_SYS)==getSect(url.path()) ? FOLDER_SYS : \
                FOLDER_USER;
-    QString         dest=itsFolders[destFolder].location+url.filename(),
+    QString         dest=itsFolders[destFolder].location+url.fileName(),
                     passwd;
     QCString        destC=QFile::encodeName(dest);

--- kdebase/kcontrol/kfontinst/lib/FcEngine.cpp  #1.5:1.6
@@ -830,5 +830,5 @@ bool CFcEngine::parseUrl(const KURL &url
     if(KFI_KIO_FONTS_PROTOCOL==url.protocol())
     {
-        QString name(url.filename());
+        QString name(url.fileName());
         int     pos;
 

--- kdebase/kcontrol/konq/rootopts.cpp  #1.120:1.121
@@ -310,5 +310,5 @@ void DesktopPathConfig::slotEntries( KIO
     {
         KFileItem file(*it, m_copyFromSrc, true, true);
-        if (file.url() == m_copyFromSrc || file.url().filename() == "..")
+        if (file.url() == m_copyFromSrc || file.url().fileName() == "..")
         {
             continue;

--- kdebase/kcontrol/konqhtml/khttpoptdlg.cpp  #1.9:1.10
@@ -43,5 +43,5 @@ void KHTTPOptions::load()
   QString tmp;
   m_pConfig->setGroup( "Browser Settings/HTTP" );       
-  tmp = m_pConfig->readEntry( "AcceptLanguages",KGlobal::locale()->languages());
+  tmp = m_pConfig->readEntry( \
"AcceptLanguages",KGlobal::locale()->languageList().join(","));  \
le_languages->setText( tmp );  tmp = m_pConfig->readEntry( \
"AcceptCharsets",defaultCharsets); @@ -59,5 +59,5 @@ void KHTTPOptions::save()
 void KHTTPOptions::defaults()
 {
-  le_languages->setText( KGlobal::locale()->languages() );
+  le_languages->setText( KGlobal::locale()->languageList().join(",") );
   le_charsets->setText( defaultCharsets );
 }


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