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

List:       kde-commits
Subject:    kdebase/kcontrol/kfontinst
From:       Dirk Mueller <mueller () kde ! org>
Date:       2004-03-13 13:10:43
Message-ID: 20040313131043.2116199AC () office ! kde ! org
[Download RAW message or body]

CVS commit by mueller: 

fix compilation with explicit KURL()


  M +3 -3      kio/KioFonts.cpp   1.21
  M +6 -6      lib/Fontmap.cpp   1.9
  M +2 -2      viewpart/FontViewPart.cpp   1.12


--- kdebase/kcontrol/kfontinst/kio/KioFonts.cpp  #1.20:1.21
@@ -597,5 +597,5 @@ void CKioFonts::get(const KURL &url)
             // Determine the mimetype of the file to be retrieved, and emit it.
             // This is mandatory in all slaves (for KRun/BrowserRun to work).
-            emit mimeType(KMimeType::findByURL(url.path(), buff.st_mode, true /* \
local URL */ )->name()); +            emit mimeType(KMimeType::findByURL(url, \
buff.st_mode, true /* local URL */ )->name());  
             totalSize(buff.st_size);
@@ -1041,5 +1041,5 @@ void CKioFonts::rename(const KURL &src, 
     CHECK_ALLOWED(src)
 
-    QCString srcPath(QFile::encodeName(convertUrl(src.path(), true)));
+    QCString srcPath(QFile::encodeName(convertUrl(src, true)));
     QString  sSub(CMisc::getSub(src.path())),
              dSub(CMisc::getSub(dest.path()));

--- kdebase/kcontrol/kfontinst/viewpart/FontViewPart.cpp  #1.11:1.12
@@ -156,5 +156,5 @@ void CFontViewPart::install()
             KMessageBox::error(itsFrame, i18n("%1:%2 already \
installed!").arg(m_url.protocol()).arg(m_url.path()), i18n("Error"));  else
-            if(KIO::NetAccess::copy(m_file, destUrl, itsFrame->parentWidget()))
+            if(KIO::NetAccess::copy(KURL( m_file ), destUrl, \
itsFrame->parentWidget()))  {
                 if(CFontEngine::isAType1(QFile::encodeName(m_url.path())))


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