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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/kfontinst/dbus
From:       Raphael Kubo da Costa <kubito () gmail ! com>
Date:       2010-10-27 16:50:38
Message-ID: 20101027165038.CC022AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1190441 by rkcosta:

Remove some gcc warnings about possibly ambiguous 'else' clauses.


 M  +18 -0     FontInst.cpp  


--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/dbus/FontInst.cpp #1190440:1190441
@@ -505,8 +505,11 @@
         theFolders[FOLDER_USER].configure();
 
     if(sysModified)
+    {
         if(isSystem)
+        {
             theFolders[FOLDER_SYS].configure();
+        }
         else
         {
             QVariantMap args;
@@ -514,6 +517,7 @@
             performAction(args);
             theFolders[FOLDER_SYS].clearModified();
         }
+    }
 
     itsConnectionsTimer->start(constConnectionsTimeout);
     itsFontListTimer->start(constFontListTimeout);
@@ -736,12 +740,18 @@
                                            : Misc::hide(Misc::getFile(*ait)));
 
                     if(to!=*ait)
+                    {
                         if((inSystem && !isSystem) || renameFontFile(*ait, to))
+                        {
                             movedAssoc[*ait]=to;
+                        }
                         else
+                        {
                             result=KIO::ERR_WRITE_ACCESS_DENIED;
                 }
             }
+                }
+            }
             else
                 result=KIO::ERR_WRITE_ACCESS_DENIED;
         }
@@ -855,6 +865,7 @@
     decompose(font, family, style);
 
     if(!findFontReal(family, style, folder, fam, st))
+    {
         if(updateList)
         {
             // Not found, so refresh font list and try again...
@@ -862,7 +873,10 @@
             return findFontReal(family, style, folder, fam, st);
         }
         else
+        {
             return false;
+        }
+    }
 
     return true;
 }
@@ -889,6 +903,7 @@
 {
     KFI_DBUG;
     if(!findFontReal(family, style, folder, fam, st))
+    {
         if(updateList)
         {
             // Not found, so refresh font list and try again...
@@ -896,7 +911,10 @@
             return findFontReal(family, style, folder, fam, st);
         }
         else
+        {
             return false;
+        }
+    }
     return true;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]