Index: builder/autorouter.cpp =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/autorouter.cpp,v retrieving revision 1.7 diff -u -r1.7 autorouter.cpp --- builder/autorouter.cpp 2000/11/28 15:04:03 1.7 +++ builder/autorouter.cpp 2001/02/19 13:48:45 @@ -35,6 +35,8 @@ #define pthread_attr_init(a) ; #endif +using namespace std; + void *startroute(void *where) { ((AutoRouter *)where)->thread_command_loop(); Index: builder/autorouter.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/autorouter.h,v retrieving revision 1.2 diff -u -r1.2 autorouter.h --- builder/autorouter.h 2000/06/03 16:59:19 1.2 +++ builder/autorouter.h 2001/02/19 13:48:45 @@ -70,7 +70,7 @@ bool _needRedraw; QString minhistory; - list trylist[1024]; + std::list trylist[1024]; int triesleft; int width,height; @@ -83,7 +83,7 @@ pthread_t route_thread; #endif - list command_queue; + std::list command_queue; bool thread_terminate_now; /*************************/ Index: builder/main.cpp =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/main.cpp,v retrieving revision 1.27 diff -u -r1.27 main.cpp --- builder/main.cpp 2000/11/28 17:20:35 1.27 +++ builder/main.cpp 2001/02/19 13:48:50 @@ -61,6 +61,8 @@ #include "execdlg.h" #include "namedlg.h" +using namespace std; + /*************************************/ class ArtsBuilderApp :public KApplication { Index: builder/main.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/main.h,v retrieving revision 1.7 diff -u -r1.7 main.h --- builder/main.h 2000/11/22 21:41:04 1.7 +++ builder/main.h 2001/02/19 13:48:51 @@ -58,9 +58,9 @@ class ModuleWidget :public QTableView, public StructureCanvas { Q_OBJECT - friend CreateTool; - friend CreateModuleTool; - friend CreatePortTool; + friend class CreateTool; + friend class CreateModuleTool; + friend class CreatePortTool; protected: int cellsize,cols,rows; @@ -78,8 +78,8 @@ int selectedports; //list ChildList; - list *ModuleList; - list UpdateList; + std::list *ModuleList; + std::list UpdateList; void paintCell(QPainter *p, int y, int x); void paintCellBackground(QPainter *p, int y, int x); Index: builder/menumaker.cpp =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/menumaker.cpp,v retrieving revision 1.3 diff -u -r1.3 menumaker.cpp --- builder/menumaker.cpp 2000/11/28 15:04:03 1.3 +++ builder/menumaker.cpp 2001/02/19 13:48:51 @@ -3,6 +3,8 @@ #include #include +using namespace std; + MenuCategory::MenuCategory(const char *name, const char *prefix,QPopupMenu *menu) { _menu = menu; Index: builder/menumaker.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/menumaker.h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 menumaker.h --- builder/menumaker.h 2000/05/29 15:47:22 1.1.1.1 +++ builder/menumaker.h 2001/02/19 13:48:51 @@ -10,8 +10,8 @@ { protected: QPopupMenu *_menu; - string _name; - list prefixList; + std::string _name; + std::list prefixList; bool _catchall; public: @@ -38,8 +38,8 @@ void addCategory(const char *name, const char *prefix); MenuCategory *lookupCategoryByName(const char *name); void addItem(const char *name, int i); - string basename(const char *name); - string catname(const char *name); + std::string basename(const char *name); + std::string catname(const char *name); void clear(); Index: builder/module.cpp =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/module.cpp,v retrieving revision 1.6 diff -u -r1.6 module.cpp --- builder/module.cpp 2000/11/28 15:04:03 1.6 +++ builder/module.cpp 2001/02/19 13:48:53 @@ -28,6 +28,8 @@ #include #include +using namespace std; + ModulePort::ModulePort(StructureComponent *owner, const string& description, int drawsegment, Direction direction, Arts::PortDesc PortDesc) { Index: builder/module.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/module.h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 module.h --- builder/module.h 2000/05/29 15:47:23 1.1.1.1 +++ builder/module.h 2001/02/19 13:48:53 @@ -55,7 +55,7 @@ long route_owner; - ModulePort(StructureComponent *owner, const string& description, + ModulePort(StructureComponent *owner, const std::string& description, int drawsegment, Direction direction, Arts::PortDesc PortDesc); bool down(); @@ -87,14 +87,14 @@ bool isInterface; long mdID; - list inports,outports; + std::list inports,outports; // StructureComponent interface ComponentType type(); ModulePort *portAt(int segment, int x, int y); - void dumpPorts(list& ports); + void dumpPorts(std::list& ports); bool visible(); void show(); Index: builder/portablekde.cpp =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/portablekde.cpp,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 portablekde.cpp --- builder/portablekde.cpp 2000/05/29 15:47:16 1.1.1.1 +++ builder/portablekde.cpp 2001/02/19 13:48:53 @@ -5,6 +5,8 @@ #include #include +using namespace std; + void PortableKDE::KMsgSorry(QWidget *parent, const char *text) { KMessageBox::sorry(parent,text); Index: builder/portablekde.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/portablekde.h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 portablekde.h --- builder/portablekde.h 2000/05/29 15:47:23 1.1.1.1 +++ builder/portablekde.h 2001/02/19 13:48:53 @@ -22,7 +22,7 @@ static KConfig* config(); static QString caption(); static void KMsgSorry(QWidget *parent, const char *text); - static list globalDirs(const char *which); + static std::list globalDirs(const char *which); }; #define KAppNameType QCString Index: builder/portposdlg.cpp =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/portposdlg.cpp,v retrieving revision 1.7 diff -u -r1.7 portposdlg.cpp --- builder/portposdlg.cpp 2000/12/05 16:21:29 1.7 +++ builder/portposdlg.cpp 2001/02/19 13:48:54 @@ -36,6 +36,8 @@ #include #include +using namespace std; + PortPosDlg::PortPosDlg(QWidget *parent, Structure *structure) :QDialog(parent,"Props", TRUE) { this->structure = structure; Index: builder/portposdlg.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/portposdlg.h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 portposdlg.h --- builder/portposdlg.h 2000/05/29 15:47:23 1.1.1.1 +++ builder/portposdlg.h 2001/02/19 13:48:54 @@ -36,7 +36,7 @@ Structure *structure; QListBox *listbox; - vector listports; + std::vector listports; public: PortPosDlg(QWidget *parent, Structure *structure); Index: builder/portpropdlg.cpp =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/portpropdlg.cpp,v retrieving revision 1.7 diff -u -r1.7 portpropdlg.cpp --- builder/portpropdlg.cpp 2001/02/17 18:30:54 1.7 +++ builder/portpropdlg.cpp 2001/02/19 13:48:55 @@ -32,6 +32,9 @@ #include #include #include +#include + +using namespace std; static void min_size(QWidget *w) { w->setMinimumSize(w->sizeHint()); Index: builder/scomponent.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/scomponent.h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 scomponent.h --- builder/scomponent.h 2000/05/29 15:47:24 1.1.1.1 +++ builder/scomponent.h 2001/02/19 13:48:56 @@ -50,7 +50,7 @@ // TODO: connection & autorouter virtual ModulePort *portAt(int segment, int x, int y) = 0; - virtual void dumpPorts(list& ports) = 0; + virtual void dumpPorts(std::list& ports) = 0; // visibility virtual void hide() = 0; Index: builder/session.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/session.h,v retrieving revision 1.2 diff -u -r1.2 session.h --- builder/session.h 2000/09/27 03:42:38 1.2 +++ builder/session.h 2001/02/19 13:48:56 @@ -25,7 +25,7 @@ #include "structure.h" class Session :public ExecutableStructure { - vector *session; + std::vector *session; public: Session(); ~Session(); Index: builder/structure.cpp =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/structure.cpp,v retrieving revision 1.8 diff -u -r1.8 structure.cpp --- builder/structure.cpp 2000/11/28 17:20:35 1.8 +++ builder/structure.cpp 2001/02/19 13:48:57 @@ -22,8 +22,11 @@ #include "structure.h" #include "soundserver.h" #include +#include #include #include + +using namespace std; ExecutableStructure::ExecutableStructure() { Index: builder/structure.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/structure.h,v retrieving revision 1.4 diff -u -r1.4 structure.h --- builder/structure.h 2000/11/28 17:20:35 1.4 +++ builder/structure.h 2001/02/19 13:48:57 @@ -48,8 +48,8 @@ Arts::SynthModule structure; StructureCanvas *canvas; - list ModuleList; - list ComponentList; + std::list ModuleList; + std::list ComponentList; public: Structure(); @@ -63,7 +63,7 @@ bool valid(); void load(const char *filename); void retrieve(const char *pubname); - void loadFromList(const vector& strseq); + void loadFromList(const std::vector& strseq); bool save(const char *filename); void clear(); void publish(); @@ -71,7 +71,7 @@ long countSelected(); void deleteSelected(); - string name(); + std::string name(); void rename(const char *newname); Module *createModule(const Arts::ModuleInfo& minfo); @@ -79,8 +79,8 @@ StructureComponent *componentAt(long x, long y, bool ignore_selected); - list *getModuleList(); - list *getComponentList(); + std::list *getModuleList(); + std::list *getComponentList(); }; #endif Index: builder/structureport.cpp =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/structureport.cpp,v retrieving revision 1.3 diff -u -r1.3 structureport.cpp --- builder/structureport.cpp 2000/11/28 15:04:03 1.3 +++ builder/structureport.cpp 2001/02/19 13:48:58 @@ -27,6 +27,8 @@ #include #include +using namespace std; + StructurePort::StructurePort(Arts::StructurePortDesc SPortDesc, Arts::StructureDesc StructureDesc, StructureCanvas *canvas) : StructureComponent(canvas) Index: builder/structureport.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/builder/structureport.h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 structureport.h --- builder/structureport.h 2000/05/29 15:47:25 1.1.1.1 +++ builder/structureport.h 2001/02/19 13:48:58 @@ -49,7 +49,7 @@ ComponentType type(); ModulePort *portAt(int segment, int x, int y); - void dumpPorts(list& ports); + void dumpPorts(std::list& ports); bool visible(); void show(); Index: gui/kbutton_impl.cpp =================================================================== RCS file: /home/kde/kdemultimedia/arts/gui/kbutton_impl.cpp,v retrieving revision 1.1 diff -u -r1.1 kbutton_impl.cpp --- gui/kbutton_impl.cpp 2000/11/15 19:04:18 1.1 +++ gui/kbutton_impl.cpp 2001/02/19 13:48:59 @@ -23,6 +23,7 @@ #include "kbutton_impl.h" using namespace Arts; +using namespace std; KButton_impl::KButton_impl(QPushButton *qpushbutton /* = 0 */) : KWidget_impl(qpushbutton?qpushbutton:new QPushButton(0)) Index: gui/kbutton_impl.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/gui/kbutton_impl.h,v retrieving revision 1.1 diff -u -r1.1 kbutton_impl.h --- gui/kbutton_impl.h 2000/11/15 19:04:18 1.1 +++ gui/kbutton_impl.h 2001/02/19 13:49:00 @@ -34,8 +34,8 @@ public: KButton_impl(QPushButton *qpushbutton = 0); - string text(); - void text(const string& newText); + std::string text(); + void text(const std::string& newText); }; }; Index: gui/kpoti_impl.cpp =================================================================== RCS file: /home/kde/kdemultimedia/arts/gui/kpoti_impl.cpp,v retrieving revision 1.2 diff -u -r1.2 kpoti_impl.cpp --- gui/kpoti_impl.cpp 2000/11/30 20:47:13 1.2 +++ gui/kpoti_impl.cpp 2001/02/19 13:49:00 @@ -26,6 +26,7 @@ #include "stdio.h" using namespace Arts; +using namespace std; PotiIntMapper::PotiIntMapper(KPoti_impl *impl, KPoti *kp) :impl(impl) { Index: gui/kpoti_impl.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/gui/kpoti_impl.h,v retrieving revision 1.2 diff -u -r1.2 kpoti_impl.h --- gui/kpoti_impl.h 2000/11/30 20:47:13 1.2 +++ gui/kpoti_impl.h 2001/02/19 13:49:00 @@ -45,17 +45,17 @@ { protected: KPoti *kpoti; - string _text, _color; + std::string _text, _color; float _min, _max, _value; void applyValue(); public: KPoti_impl(KPoti *kpoti = 0); - string text(); - void text(const string& newText); - string color(); - void color(const string& newColor); + std::string text(); + void text(const std::string& newText); + std::string color(); + void color(const std::string& newColor); float min(); void min(float newMin); Index: gui/kwidgetrepo.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/gui/kwidgetrepo.h,v retrieving revision 1.1 diff -u -r1.1 kwidgetrepo.h --- gui/kwidgetrepo.h 2000/11/15 19:04:18 1.1 +++ gui/kwidgetrepo.h 2001/02/19 13:49:00 @@ -35,8 +35,8 @@ class KWidgetRepo { protected: long nextID; - map qwidgets; - map widgets; + std::map qwidgets; + std::map widgets; static KWidgetRepo *instance; KWidgetRepo(); Index: midi/midiclient_impl.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/midi/midiclient_impl.h,v retrieving revision 1.2 diff -u -r1.2 midiclient_impl.h --- midi/midiclient_impl.h 2000/12/15 05:10:13 1.2 +++ midi/midiclient_impl.h 2001/02/19 13:49:01 @@ -35,8 +35,8 @@ protected: MidiClientInfo _info; MidiManager_impl *manager; - list ports; - list _connections; + std::list ports; + std::list _connections; public: MidiClient_impl(const MidiClientInfo& info, MidiManager_impl *manager); @@ -44,15 +44,15 @@ // MCOP interface MidiClientInfo info(); - void title(const string &newvalue); - string title(); + void title(const std::string &newvalue); + std::string title(); void addInputPort(MidiPort port); MidiPort addOutputPort(); void removePort(MidiPort port); // interface to MidiManager/Port inline long ID() { return _info.ID; } - list *connections(); + std::list *connections(); void connect(MidiClient_impl *dest); void disconnect(MidiClient_impl *dest); }; Index: midi/midisend.cc =================================================================== RCS file: /home/kde/kdemultimedia/arts/midi/midisend.cc,v retrieving revision 1.2 diff -u -r1.2 midisend.cc --- midi/midisend.cc 2001/01/21 02:36:40 1.2 +++ midi/midisend.cc 2001/02/19 13:49:02 @@ -41,6 +41,8 @@ #include #include +using namespace std; + int input_fd = -1, test = 0, verbose = 0; char cFileName[1025]; int optch; Index: midi/midisend.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/midi/midisend.h,v retrieving revision 1.1 diff -u -r1.1 midisend.h --- midi/midisend.h 2000/12/07 16:50:57 1.1 +++ midi/midisend.h 2001/02/19 13:49:02 @@ -30,6 +30,7 @@ #include "artsmidi.h" #include #include +#include extern "C" { @@ -92,12 +93,12 @@ int nToPitch; }; - typedef map ChannelRemapMap; + typedef std::map ChannelRemapMap; ChannelRemapMap channelRemaps; - typedef map PitchRemapMap; + typedef std::map PitchRemapMap; PitchRemapMap pitchRemaps; }; - typedef map ChannelMapsMap; + typedef std::map ChannelMapsMap; ChannelMapsMap channelMaps; }; Index: runtime/moduleinfo.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/runtime/moduleinfo.h,v retrieving revision 1.1 diff -u -r1.1 moduleinfo.h --- runtime/moduleinfo.h 2000/06/24 09:54:25 1.1 +++ runtime/moduleinfo.h 2001/02/19 13:49:03 @@ -28,6 +28,6 @@ #include "artsbuilder.h" -Arts::ModuleInfo makeModuleInfo(const string& name); +Arts::ModuleInfo makeModuleInfo(const std::string& name); #endif /* MODULEINFO_H */ Index: tools/choosebusdlg.cpp =================================================================== RCS file: /home/kde/kdemultimedia/arts/tools/choosebusdlg.cpp,v retrieving revision 1.3 diff -u -r1.3 choosebusdlg.cpp --- tools/choosebusdlg.cpp 2000/11/02 08:41:23 1.3 +++ tools/choosebusdlg.cpp 2001/02/19 13:49:04 @@ -33,6 +33,8 @@ #include #include +using namespace std; + static void min_size(QWidget *w) { w->setMinimumSize(w->sizeHint()); } Index: tools/midiinstdlg.h =================================================================== RCS file: /home/kde/kdemultimedia/arts/tools/midiinstdlg.h,v retrieving revision 1.1 diff -u -r1.1 midiinstdlg.h --- tools/midiinstdlg.h 2000/12/09 03:10:10 1.1 +++ tools/midiinstdlg.h 2001/02/19 13:49:04 @@ -31,6 +31,6 @@ QComboBox *box; public: MidiInstDlg(QWidget *parent); - string filename(); + std::string filename(); }; #endif