[rkward-cvs] rkward/rkward rkwatch.cpp,1.35,1.36 rkwatch.h,1.16,1.17 robjectbrowser.cpp,1.16,1.17 robjectbrowser.h,1.9,1.10

[Thomas Friedrichsmeier]

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

Modified Files:
	rkwatch.cpp rkwatch.h robjectbrowser.cpp robjectbrowser.h 
Log Message:
Removing obsoleted rembed-, and rktogglewidget-files.

Index: rkwatch.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkwatch.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** rkwatch.cpp	15 Apr 2005 20:03:09 -0000	1.35
--- rkwatch.cpp	25 Sep 2005 18:45:44 -0000	1.36
***************
*** 38,42 ****
  #include "debug.h"
  
! RKwatch::RKwatch(RInterface *parent) : RKToggleWidget () {
  	RK_TRACE (APP);
  	
--- 38,42 ----
  #include "debug.h"
  
! RKwatch::RKwatch () : QWidget () {
  	RK_TRACE (APP);
  	
***************
*** 52,57 ****
  	
  	clearWatch ();
- 	
- 	r_inter = parent;
  }
  
--- 52,55 ----

Index: rkwatch.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkwatch.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** rkwatch.h	19 Apr 2005 06:48:06 -0000	1.16
--- rkwatch.h	25 Sep 2005 18:45:44 -0000	1.17
***************
*** 19,28 ****
  #define RKWATCH_H
  
- #include "misc/rktogglewidget.h"
- 
  #include <qstring.h>
  
- class RInterface;
- class RCommand;
  class RCommand;
  class QPushButton;
--- 19,25 ----
  #define RKWATCH_H
  
  #include <qstring.h>
+ #include <qwidget.h>
  
  class RCommand;
  class QPushButton;
***************
*** 36,43 ****
  */
  
! class RKwatch : public RKToggleWidget {
  	Q_OBJECT
  public: 
! 	RKwatch(RInterface *parent);
  	~RKwatch();
  /** Adds input to the watch-window (i.e. commands issued) */
--- 33,40 ----
  */
  
! class RKwatch : public QWidget {
  	Q_OBJECT
  public: 
! 	RKwatch ();
  	~RKwatch();
  /** Adds input to the watch-window (i.e. commands issued) */
***************
*** 53,58 ****
  private:
  	void addInputNoCheck (RCommand *command);
- /** Pointer to the R-Interface */
- 	RInterface *r_inter;
  
  	QTextEdit *watch;
--- 50,53 ----

Index: robjectbrowser.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/robjectbrowser.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** robjectbrowser.cpp	28 Apr 2005 21:29:12 -0000	1.16
--- robjectbrowser.cpp	25 Sep 2005 18:45:44 -0000	1.17
***************
*** 38,42 ****
  #include "debug.h"
  
! RObjectBrowser::RObjectBrowser () : RKToggleWidget () {
  	QGridLayout *grid = new QGridLayout (this, 1, 1);
  	QVBoxLayout *vbox = new QVBoxLayout ();
--- 38,42 ----
  #include "debug.h"
  
! RObjectBrowser::RObjectBrowser () : QWidget () {
  	QGridLayout *grid = new QGridLayout (this, 1, 1);
  	QVBoxLayout *vbox = new QVBoxLayout ();

Index: robjectbrowser.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/robjectbrowser.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** robjectbrowser.h	22 Apr 2005 14:52:55 -0000	1.9
--- robjectbrowser.h	25 Sep 2005 18:45:44 -0000	1.10
***************
*** 18,22 ****
  #define ROBJECTBROWSER_H
  
! #include "misc/rktogglewidget.h"
  
  class RKObjectListView;
--- 18,22 ----
  #define ROBJECTBROWSER_H
  
! #include <qwidget.h>
  
  class RKObjectListView;
***************
*** 33,38 ****
  @author Thomas Friedrichsmeier
  */
! class RObjectBrowser : public RKToggleWidget
! {
  Q_OBJECT
  public:
--- 33,37 ----
  @author Thomas Friedrichsmeier
  */
! class RObjectBrowser : public QWidget {
  Q_OBJECT
  public: