[rkward-cvs] rkward/rkward robjectviewer.cpp,1.6,1.7 robjectviewer.h,1.1,1.2

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9676

Modified Files:
	robjectviewer.cpp robjectviewer.h 
Log Message:
Sigh. Old no longer needed code everywhere I look. Use RCommandReceiver::deleteThis in RObjectViewer

Index: robjectviewer.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/robjectviewer.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** robjectviewer.cpp	9 Dec 2005 14:05:13 -0000	1.6
--- robjectviewer.cpp	9 Dec 2005 14:14:35 -0000	1.7
***************
*** 58,63 ****
  	RCommand *command = new RCommand ("print (" + object->getFullName () + ")", RCommand::App, QString::null, this);
  	RKGlobals::rInterface ()->issueCommand (command, 0);
- 	waiting = true;
- 	destruct = false;
  	
  	caption = i18n("Object Viewer: ") + object->getShortName ();
--- 58,61 ----
***************
*** 77,97 ****
  		view_area->append (i18n("\nSome errors occured: ") + command->error ());
  	}
- 	
- 	if (destruct) {
- 		delete this;
- 		return;
- 	}
  }
  
  void RObjectViewer::closeEvent (QCloseEvent *e) {
! 	if (!waiting) {
! 		e->accept ();
! 		delete this;
! 		return;
! 	} else {
! 		destruct = true;
! 		e->accept ();
! 		hide ();
! 	}
  }
  
--- 75,84 ----
  		view_area->append (i18n("\nSome errors occured: ") + command->error ());
  	}
  }
  
  void RObjectViewer::closeEvent (QCloseEvent *e) {
! 	e->accept ();
! 	if (numCommandsOut ()) hide ();
! 	deleteThis ();
  }
  

Index: robjectviewer.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/robjectviewer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** robjectviewer.h	24 Aug 2004 10:20:30 -0000	1.1
--- robjectviewer.h	9 Dec 2005 14:14:35 -0000	1.2
***************
*** 43,48 ****
  private:
  	QTextEdit *view_area;
- 	bool waiting;
- 	bool destruct;
  	QString caption;
  };
--- 43,46 ----