Changeset 508

Timestamp:

09/22/08 16:05:03 (5 years ago)

Author:

smoors

Message:

converted "and"-operator to "&&" because some funny windows compilers don't know of this aliases..

Location:

trunk/gui/src

Files:

• SoundLibrary/SoundLibraryRepositoryDialog.cpp (modified) (1 diff)
• widgets/midiTable.cpp (modified) (1 diff)

trunk/gui/src/SoundLibrary/SoundLibraryRepositoryDialog.cpp

@@ -75 +75 @@
         QString text = QInputDialog::getText(this, trUtf8("Edit server list"), trUtf8("URL"), QLineEdit::Normal,QString(""), &ok);
         
-        if( ok and !text.isEmpty() ){
+        if( ok && !text.isEmpty() ){
                 pPref->sServerList.push_back( text );
         }

trunk/gui/src/widgets/midiTable.cpp

@@ -56 +56 @@
                 QComboBox * actionCombo = dynamic_cast <QComboBox *> ( cellWidget( __row_count - 1, 2 ) );
 
-                if( eventCombo == NULL or actionCombo == NULL) return;
+                if( eventCombo == NULL || actionCombo == NULL) return;
 
-                if( actionCombo->currentText() != "" and eventCombo->currentText() != "" ) {
+                if( actionCombo->currentText() != "" && eventCombo->currentText() != "" ) {
                         insertNewRow("", "", 0, 0);
                 }