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

List:       kde-commits
Subject:    kdenonbeta/proklam/proklam
From:       Lauri Watts <lauri () physos ! org>
Date:       2003-03-01 16:55:23
[Download RAW message or body]

CVS commit by lauri: 

Make it compile with GCC 2.95


  M +4 -4      speaker.cpp   1.16
  M +3 -3      speechdata.cpp   1.8


--- kdenonbeta/proklam/proklam/speaker.cpp  #1.15:1.16
@@ -84,5 +84,5 @@ void Speaker::checkSayWarning(){
  */
 void Speaker::checkSayMessage(){
-    while(!speechData->isEmptyMessage() or !speechData->isEmptyWarning()){
+    while(!speechData->isEmptyMessage() || !speechData->isEmptyWarning()){
         checkSayWarning();   
         mlText temp = speechData->dequeueMessage();
@@ -99,5 +99,5 @@ void Speaker::checkSayMessage(){
  */
 void Speaker::checkSayText(){
-    while(!speechData->isStopedText() or !speechData->isEmptyMessage() or \
!speechData->isEmptyWarning()){ +    while(!speechData->isStopedText() || \
!speechData->isEmptyMessage() || !speechData->isEmptyWarning()){  \
if(!speechData->isEmptyWarning()){  if(speechData->parPreMsgEnabled){
@@ -110,5 +110,5 @@ void Speaker::checkSayText(){
         }     
         mlText temp = speechData->getSentenceText();
-        if(!speechData->isEmptyMessage() and (temp.text == "")){
+        if(!speechData->isEmptyMessage() && (temp.text == "")){
             if(speechData->textPreMsgEnabled){
                 loadedPlugIns[speechData->defaultLanguage]->sayText(speechData->textPreMsg);


--- kdenonbeta/proklam/proklam/speechdata.cpp  #1.7:1.8
@@ -261,5 +261,5 @@ void SpeechData::prevParText(){
     kdDebug() << "Running: SpeechData::prevParText()" << endl;
     textMutex.lock();
-    while(*textIterator != "" and textIterator != textSents.begin()){
+    while(*textIterator != "" && textIterator != textSents.begin()){
         textIterator--;
     }
@@ -325,5 +325,5 @@ void SpeechData::nextParText(){
     kdDebug() << "Running: SpeechData::nextParText()" << endl;
     textMutex.lock();
-    while(*textIterator != "" and textIterator != textSents.end()){
+    while(*textIterator != "" && textIterator != textSents.end()){
         textIterator++;
     }


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