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

List:       kde-commits
Subject:    kdewebdev
From:       Adriaan de Groot <groot () kde ! org>
Date:       2005-02-18 11:44:27
Message-ID: 20050218114427.833FF1CF34 () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

The h||r||! Let me give you a h&& with gcc 2.95 compatibility


  M +3 -3      kfilereplace/commandengine.cpp   1.7
  M +2 -2      kfilereplace/knewprojectdlg.cpp   1.27
  M +1 -1      kommander/editor/functionsimpl.cpp   1.19
  M +2 -2      quanta/components/csseditor/csseditor.cpp   1.24
  M +1 -1      quanta/components/csseditor/stylesheetparser.cpp   1.3


--- kdewebdev/kfilereplace/commandengine.cpp  #1.6:1.7
@@ -110,5 +110,5 @@ QString CommandEngine::mathexp(const QSt
 
   //Through slotGetScriptOutput, m_processOutput contains the result of the KProcess call
-   if(not proc->start(KProcess::Block, KProcess::All))
+   if(!proc->start(KProcess::Block, KProcess::All))
      {
        return QString::null;
@@ -193,5 +193,5 @@ void CommandEngine::slotGetScriptError(K
   Q_UNUSED(proc);
   QCString temp(s,i+1);
-  if(temp.isEmpty() or temp == "\n") return;
+  if(temp.isEmpty() || temp == "\n") return;
 }
 
@@ -201,5 +201,5 @@ void CommandEngine::slotGetScriptOutput(
   QCString temp(s,i+1);
 
-  if(temp.isEmpty() or temp == "\n") return;
+  if(temp.isEmpty() || temp == "\n") return;
 
   m_processOutput += QString::fromLocal8Bit(temp);

--- kdewebdev/kfilereplace/knewprojectdlg.cpp  #1.26:1.27
@@ -461,8 +461,8 @@ void KNewProjectDlg::saveBackupExtension
 void KNewProjectDlg::setDatas(const QString& directoryString, const QString& filterString)
 {
-  if (not directoryString.isEmpty())
+  if (!directoryString.isEmpty())
     m_cbLocation->setEditText(directoryString);
 
-  if (not filterString.isEmpty())
+  if (!filterString.isEmpty())
     m_cbFilter->setEditText(filterString);
 }

--- kdewebdev/kommander/editor/functionsimpl.cpp  #1.18:1.19
@@ -108,5 +108,5 @@ void FunctionsDialog::groupChanged(int i
       {
         int pFunction = SpecialInformation::function(pGroup, pFunctions[i]);
-        if (a_atw->isFunctionSupported(pFunction) or a_atw->isCommonFunction(pFunction))
+        if (a_atw->isFunctionSupported(pFunction) || a_atw->isCommonFunction(pFunction))
           functionListBox->insertItem(pFunctions[i]);
       }

--- kdewebdev/quanta/components/csseditor/csseditor.cpp  #1.23:1.24
@@ -663,7 +663,7 @@ void CSSEditor::activatePreview() {
         QFileInfo fi(m_fileToPreview);
         KParts::URLArgs a;
-        if(fi.extension().lower() == "xml" or fi.extension().lower() == "xhtml")
+        if(fi.extension().lower() == "xml" || fi.extension().lower() == "xhtml")
           a.serviceType="text/xml";
-        if(fi.extension().lower() == "html" or fi.extension().lower() == "html")
+        if(fi.extension().lower() == "html" || fi.extension().lower() == "html")
           a.serviceType="text/xml";
         m_previewer->browserExtension()->setURLArgs(a);

--- kdewebdev/quanta/components/csseditor/stylesheetparser.cpp  #1.2:1.3
@@ -34,5 +34,5 @@ int stylesheetParser::whiteSpaces(int d)
   for( unsigned int i=d;i<m_styleSheet.length();i++){
     QString temp;
-    if(m_styleSheet[i] == ' ' or m_styleSheet[i] == '\n'  or m_styleSheet[i] == '\t' ) 
+    if(m_styleSheet[i] == ' ' || m_styleSheet[i] == '\n'  || m_styleSheet[i] == '\t' ) 
       ws++;
     else break; 


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