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

List:       kde-commits
Subject:    kdebase/kcontrol/kfontinst
From:       Craig Drummond <craig () kde ! org>
Date:       2004-04-22 19:00:07
Message-ID: 20040422190007.2D6689A06 () office ! kde ! org
[Download RAW message or body]

CVS commit by craig: 

Remove openKioFont -> open via URL instead


  M +2 -2      kcmfontinst/KCmFontInst.cpp   1.22
  M +9 -3      kfile-plugin/KFileFont.cpp   1.10
  M +2 -2      thumbnail/FontThumbnail.cpp   1.10
  M +2 -11     viewpart/FontPreview.cpp   1.6
  M +1 -2      viewpart/FontPreview.h   1.4
  M +3 -3      viewpart/FontViewPart.cpp   1.14


--- kdebase/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp  #1.21:1.22
@@ -558,5 +558,5 @@ void CKCmFontInst::fileHighlighted(const
             bool showFs=false;
 
-            if(CFontEngine::TT_COLLECTION==type && \
CGlobal::fe().openKioFont(previewItem->url().path(), CFontEngine::TEST, true)) +      \
if(CFontEngine::TT_COLLECTION==type && CGlobal::fe().openFont(previewItem->url(), \
CFontEngine::TEST, true))  {
                 if(CGlobal::fe().getNumFaces()>1)

--- kdebase/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp  #1.9:1.10
@@ -212,7 +212,13 @@ bool KFileFontPlugin::readInfo(KFileMeta
         do
         {
-            if(CGlobal::fe().openKioFont(fName , KFileMetaInfo::Fastest==what
+            if(fontsProt
+                   ? CGlobal::fe().openFont(url , KFileMetaInfo::Fastest==what
                                                        ? CFontEngine::NAME
-                                                       : \
CFontEngine::NAME|CFontEngine::PROPERTIES|CFontEngine::XLFD, true, face)) +           \
: CFontEngine::NAME|CFontEngine::PROPERTIES|CFontEngine::XLFD, +                      \
true, face) +                   : CGlobal::fe().openFont(fName , \
KFileMetaInfo::Fastest==what +                                                       \
? CFontEngine::NAME +                                                       : \
CFontEngine::NAME|CFontEngine::PROPERTIES|CFontEngine::XLFD, +                        \
true, face))  {
                 numFaces=CGlobal::fe().getNumFaces(); // Only really for TTC

--- kdebase/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp  #1.9:1.10
@@ -60,5 +60,5 @@ CFontThumbnail::~CFontThumbnail()
 bool CFontThumbnail::create(const QString &path, int width, int height, QImage &img)
 {
-    if(CGlobal::fe().openKioFont(path, CFontEngine::NAME, true, 0))
+    if(CGlobal::fe().openFont(path, CFontEngine::NAME, true, 0))
     {
         QPixmap pix;

--- kdebase/kcontrol/kfontinst/viewpart/FontPreview.cpp  #1.5:1.6
@@ -47,13 +47,4 @@ CFontPreview::CFontPreview(QWidget *pare
 }
 
-void CFontPreview::showFont(const QString &file, int face)
-{
-    KURL url;
-
-    url.setPath(CMisc::getDir(file));
-    url.setFileName(CMisc::getFile(file));
-    showFont(url, face);
-}
-
 void CFontPreview::showFont(const KURL &url, int face)
 {
@@ -73,5 +64,5 @@ void CFontPreview::showFont()
     itsLastHeight=height();
 
-    if(CGlobal::fe().openKioFont(itsCurrentUrl.path(), CFontEngine::NAME, true, \
itsCurrentFace-1)) +    if(CGlobal::fe().openFont(itsCurrentUrl, CFontEngine::NAME, \
true, itsCurrentFace-1))  {
         setEraseColor(Qt::white);

--- kdebase/kcontrol/kfontinst/viewpart/FontPreview.h  #1.3:1.4
@@ -52,5 +52,4 @@ class CFontPreview : public QWidget
     public slots:
 
-    void showFont(const QString &file, int face=1);
     void showFont(const KURL &url, int face=1);
     void showFace(int face);

--- kdebase/kcontrol/kfontinst/viewpart/FontViewPart.cpp  #1.13:1.14
@@ -87,5 +87,5 @@ CFontViewPart::~CFontViewPart()
 bool CFontViewPart::openFile()
 {
-    if(CFontEngine::isATtc(QFile::encodeName(m_url.path())) && \
CGlobal::fe().openKioFont(m_file, CFontEngine::TEST, true)) +    \
if(CFontEngine::isATtc(QFile::encodeName(m_url.path())) && \
CGlobal::fe().openFont(m_url, CFontEngine::TEST, true))  {
         if(CGlobal::fe().getNumFaces()>1)
@@ -101,5 +101,5 @@ bool CFontViewPart::openFile()
         itsInstallButton->show();
 
-    itsPreview->showFont(m_file);
+    itsPreview->showFont(m_url);
 
     return true;


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