[rkward-cvs] SF.net SVN: rkward: [2045] branches/KDE4_port

[tfry at users.sourceforge.net]

Revision: 2045
          http://rkward.svn.sourceforge.net/rkward/?rev=2045&view=rev
Author:   tfry
Date:     2007-10-12 06:25:21 -0700 (Fri, 12 Oct 2007)

Log Message:
-----------
The first file finally compiles...

Modified Paths:
--------------
    branches/KDE4_port/TODO_KDE4
    branches/KDE4_port/rkward/rkward.cpp
    branches/KDE4_port/rkward/rkward.h

Modified: branches/KDE4_port/TODO_KDE4
===================================================================
--- branches/KDE4_port/TODO_KDE4	2007-10-12 13:15:36 UTC (rev 2044)
+++ branches/KDE4_port/TODO_KDE4	2007-10-12 13:25:21 UTC (rev 2045)
@@ -23,4 +23,10 @@
 rkcommandeditorwindow
 	- code completion will be broken. Fix after porting.
 	- does the popup-menu still work? See SVN rev. 962.
-	- does highlighting work?
\ No newline at end of file
+	- does highlighting work?
+
+rkward
+	- does DBUS work (i.e. opening help windows)?	
+	- does closing windows work
+	- does updating captions work (when switching windows / window url changes)?
+

Modified: branches/KDE4_port/rkward/rkward.cpp
===================================================================
--- branches/KDE4_port/rkward/rkward.cpp	2007-10-12 13:15:36 UTC (rev 2044)
+++ branches/KDE4_port/rkward/rkward.cpp	2007-10-12 13:25:21 UTC (rev 2045)
@@ -148,8 +148,6 @@
 	connect (toplevel_actions->actionCollection (), SIGNAL (clearStatusText ()), this, SLOT (slotSetStatusReady ()));
 	createShellGUI (true);
 
-	connect (this, SIGNAL (childWindowCloseRequest (KMdiChildView *)), this, SLOT (slotChildWindowCloseRequest (KMdiChildView *)));
-
 	RKGlobals::mtracker = new RKModificationTracker (this);
 	RKComponentMap::initialize ();
 
@@ -742,12 +740,6 @@
 	}
 };
 
-void RKWardMainWindow::slotChildWindowCloseRequest (KMdiChildView * window) {
-	RK_TRACE (APP);
-
-	closeWindow (window);
-}
-
 void RKWardMainWindow::openHTML (const KUrl &url) {
 	RK_TRACE (APP);
 

Modified: branches/KDE4_port/rkward/rkward.h
===================================================================
--- branches/KDE4_port/rkward/rkward.h	2007-10-12 13:15:36 UTC (rev 2044)
+++ branches/KDE4_port/rkward/rkward.h	2007-10-12 13:25:21 UTC (rev 2045)
@@ -45,10 +45,9 @@
 
 // include files for KDE 
 #include <kapplication.h>
-#include <k3mdimainfrm.h>
 #include <kaction.h>
 #include <kurl.h>
-#include <kparts/partmanager.h>
+#include <kparts/mainwindow.h>
 
 class QLabel;
 // forward declaration of the RKward classes
@@ -74,7 +73,7 @@
 /**
 The main class of rkward. This is where all strings are tied togther, controlls the initialization, and there are some of the most important slots for user actions. All real work is done elsewhere.
 */
-class RKWardMainWindow : public KMdiMainFrm, virtual public KParts::PartBase {
+class RKWardMainWindow : public KParts::MainWindow {
 	Q_OBJECT
 public:
 /** construtor
@@ -130,8 +129,6 @@
 	*/
 	virtual void readProperties(KConfig *_cfg);
 signals:
-/** no idea, why we have to declare this explicitly, but somehow we do. */
-	void childWindowCloseRequest (KMdiChildView *);
 	void aboutToQuitRKWard ();
 public slots:
 	/** creates a new (empty) data.frame */
@@ -170,9 +167,6 @@
 /** open a new command editor (load given url) */
 	void slotOpenCommandEditor (const KUrl &url);
 
-/** a child window has received a close event. Check, whether data needs to be saved. Ask if necessary. Close only if safe. */
-	void slotChildWindowCloseRequest (KMdiChildView * window);
-
 /** close current window (Windows->Close). */
 	void slotCloseWindow ();
 /** close all windows (Windows->Close All) */
@@ -183,7 +177,7 @@
 /** reimplemented from KMainWindow, to additionally include the workspace url. Actually, we also ignore the caption-parameter, as it sometimes is not the one we want. Rather we create one according to the active view */
 	void setCaption (const QString &caption);
 /** a view has been activated or deactivated. We should make sure to update the main caption to fix strange quirks */
-	void viewChanged (KMdiChildView *) { setCaption (QString::null); };
+// KDE4: do we still need this?	void viewChanged (KMdiChildView *) { setCaption (QString::null); };
 
 /** connected to m_manager->partAdded (). Connects statusbar notifications */
 	void partAdded (KParts::Part *part);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.