diff -c -r vstgl-0.6.1.orig/CAboutBox.h vstgl-0.6.1/CAboutBox.h *** vstgl-0.6.1.orig/CAboutBox.h Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/CAboutBox.h Wed Sep 25 19:20:28 2002 *************** *** 53,56 **** */ CAboutBox( QWidget *parent, QString name ); ! }; \ No newline at end of file --- 53,56 ---- */ CAboutBox( QWidget *parent, QString name ); ! }; diff -c -r vstgl-0.6.1.orig/CDoc.cpp vstgl-0.6.1/CDoc.cpp *** vstgl-0.6.1.orig/CDoc.cpp Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/CDoc.cpp Wed Sep 25 19:14:50 2002 *************** *** 42,47 **** --- 42,49 ---- #include "Pixmaps/link.xbm" #include "Pixmaps/linkmask.xbm" + #include + using namespace std; extern CSettings Settings; *************** *** 2075,2094 **** //QFileDialog *dlg = new QFileDialog( this, "eps dialog", true ); QFileDialog *dlg = new QFileDialog( ".", "Encapsulated PostScript (*.eps)", this, "eps dialog", true ); dlg->setCaption( "EPS Writer" ); QString str = m_doc_name.left( m_doc_name.length()-3 ); str = str.append( "eps" ); //QString fileName = dlg.getSaveFileName( str, "*.eps", this, "EPS" ); dlg->setSelection( str ); dlg->setFilter( "Encapsulated PostScript (*.eps)" ); ! if( !dlg->exec() ) return; ! QString fileName = dlg->selectedFile(); if( fileName.isEmpty() ) return; ! QFile f( d.filePath(fileName) ); if ( f.open(IO_WriteOnly) ) { // file opened successfully QTextStream t( &f ); // use a text stream --- 2077,2097 ---- //QFileDialog *dlg = new QFileDialog( this, "eps dialog", true ); QFileDialog *dlg = new QFileDialog( ".", "Encapsulated PostScript (*.eps)", this, "eps dialog", true ); + dlg->setMode(QFileDialog::AnyFile); dlg->setCaption( "EPS Writer" ); QString str = m_doc_name.left( m_doc_name.length()-3 ); str = str.append( "eps" ); //QString fileName = dlg.getSaveFileName( str, "*.eps", this, "EPS" ); dlg->setSelection( str ); dlg->setFilter( "Encapsulated PostScript (*.eps)" ); ! if( dlg->exec()!= QDialog::Accepted ) return; ! //cout<<"dialog finished\n"; QString fileName = dlg->selectedFile(); if( fileName.isEmpty() ) return; ! //cout<<"got fname "< #include #include #include #include ! // --- 12,24 ---- // ////////////////////////////////////////////////////////////////////////////////// #include "CDoc.h" ! #include #include #include #include #include ! #include ! using namespace std; // Only in vstgl-0.6.1: CDoc_file.cpp.bak diff -c -r vstgl-0.6.1.orig/CHObject.h vstgl-0.6.1/CHObject.h *** vstgl-0.6.1.orig/CHObject.h Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/CHObject.h Wed Sep 25 17:26:50 2002 *************** *** 25,33 **** */ ! class CHObject/* : public QWidget*/ { ! Q_OBJECT private: // Dummy member variable --- 25,33 ---- */ ! class CHObject /*: public QObject*/ { ! //Q_OBJECT private: // Dummy member variable diff -c -r vstgl-0.6.1.orig/CHProp.cpp vstgl-0.6.1/CHProp.cpp *** vstgl-0.6.1.orig/CHProp.cpp Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/CHProp.cpp Wed Sep 25 19:21:34 2002 *************** *** 27,33 **** * ****************************************************************************/ #include "CHProp.h" ! CHProp::CHProp( QWidget *parent, const char *name, CDoc *pDoc ) : QDialog( parent, name, true ) --- 27,34 ---- * ****************************************************************************/ #include "CHProp.h" ! #include "iostream" ! using namespace std; CHProp::CHProp( QWidget *parent, const char *name, CDoc *pDoc ) : QDialog( parent, name, true ) diff -c -r vstgl-0.6.1.orig/CMainApp.cpp vstgl-0.6.1/CMainApp.cpp *** vstgl-0.6.1.orig/CMainApp.cpp Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/CMainApp.cpp Wed Sep 25 19:20:21 2002 *************** *** 697,700 **** void CMainApp::StylePlatinum() { qApp->setStyle( new QPlatinumStyle ); ! } \ No newline at end of file --- 697,700 ---- void CMainApp::StylePlatinum() { qApp->setStyle( new QPlatinumStyle ); ! } diff -c -r vstgl-0.6.1.orig/CNet.cpp vstgl-0.6.1/CNet.cpp *** vstgl-0.6.1.orig/CNet.cpp Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/CNet.cpp Wed Sep 25 19:22:57 2002 *************** *** 1,5 **** #include // strcpy(), strcmp(). ! #include #include #include "Simulation.h" #include "CPlace.h" --- 1,5 ---- #include // strcpy(), strcmp(). ! #include #include #include "Simulation.h" #include "CPlace.h" *************** *** 192,198 **** #ifdef _DEBUG cout << ">> Net Builder connects " << A->GetName() << " to: " << B->GetName() << endl; ! #endif; } } --- 192,198 ---- #ifdef _DEBUG cout << ">> Net Builder connects " << A->GetName() << " to: " << B->GetName() << endl; ! #endif } } *************** *** 265,271 **** #ifdef _DEBUG cout << ">> The Net consist of : " << m_components.GetCount() << " komponenter" << endl; ! #endif; int i = 0; --- 265,271 ---- #ifdef _DEBUG cout << ">> The Net consist of : " << m_components.GetCount() << " komponenter" << endl; ! #endif int i = 0; *************** *** 273,279 **** m_ptr = GetCompFromIndex(i); #ifdef _DEBUG cout << ">> " << i << " : " << m_ptr->GetName() << endl; ! #endif; i++; } } --- 273,279 ---- m_ptr = GetCompFromIndex(i); #ifdef _DEBUG cout << ">> " << i << " : " << m_ptr->GetName() << endl; ! #endif i++; } } *************** *** 327,333 **** #ifdef _DEBUG cout << ">> Fire network: " << endl; ! #endif; m_last_fired.RemoveAll(); --- 327,333 ---- #ifdef _DEBUG cout << ">> Fire network: " << endl; ! #endif m_last_fired.RemoveAll(); *************** *** 353,359 **** else { #ifdef _DEBUG cout << ">> DEAD-LOCK detected!" << endl; ! #endif; } return &m_last_fired; --- 353,359 ---- else { #ifdef _DEBUG cout << ">> DEAD-LOCK detected!" << endl; ! #endif } return &m_last_fired; *************** *** 367,373 **** #ifdef _DEBUG cout << ">> Fire network in Parallel: " << endl; ! #endif; m_last_fired.RemoveAll(); --- 367,373 ---- #ifdef _DEBUG cout << ">> Fire network in Parallel: " << endl; ! #endif m_last_fired.RemoveAll(); diff -c -r vstgl-0.6.1.orig/CPrefs.cpp vstgl-0.6.1/CPrefs.cpp *** vstgl-0.6.1.orig/CPrefs.cpp Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/CPrefs.cpp Wed Sep 25 16:32:22 2002 *************** *** 45,60 **** tab->setShape ( QTabBar::RoundedAbove ); t1 = new QTab; ! t1->label = QString( "EPS Writer" ); tab->addTab( t1 ); t2 = new QTab; ! t2->label = QString( "Editor" ); tab->addTab( t2 ); /* t3 = new QTab; ! t3->label = QString( "Misc" ); tab->addTab( t3 ); */ --- 45,60 ---- tab->setShape ( QTabBar::RoundedAbove ); t1 = new QTab; ! t1->setText(QString( "EPS Writer" )); tab->addTab( t1 ); t2 = new QTab; ! t2->setText(QString( "Editor" )); tab->addTab( t2 ); /* t3 = new QTab; ! t3->setText(QString( "Misc" )); tab->addTab( t3 ); */ *************** *** 101,104 **** prop2->SetSettings(); done( Accepted ); ! } \ No newline at end of file --- 101,104 ---- prop2->SetSettings(); done( Accepted ); ! } diff -c -r vstgl-0.6.1.orig/CSSignal.cpp vstgl-0.6.1/CSSignal.cpp *** vstgl-0.6.1.orig/CSSignal.cpp Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/CSSignal.cpp Wed Sep 25 19:23:03 2002 *************** *** 117,120 **** m_signal_value = UNKNOWN; return false; } ! } \ No newline at end of file --- 117,120 ---- m_signal_value = UNKNOWN; return false; } ! } diff -c -r vstgl-0.6.1.orig/CSet2.cpp vstgl-0.6.1/CSet2.cpp *** vstgl-0.6.1.orig/CSet2.cpp Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/CSet2.cpp Wed Sep 25 19:24:11 2002 *************** *** 60,63 **** Settings.SetPopTransDlg( m_PopTransDlg->isChecked() ); Settings.SetGuiStyle( m_guiStyleBox->currentItem() ); ! } \ No newline at end of file --- 60,63 ---- Settings.SetPopTransDlg( m_PopTransDlg->isChecked() ); Settings.SetGuiStyle( m_guiStyleBox->currentItem() ); ! } diff -c -r vstgl-0.6.1.orig/CSet2.h vstgl-0.6.1/CSet2.h *** vstgl-0.6.1.orig/CSet2.h Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/CSet2.h Wed Sep 25 16:31:16 2002 *************** *** 6,12 **** #include #include #include ! /*! \class CSet2 CSet2.h --- 6,12 ---- #include #include #include ! #include /*! \class CSet2 CSet2.h diff -c -r vstgl-0.6.1.orig/CSettings.cpp vstgl-0.6.1/CSettings.cpp *** vstgl-0.6.1.orig/CSettings.cpp Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/CSettings.cpp Wed Sep 25 19:23:53 2002 *************** *** 19,25 **** #include #include ! #include --- 19,25 ---- #include #include ! #include *************** *** 28,37 **** // Set default values m_nb_recent_files = 0; ! m_recent1 = NULL; ! m_recent2 = NULL; ! m_recent3 = NULL; ! m_recent4 = NULL; //////// Window size and position /////// m_last_pos = QPoint( 20, 20 ); --- 28,37 ---- // Set default values m_nb_recent_files = 0; ! m_recent1 = (char*)NULL; ! m_recent2 = (char*)NULL; ! m_recent3 = (char*)NULL; ! m_recent4 = (char*)NULL; //////// Window size and position /////// m_last_pos = QPoint( 20, 20 ); *************** *** 63,69 **** m_gui_style = STYLE_CDE; // Yikes, hard-wired path! ! m_help_path = QString( "/usr/doc/vstgl-0.6.0/Help" ); } --- 63,69 ---- m_gui_style = STYLE_CDE; // Yikes, hard-wired path! ! m_help_path = QString( "/usr/share/doc/vstgl-0.6.1/Help" ); } *************** *** 159,165 **** rewrite_rc = true; //cout << "Ver. " << word << endl; } ! word = NULL; } // Position --- 159,165 ---- rewrite_rc = true; //cout << "Ver. " << word << endl; } ! word = (char*)NULL; } // Position *************** *** 171,177 **** p.setY( word.toInt() ); SetPos( p ); //cout << "Pos: " << p.x() << "," << p.y() << endl; ! word = NULL; } // Size --- 171,177 ---- p.setY( word.toInt() ); SetPos( p ); //cout << "Pos: " << p.x() << "," << p.y() << endl; ! word = (char*)NULL; } // Size *************** *** 183,214 **** sz.setHeight( word.toInt() ); SetSize( sz ); //cout << "Size: " << sz.width() << "," << sz.height() << endl; ! word = NULL; } // Recently opened files if( word == QString("recent1") ) { GetNextWord( s, word ); SetRecent1( word ); ! word = NULL; } if( word == QString("recent2") ) { GetNextWord( s, word ); SetRecent2( word ); ! word = NULL; } if( word == QString("recent3") ) { GetNextWord( s, word ); SetRecent3( word ); ! word = NULL; } if( word == QString("recent4") ) { GetNextWord( s, word ); SetRecent4( word ); ! word = NULL; } --- 183,214 ---- sz.setHeight( word.toInt() ); SetSize( sz ); //cout << "Size: " << sz.width() << "," << sz.height() << endl; ! word = (char*)NULL; } // Recently opened files if( word == QString("recent1") ) { GetNextWord( s, word ); SetRecent1( word ); ! word = (char*)NULL; } if( word == QString("recent2") ) { GetNextWord( s, word ); SetRecent2( word ); ! word = (char*)NULL; } if( word == QString("recent3") ) { GetNextWord( s, word ); SetRecent3( word ); ! word = (char*)NULL; } if( word == QString("recent4") ) { GetNextWord( s, word ); SetRecent4( word ); ! word = (char*)NULL; } *************** *** 217,264 **** GetNextWord( s, word ); int b = word.toInt(); m_use_eps_margin = (bool)b; ! word = NULL; } if( word == QString("eps_margin") ) { GetNextWord( s, word ); float b = word.toFloat(); m_eps_margin = b; ! word = NULL; } if( word == QString("eps_line_width") ) { GetNextWord( s, word ); float b = word.toFloat(); m_eps_line_width = b; ! word = NULL; } if( word == QString("eps_border") ) { GetNextWord( s, word ); int b = word.toInt(); m_eps_border = (bool)b; ! word = NULL; } if( word == QString("pop_trans_dlg") ) { GetNextWord( s, word ); int b = word.toInt(); m_pop_trans_dlg = (bool)b; ! word = NULL; } if( word == QString("gui_style") ) { GetNextWord( s, word ); int b = word.toInt(); m_gui_style = b; ! word = NULL; } if( word == QString("help_path") ) { GetNextWord( s, word ); m_help_path = word; ! word = NULL; } --- 217,264 ---- GetNextWord( s, word ); int b = word.toInt(); m_use_eps_margin = (bool)b; ! word = (char*)NULL; } if( word == QString("eps_margin") ) { GetNextWord( s, word ); float b = word.toFloat(); m_eps_margin = b; ! word = (char*)NULL; } if( word == QString("eps_line_width") ) { GetNextWord( s, word ); float b = word.toFloat(); m_eps_line_width = b; ! word = (char*)NULL; } if( word == QString("eps_border") ) { GetNextWord( s, word ); int b = word.toInt(); m_eps_border = (bool)b; ! word = (char*)NULL; } if( word == QString("pop_trans_dlg") ) { GetNextWord( s, word ); int b = word.toInt(); m_pop_trans_dlg = (bool)b; ! word = (char*)NULL; } if( word == QString("gui_style") ) { GetNextWord( s, word ); int b = word.toInt(); m_gui_style = b; ! word = (char*)NULL; } if( word == QString("help_path") ) { GetNextWord( s, word ); m_help_path = word; ! word = (char*)NULL; } *************** *** 382,399 **** void CSettings::UpdateRecent( QString file ) { ! if( m_recent1 == NULL ) { m_recent1 = file; return; } /* ! if( m_recent2 == NULL ) { if( m_recent1 != file ) m_recent2 = file; return; } ! if( m_recent3 == NULL ) { if( m_recent1 != file && m_recent2 != file ) m_recent3 = file; else { --- 382,399 ---- void CSettings::UpdateRecent( QString file ) { ! if( m_recent1 == (char*)NULL ) { m_recent1 = file; return; } /* ! if( m_recent2 == (char*)NULL ) { if( m_recent1 != file ) m_recent2 = file; return; } ! if( m_recent3 == (char*)NULL ) { if( m_recent1 != file && m_recent2 != file ) m_recent3 = file; else { *************** *** 403,409 **** return; } ! if( m_recent4 == NULL ) { m_recent4 = file; return; } --- 403,409 ---- return; } ! if( m_recent4 == (char*)NULL ) { m_recent4 = file; return; } *************** *** 542,545 **** QString CSettings::GetHelpPath() { return m_help_path; ! } \ No newline at end of file --- 542,545 ---- QString CSettings::GetHelpPath() { return m_help_path; ! } diff -c -r vstgl-0.6.1.orig/CTabCtrl.cpp vstgl-0.6.1/CTabCtrl.cpp *** vstgl-0.6.1.orig/CTabCtrl.cpp Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/CTabCtrl.cpp Wed Sep 25 16:26:07 2002 *************** *** 35,49 **** tab->setShape ( QTabBar::RoundedBelow ); t1 = new QTab; ! t1->label=QString( "Signals" ); tab->addTab( t1 ); t2 = new QTab; ! t2->label=QString( "Flow" ); tab->addTab( t2 ); t3 = new QTab; ! t3->label=QString( "File" ); tab->addTab( t3 ); wStack = new QWidgetStack( this ); --- 35,49 ---- tab->setShape ( QTabBar::RoundedBelow ); t1 = new QTab; ! t1->setText(QString( "Signals" )); tab->addTab( t1 ); t2 = new QTab; ! t2->setText(QString( "Flow" )); tab->addTab( t2 ); t3 = new QTab; ! t3->setText(QString( "File" )); tab->addTab( t3 ); wStack = new QWidgetStack( this ); diff -c -r vstgl-0.6.1.orig/CTrans.cpp vstgl-0.6.1/CTrans.cpp *** vstgl-0.6.1.orig/CTrans.cpp Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/CTrans.cpp Wed Sep 25 19:19:49 2002 *************** *** 11,17 **** #include #include #include ! #include #include #include #include "CDoc.h" --- 11,17 ---- #include #include #include ! #include #include #include #include "CDoc.h" diff -c -r vstgl-0.6.1.orig/Makefile vstgl-0.6.1/Makefile *** vstgl-0.6.1.orig/Makefile Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/Makefile Wed Sep 25 19:10:21 2002 *************** *** 19,25 **** # CXXFLAGS = -g # Release ! CXXFLAGS = -O2 LIBS = -lX11 -lXext -lSM -lpng -lz XLIBDIR = -L/usr/X11R6/lib --- 19,25 ---- # CXXFLAGS = -g # Release ! #CXXFLAGS = -O2 LIBS = -lX11 -lXext -lSM -lpng -lz XLIBDIR = -L/usr/X11R6/lib *************** *** 33,42 **** CPrefs.o CSet1.o CSet2.o CAboutBox.o SRCMOC = moc_cmainapp.cpp moc_cdoc.cpp moc_chprop.cpp moc_ctabctrl.cpp moc_csprop.cpp\ moc_cprefs.cpp moc_csettings.cpp moc_ccomp.cpp moc_cplace.cpp moc_ctrans.cpp\ ! moc_caboutbox.cpp OBJMOC = moc_cmainapp.o moc_cdoc.o moc_chprop.o moc_ctabctrl.o moc_csprop.o\ moc_cprefs.o moc_csettings.o moc_ccomp.o moc_cplace.o moc_ctrans.o\ ! moc_caboutbox.o CLEAN = *.o *~ $(SRCMOC) compile.h vstgl-linux-$(MAJOR).$(MINOR).$(VER) vstgl-linux-static-$(MAJOR).$(MINOR).$(VER) core --- 33,42 ---- CPrefs.o CSet1.o CSet2.o CAboutBox.o SRCMOC = moc_cmainapp.cpp moc_cdoc.cpp moc_chprop.cpp moc_ctabctrl.cpp moc_csprop.cpp\ moc_cprefs.cpp moc_csettings.cpp moc_ccomp.cpp moc_cplace.cpp moc_ctrans.cpp\ ! moc_caboutbox.cpp #CHObject.cpp OBJMOC = moc_cmainapp.o moc_cdoc.o moc_chprop.o moc_ctabctrl.o moc_csprop.o\ moc_cprefs.o moc_csettings.o moc_ccomp.o moc_cplace.o moc_ctrans.o\ ! moc_caboutbox.o #CHObject.o CLEAN = *.o *~ $(SRCMOC) compile.h vstgl-linux-$(MAJOR).$(MINOR).$(VER) vstgl-linux-static-$(MAJOR).$(MINOR).$(VER) core *************** *** 55,61 **** vstgl: $(OBJECTS) $(OBJMOC) $(CXX) $(OBJECTS) $(OBJMOC) $(LDFLAGS) $(QT) -o vstgl-linux-$(MAJOR).$(MINOR).$(VER) - $(STRIP) vstgl-linux-$(MAJOR).$(MINOR).$(VER) vstgl_static: $(OBJECTS) $(OBJMOC) $(CXX) $(OBJECTS) $(QTLIBDIR)/libqt.a $(OBJMOC) $(XLIBDIR) $(LIBS) -o vstgl-linux-static-$(MAJOR).$(MINOR).$(VER) --- 55,60 ---- *************** *** 109,112 **** --- 108,114 ---- moc_caboutbox.cpp: CAboutBox.h $(MOC) CAboutBox.h -o moc_caboutbox.cpp + #CHObject.cpp: CHObject.h + # $(MOC) CHObject.h -o CHObject.cpp + # DO NOT DELETE diff -c -r vstgl-0.6.1.orig/Simulation.h vstgl-0.6.1/Simulation.h *** vstgl-0.6.1.orig/Simulation.h Sat Mar 31 22:09:48 2001 --- vstgl-0.6.1/Simulation.h Wed Sep 25 19:19:01 2002 *************** *** 7,15 **** #include // rand(). //#include // CObject. //#include // CObList. ! #include // Exporting text file to Petrify. //#include "StdAfx.h" // win95 GUI header fil. ! #ifdef _DEBUG #include // cout --- 7,16 ---- #include // rand(). //#include // CObject. //#include // CObList. ! //#include // Exporting text file to Petrify. //#include "StdAfx.h" // win95 GUI header fil. ! #include ! using namespace std; #ifdef _DEBUG #include // cout *************** *** 28,31 **** enum SIGNAL_STATUS {INPUT, OUTPUT, INTERNAL, DUMMY}; ! #endif \ No newline at end of file --- 29,32 ---- enum SIGNAL_STATUS {INPUT, OUTPUT, INTERNAL, DUMMY}; ! #endif