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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/xmlgui
From:       Constantin Berzan <exit3219 () gmail ! com>
Date:       2009-07-30 9:48:57
Message-ID: 1248947337.216427.28827.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1004478 by cberzan:

actually display a warning if the .rc file is not found


 M  +7 -7      kxmlguiclient.cpp  


--- trunk/KDE/kdelibs/kdeui/xmlgui/kxmlguiclient.cpp #1004477:1004478
@@ -191,20 +191,20 @@
     const QStringList allFiles = componentData().dirs()->findAllResources("data", filter) +
                                  componentData().dirs()->findAllResources("data", _file);
 
-    if (!allFiles.isEmpty())
+    if ( !allFiles.isEmpty() )
+    {
         file = findMostRecentXMLFile(allFiles, doc);
+    } else if ( !_file.isEmpty() ) {
+      // if a non-empty file gets passed and we can't find it,
+      // inform the developer using some debug output
+      kWarning() << "cannot find .rc file" << _file << "in" << filter;
+    }
 
     if ( file.isEmpty() )
     {
       // this might or might not be an error.  for the time being,
       // let's treat this as if it isn't a problem and the user just
       // wants the global standards file
-
-      // however if a non-empty file gets passed and we can't find it we might
-      // inform the developer using some debug output
-      if ( !_file.isEmpty() )
-          kWarning() << "cannot find .rc file" << _file << "in" << filter;
-
       setXML( QString(), true );
     }
     else if ( !doc.isEmpty() )
[prev in list] [next in list] [prev in thread] [next in thread]