[Lmuse-cvs-traffic] muse/muse/instruments minstrument.cpp,1.20,1.21 minstrument.h,1.10,1.11

[werner s. <wsc...@us...>]

Update of /cvsroot/lmuse/muse/muse/instruments
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1843/muse/instruments

Modified Files:
	minstrument.cpp minstrument.h 
Log Message:
misc updates


Index: minstrument.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/instruments/minstrument.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** minstrument.cpp	22 Sep 2005 20:12:59 -0000	1.20
--- minstrument.cpp	5 Oct 2005 18:15:27 -0000	1.21
***************
*** 81,96 ****
        if (debugMsg)
              printf("load instrument definitions from <%s>\n", museGlobalInstruments.latin1());
! #if 0 //TD
!       QDir instrumentsDir(museGlobalInstruments, QString("*.idf"), QDir::Files);
        if (instrumentsDir.exists()) {
!             const QFileInfoList* list = instrumentsDir.entryInfoList();
!             QFileInfoListIterator it(*list);
!             QFileInfo* fi;
!             while((fi = it.current())) {
!                   loadIDF(fi);
!                   ++it;
                    }
              }
- #endif
        }
  
--- 81,94 ----
        if (debugMsg)
              printf("load instrument definitions from <%s>\n", museGlobalInstruments.latin1());
!       QDir instrumentsDir(museGlobalInstruments, QString("*.idf"),
!          QDir::SortFlags(QDir::Name | QDir::IgnoreCase), QDir::Files);
        if (instrumentsDir.exists()) {
!             QFileInfoList list = instrumentsDir.entryInfoList();
!             int n = list.size();
!             for (int i = 0; i < n; ++i) {
!                   QFileInfo fi = list.at(i);
!                   loadIDF(&fi);
                    }
              }
        }
  

Index: minstrument.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/instruments/minstrument.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** minstrument.h	22 Sep 2005 20:12:59 -0000	1.10
--- minstrument.h	5 Oct 2005 18:15:27 -0000	1.11
***************
*** 11,16 ****
  
  #include "globaldefs.h"
- //Added by qt3to4:
- #include <Q3PopupMenu>
  
  class MidiOutPort;
--- 11,14 ----