[rkward-cvs] rkward/rkward/windows rkcommandeditorwindow.cpp,1.16,1.17 rkcommandeditorwindow.h,1.11,1.12

[Thomas Friedrichsmeier]

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

Modified Files:
	rkcommandeditorwindow.cpp rkcommandeditorwindow.h 
Log Message:
Removing some dead code, and unused classes I stumbled across. Of course this is not even the tip of the iceberg...

Index: rkcommandeditorwindow.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkcommandeditorwindow.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** rkcommandeditorwindow.cpp	29 Apr 2005 16:47:29 -0000	1.16
--- rkcommandeditorwindow.cpp	12 Sep 2005 20:39:46 -0000	1.17
***************
*** 17,23 ****
  #include "rkcommandeditorwindow.h"
  
- #include <kate/document.h>
- #include <kate/view.h>
  #include <kparts/partmanager.h>
  
  #include <ktexteditor/configinterface.h>
--- 17,24 ----
  #include "rkcommandeditorwindow.h"
  
  #include <kparts/partmanager.h>
+ #include <kparts/mainwindow.h>
+ #include <kparts/part.h>
+ #include <kparts/factory.h>
  
  #include <ktexteditor/configinterface.h>
***************
*** 29,34 ****
  #include <ktexteditor/popupmenuinterface.h>
  
- 
- 
  #include <qlayout.h>
  #include <qpopupmenu.h>
--- 30,33 ----
***************
*** 48,52 ****
  #include <klibloader.h>
  
- 
  #include "../rbackend/rinterface.h"
  #include "../rkeditormanager.h"
--- 47,50 ----
***************
*** 61,75 ****
  RKCommandEditorWindow::RKCommandEditorWindow (QWidget *parent) : KMdiChildView (parent) {
  	RK_TRACE (COMMANDEDITOR);
! 	
! 	
! 	/*m_library = KLibLoader::self()->library("libkatepart");
! 	m_doc = (Kate::Document *) m_library->factory ()->create (0L,"kate","KTextEditor::Document");
! 	m_view = (Kate::View *)m_doc->createView(this);
! 	m_view->setName("Kate Part View");
! 	setRHighlighting(m_doc);
! 	pLayout = new QHBoxLayout( this, 0, -1, "layout");
! 	pLayout->addWidget(m_view);
!  
! 	(RKGlobals::rkApp()->m_manager)->addPart((KParts::Part*)m_view,false);*/
  
  	KLibFactory *factory = KLibLoader::self()->factory( "libkatepart" );
--- 59,63 ----
  RKCommandEditorWindow::RKCommandEditorWindow (QWidget *parent) : KMdiChildView (parent) {
  	RK_TRACE (COMMANDEDITOR);
!     KParts::ReadWritePart *m_katepart;
  
  	KLibFactory *factory = KLibLoader::self()->factory( "libkatepart" );
***************
*** 83,107 ****
  	//m_katepart->widget()->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
  
- 
- 
  	m_doc = (Kate::Document *) m_katepart;
  	m_view = (Kate::View *) m_katepart->widget();
  
! 	pLayout = new QHBoxLayout( this, 0, -1, "layout");
! 	pLayout->addWidget(m_katepart->widget());
! 
  
  	m_view->setName("Kate Part View");
  	setRHighlighting(m_doc);
- 
- 
- 	connect (this, SIGNAL (gotFocus (KMdiChildView *)), this, SLOT (slotGotFocus ()));
- 	connect (this, SIGNAL (lostFocus (KMdiChildView *)), this, SLOT (slotLostFocus ()));
- 
  }
  
  RKCommandEditorWindow::~RKCommandEditorWindow () {
  	RK_TRACE (COMMANDEDITOR);
- 	delete pLayout;
  	delete m_doc;
  }
--- 71,86 ----
  	//m_katepart->widget()->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
  
  	m_doc = (Kate::Document *) m_katepart;
  	m_view = (Kate::View *) m_katepart->widget();
  
! 	QHBoxLayout *pLayout = new QHBoxLayout( this, 0, -1, "layout");
! 	pLayout->addWidget(m_view);
  
  	m_view->setName("Kate Part View");
  	setRHighlighting(m_doc);
  }
  
  RKCommandEditorWindow::~RKCommandEditorWindow () {
  	RK_TRACE (COMMANDEDITOR);
  	delete m_doc;
  }
***************
*** 151,175 ****
  
  
- #include "rkcommandeditorwindow.moc"
- 
- 
- 
- void RKCommandEditorWindow::slotGotFocus()
- {
- 
- 	//RKGlobals::rkApp()->guiFactory()->addClient( m_view );
- 	
- 	//RKGlobals::rkApp()->changeGUI((KParts::Part *) this );//createGUI((KParts::Part *) m_view );
- }
- 
- 
- 
- void RKCommandEditorWindow::slotLostFocus()
- {
- 	//RKGlobals::rkApp()->guiFactory()->removeClient(m_view);
- }
- 
- 
- 
  bool RKCommandEditorWindow::openURL(const KURL &url){
  	if (m_doc->openURL(url)){
--- 130,133 ----

Index: rkcommandeditorwindow.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkcommandeditorwindow.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** rkcommandeditorwindow.h	29 Apr 2005 16:47:29 -0000	1.11
--- rkcommandeditorwindow.h	12 Sep 2005 20:39:46 -0000	1.12
***************
*** 24,31 ****
  #include <kate/view.h>
  #include <kate/document.h>
- #include <kparts/mainwindow.h>
- #include <kparts/partmanager.h>
- #include <kparts/part.h>
- #include <kparts/factory.h>
  
  #include <kmdichildview.h>
--- 24,27 ----
***************
*** 49,53 ****
  */
  class RKCommandEditorWindow : public KMdiChildView, public RCommandReceiver {
- Q_OBJECT
  public:
      RKCommandEditorWindow (QWidget *parent = 0);
--- 45,48 ----
***************
*** 76,92 ****
  	
  	void setRHighlighting (Kate::Document *doc);
- 	KLibrary *m_library;
  	bool getFilenameAndPath(const KURL &url,QString *fname);
-     
- 	QBoxLayout* pLayout;
- private slots:
-     void slotGotFocus();
-     void slotLostFocus();
- 
- 
  private:
      void updateTabCaption(const KURL &url);
      RCommandChain *chain;
-     KParts::ReadWritePart *m_katepart;
  };
  
--- 71,78 ----