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

List:       kde-commits
Subject:    KDE/kdesdk/kioslave/perldoc
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2008-10-26 22:02:18
Message-ID: 1225058538.756055.20799.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 876254 by sengels:

change and && or

 M  +3 -3      perldoc.cpp  


--- trunk/KDE/kdesdk/kioslave/perldoc/perldoc.cpp #876253:876254
@@ -128,7 +128,7 @@
 
     mimeType("text/html");
 
-    if(l[0].isEmpty() or url.path() == "/") {
+    if(l[0].isEmpty() || url.path() == "/") {
         QByteArray output = i18n("<html><head><title>No page requested</title>"
             "<body>No page was requested.  You can search for:<ul><li>functions"
             "using perldoc:/functions/foo</li>\n\n"
@@ -144,7 +144,7 @@
         return;
     }
 
-    if(l[0] != "functions" and l[0] != "faq") {
+    if(l[0] != "functions" && l[0] != "faq") {
         // See if it exists first.
         if(!topicExists(l[0])) {
             // Failed
@@ -286,7 +286,7 @@
         int status = 0;
 
         ::waitpid(childPid, &status, 0);
-        if(WIFEXITED(status) and WEXITSTATUS(status) == 0)
+        if(WIFEXITED(status) && WEXITSTATUS(status) == 0)
             return true;
     }
 
[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic