kcontrol: remove disabled code

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index c865431..7a03e12 100644 (file)
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -53,7 +53,6 @@
 #include <KDialog>
 #include <KIcon>
 #include <KMimeType>
-//#include <KFileMetaInfo>
 #include <KZip>
 #include <KTempDir>
 #include <KStandardDirs>
@@ -103,11 +102,7 @@ CFontViewPart::CFontViewPart(QWidget *parentWidget, QObject *parent, const QList
     QBoxLayout *previewLayout=new QBoxLayout(QBoxLayout::LeftToRight, previewFrame),
                *controlsLayout=new QBoxLayout(QBoxLayout::LeftToRight, controls),
                *faceLayout=new QBoxLayout(QBoxLayout::LeftToRight, itsFaceWidget);
-//    QBoxLayout *metaLayout=new QBoxLayout(QBoxLayout::LeftToRight, metaBox);
 
-//     itsMetaLabel=new QLabel(metaBox);
-//     itsMetaLabel->setAlignment(Qt::AlignTop);
-//     metaLayout->addWidget(itsMetaLabel);
     previewLayout->setMargin(0);
     previewLayout->setSpacing(0);
     faceLayout->setMargin(0);
@@ -185,9 +180,6 @@ bool CFontViewPart::openUrl(const KUrl &url)
     if (!url.isValid() || !closeUrl())
         return false;
 
-//     itsMetaLabel->setText(QString());
-//     itsMetaInfo.clear();
-
     itsFontDetails=FC::decode(url);
     if(!itsFontDetails.family.isEmpty() ||
        KFI_KIO_FONTS_PROTOCOL==url.protocol() || KIO::NetAccess::mostLocalUrl(url, itsFrame).isLocalFile())
@@ -224,7 +216,6 @@ void CFontViewPart::timeout()
     int     fileIndex(-1);
     QString fontFile;
 
-//    itsMetaUrl=url();
     delete itsTempDir;
     itsTempDir=NULL;
 
@@ -312,7 +303,6 @@ void CFontViewPart::timeout()
                                 {
                                     fontFile=itsTempDir->name()+entry->name();
                                     //setLocalFilePath(itsTempDir->name()+entry->name());
-//                                    itsMetaUrl=KUrl::fromPath(localFilePath());
                                     break;
                                 }
                                 else
@@ -381,10 +371,6 @@ void CFontViewPart::previewStatus(bool st)
     }
     itsChangeTextAction->setEnabled(st);
 
-//     if(st)
-//         getMetaInfo(itsFaceSelector->isVisible() && itsFaceSelector->value()>0
-//                                           ? itsFaceSelector->value()-1 : 0);
-//     else
     if(!st)
         KMessageBox::error(itsFrame, i18n("Could not read font."));
 }
@@ -493,47 +479,6 @@ void CFontViewPart::checkInstallable()
     }
 }
 
-#if 0
-void CFontViewPart::getMetaInfo(int face)
-{
-    if(itsMetaInfo[face].isEmpty())
-    {
-        // Pass as much inofmration as possible to analyzer...
-        if(KFI_KIO_FONTS_PROTOCOL!=itsMetaUrl.protocol())
-        {
-            itsMetaUrl.removeQueryItem(KFI_KIO_FACE);
-            if(face>0)
-                itsMetaUrl.addQueryItem(KFI_KIO_FACE, QString().setNum(face));
-        }
-
-        KFileMetaInfo meta(itsMetaUrl);
-
-        if(meta.isValid() && meta.keys().count())
-        {
-            QStringList           keys(meta.keys());
-            QStringList::const_iterator it(keys.begin()),
-                                  end(keys.end());
-
-            itsMetaInfo[face]="<table>";
-            for(; it!=end; ++it)
-            {
-                KFileMetaInfoItem mi(meta.item(*it));
-
-                itsMetaInfo[face]+="<tr><td><b>"+mi.name()+"</b></td></tr><tr><td>"+
-                                   mi.value().toString()+"</td></tr>";
-            }
-
-            itsMetaInfo[face]+="</table>";
-            itsMetaLabel->setText(itsMetaInfo[face]);
-        }
-        else
-            itsMetaLabel->setText(i18n("<p>No information</p>"));
-    }
-    else
-        itsMetaLabel->setText(itsMetaInfo[face]);
-}
-#endif
-
 BrowserExtension::BrowserExtension(CFontViewPart *parent)
                 : KParts::BrowserExtension(parent)
 {

diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h
index 3152844..7eeafbc 100644 (file)
--- a/kcontrol/kfontinst/viewpart/FontViewPart.h
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.h
@@ -79,23 +79,19 @@ class CFontViewPart : public KParts::ReadOnlyPart
     private:
 
     void checkInstallable();
-//    void getMetaInfo(int face);
 
     private:
 
-//    QMap<int, QString> itsMetaInfo;
     CFontPreview       *itsPreview;
     QPushButton        *itsInstallButton;
     QWidget            *itsFaceWidget;
     QFrame             *itsFrame;
     QLabel             *itsFaceLabel;
-//                       *itsMetaLabel;
     KIntNumInput       *itsFaceSelector;
     QAction            *itsChangeTextAction;
     KSharedConfigPtr   itsConfig;
     BrowserExtension   *itsExtension;
     QProcess           *itsProc;
-//    KUrl               itsMetaUrl;
     KTempDir           *itsTempDir;
     Misc::TFont        itsFontDetails;
     FontInstInterface  *itsInterface;