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

[tfry at users.sourceforge.net]

Revision: 2105
          http://rkward.svn.sourceforge.net/rkward/?rev=2105&view=rev
Author:   tfry
Date:     2007-10-22 12:41:25 -0700 (Mon, 22 Oct 2007)

Log Message:
-----------
Remove Qt3 support code in RKMDIWindow

Modified Paths:
--------------
    branches/KDE4_port/rkward/windows/rkmdiwindow.cpp
    branches/KDE4_port/rkward/windows/rkmdiwindow.h
    branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp

Modified: branches/KDE4_port/rkward/windows/rkmdiwindow.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkmdiwindow.cpp	2007-10-22 19:07:10 UTC (rev 2104)
+++ branches/KDE4_port/rkward/windows/rkmdiwindow.cpp	2007-10-22 19:41:25 UTC (rev 2105)
@@ -20,9 +20,7 @@
 #include <qapplication.h>
 #include <qpainter.h>
 #include <qtimer.h>
-//Added by qt3to4:
 #include <QEvent>
-#include <Q3Frame>
 #include <QPaintEvent>
 
 #include <kparts/event.h>
@@ -34,7 +32,7 @@
 
 #include "../debug.h"
 
-RKMDIWindow::RKMDIWindow (QWidget *parent, int type, bool tool_window, const char *name) : Q3Frame (parent, name) {
+RKMDIWindow::RKMDIWindow (QWidget *parent, int type, bool tool_window, const char *name) : QFrame (parent, name) {
 	RK_TRACE (APP);
 
 	if (tool_window) {
@@ -124,8 +122,6 @@
 
 void RKMDIWindow::prepareToBeAttached () {
 	RK_TRACE (APP);
-
-	// TODO: KDE4 do we still need this?
 }
 
 void RKMDIWindow::prepareToBeDetached () {
@@ -145,7 +141,7 @@
 	if (watched == getPart ()) {
 		if (KParts::PartActivateEvent::test (e)) {
 			RK_TRACE (APP);		// trace only the "interesting" calls to this function
-qDebug ("a/d %s", fullCaption().toLatin1().data());
+
 			KParts::PartActivateEvent *ev = static_cast<KParts::PartActivateEvent *> (e);
 			if (ev->activated ()) {
 				emit (windowActivated (this));
@@ -180,7 +176,7 @@
 void RKMDIWindow::paintEvent (QPaintEvent *e) {
 	// RK_TRACE (APP); Do not trace!
 
-	Q3Frame::paintEvent (e);
+	QFrame::paintEvent (e);
 
 	if (isActive ()) {
 		QPainter paint (this);

Modified: branches/KDE4_port/rkward/windows/rkmdiwindow.h
===================================================================
--- branches/KDE4_port/rkward/windows/rkmdiwindow.h	2007-10-22 19:07:10 UTC (rev 2104)
+++ branches/KDE4_port/rkward/windows/rkmdiwindow.h	2007-10-22 19:41:25 UTC (rev 2105)
@@ -19,18 +19,17 @@
 #define RKMDIWINDOW_H
 
 #include <qwidget.h>
-//Added by qt3to4:
-#include <QEvent>
-#include <Q3Frame>
-#include <QPaintEvent>
+#include <QFrame>
 
 #include <kparts/part.h>
 
+class QEvent;
+class QPaintEvent;
 class RKWorkplace;
 class RKToolWindowBar;
 
 /** Base class for rkward document mdi windows */
-class RKMDIWindow : public Q3Frame {
+class RKMDIWindow : public QFrame {
 	Q_OBJECT
 public:
 	enum Type {

Modified: branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp	2007-10-22 19:07:10 UTC (rev 2104)
+++ branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp	2007-10-22 19:41:25 UTC (rev 2105)
@@ -26,6 +26,7 @@
 #include <kicon.h>
 
 #include <QSplitter>
+#include <QContextMenuEvent>
 
 #include "rkworkplace.h"
 #include "rkworkplaceview.h"


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