SVN commit 657922 by smileaf:

EBN fixes

 M  +1 -1      apps/Installer.cpp  
 M  +3 -3      kio/KioFonts.cpp  
 M  +1 -1      kio/KioFonts.h  
 M  +5 -4      lib/DisabledFonts.cpp  
 M  +1 -1      strigi-analyzer/FontEngine.h  
 M  +1 -1      viewpart/FontPreview.h  


--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/apps/Installer.cpp #657921:657922
@@ -171,7 +171,7 @@
 {
     { "x <folder>",    I18N_NOOP("Configure folder for X11 - create fonts.dir and fonts.scale, plus remove hidden entries."
                                  " (NOTE: Use this option on its own)"), 0},
-    { "embed <winid>", I18N_NOOP("Makes the dialogue transient for an X app specified by winid"), 0 },
+    { "embed <winid>", I18N_NOOP("Makes the dialog transient for an X app specified by winid"), 0 },
     { "+[URL]",        I18N_NOOP("URL to install"), 0 },
     KCmdLineLastOption
 };
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kio/KioFonts.cpp #657921:657922
@@ -572,7 +572,7 @@
 {
     struct Path
     {
-        Path(const QString &p=QString::null) : orig(p) { }
+        Path(const QString &p=QString()) : orig(p) { }
 
         QString orig,
                 modified;
@@ -580,7 +580,7 @@
         bool operator==(const Path &p) const { return p.orig==orig; }
     };
 
-    KfiFont(const QString &n=QString::null, const QString &p=QString::null) : name(n)
+    KfiFont(const QString &n=QString::null, const QString &p=QString()) : name(n)
         { if(!p.isEmpty()) paths.append(Path(p)); }
 
     QString     name;
@@ -3108,7 +3108,7 @@
                           Misc::fExists(destFile=(*it)+modifyName(src.fileName(), true)) ) )
         {
             // If copying / moving a TTC and it is the *same* file, then don't log an error, but
-            // dont continue the transaction...
+            // don't continue the transaction...
             //
             // Reason being that fonts:/ lists the font names (not filenames) so for a TTC there'll
             // be multiple entries...
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kio/KioFonts.h #657921:657922
@@ -181,7 +181,7 @@
     bool               checkUrl(const KUrl &u, bool rootOk=false, bool logError=true);
     bool               checkAllowed(const KUrl &u);
     void               createAfm(const QString &file, bool nrs=false,
-                                 const QString &passwd=QString::null);
+                                 const QString &passwd=QString());
     int                reconfigTimeout();
 
     private:
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/lib/DisabledFonts.cpp #657921:657922
@@ -340,11 +340,12 @@
     return rv;
 }
 
-static QString expandHome(QString path)
+static QString expandHome(const QString &path)
 {
-    return !path.isEmpty() && '~'==path[0]
-        ? 1==path.length() ? QDir::homePath() : path.replace(0, 1, QDir::homePath())
-        : path;
+	QString mpath = path;
+    return !mpath.isEmpty() && '~'==mpath[0]
+        ? 1==mpath.length() ? QDir::homePath() : mpath.replace(0, 1, QDir::homePath())
+        : mpath;
 }
 
 bool CDisabledFonts::TFile::load(QDomElement &elem)
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/strigi-analyzer/FontEngine.h #657921:657922
@@ -83,7 +83,7 @@
     ~CFontEngine()                    { closeFont(); }
 
     //
-    // General functions - these should be used instead of specfic ones below...
+    // General functions - these should be used instead of specific ones below...
     //
     bool            openFont(EType type, QByteArray &in, const char *fileName, int face=0);
     void            closeFont();
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/viewpart/FontPreview.h #657921:657922
@@ -52,7 +52,7 @@
     QSize       sizeHint() const;
     QSize       minimumSizeHint() const;
 
-    void        showFont(const KUrl &url, const QString &name=QString::null,
+    void        showFont(const KUrl &url, const QString &name=QString(),
                          unsigned long styleInfo=KFI_NO_STYLE_INFO, int face=1);
     void        showFont();