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

[tfry at users.sourceforge.net]

Revision: 2077
          http://rkward.svn.sourceforge.net/rkward/?rev=2077&view=rev
Author:   tfry
Date:     2007-10-15 17:11:44 -0700 (Mon, 15 Oct 2007)

Log Message:
-----------
margins

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

Modified: branches/KDE4_port/rkward/robjectbrowser.cpp
===================================================================
--- branches/KDE4_port/rkward/robjectbrowser.cpp	2007-10-15 23:49:57 UTC (rev 2076)
+++ branches/KDE4_port/rkward/robjectbrowser.cpp	2007-10-16 00:11:44 UTC (rev 2077)
@@ -32,6 +32,7 @@
 #include <klocale.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
+#include <kvbox.h>
 
 #include "rkward.h"
 #include "windows/rkhelpsearchwindow.h"
@@ -57,8 +58,9 @@
 	internal = 0;
 	locked = true;
 
-	Q3VBoxLayout *layout = new Q3VBoxLayout (this);
-	layout_widget = new Q3VBox (this);
+	QVBoxLayout *layout = new QVBoxLayout (this);
+	layout->setContentsMargins (0, 0, 0, 0);
+	layout_widget = new KVBox (this);
 	layout->addWidget (layout_widget);
 	layout_widget->setFocusPolicy (Qt::StrongFocus);
 

Modified: branches/KDE4_port/rkward/robjectbrowser.h
===================================================================
--- branches/KDE4_port/rkward/robjectbrowser.h	2007-10-15 23:49:57 UTC (rev 2076)
+++ branches/KDE4_port/rkward/robjectbrowser.h	2007-10-16 00:11:44 UTC (rev 2077)
@@ -34,7 +34,7 @@
 class RObject;
 class RKCommandEditorWindow;
 class RObjectBrowserInternal;
-class Q3VBox;
+class KVBox;
 
 /**
 This widget provides a browsable list of all objects in the R workspace
@@ -53,7 +53,7 @@
 	void showEvent (QShowEvent *e);
 private:
 	RObjectBrowserInternal *internal;
-	Q3VBox *layout_widget;
+	KVBox *layout_widget;
 
 	bool locked;
 	friend class RKWardMainWindow;

Modified: branches/KDE4_port/rkward/windows/rkfilebrowser.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkfilebrowser.cpp	2007-10-15 23:49:57 UTC (rev 2076)
+++ branches/KDE4_port/rkward/windows/rkfilebrowser.cpp	2007-10-16 00:11:44 UTC (rev 2077)
@@ -29,7 +29,7 @@
 #include <q3vbox.h>
 //Added by qt3to4:
 #include <QEvent>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 
 #include "rkworkplace.h"
 #include "../rkward.h"
@@ -45,8 +45,9 @@
 
 	real_widget = 0;
 
-	Q3VBoxLayout *layout = new Q3VBoxLayout (this);
-	layout_widget = new Q3VBox (this);
+	QVBoxLayout *layout = new QVBoxLayout (this);
+	layout->setContentsMargins (0, 0, 0, 0);
+	layout_widget = new KVBox (this);
 	layout->addWidget (layout_widget);
 	layout_widget->setFocusPolicy (Qt::StrongFocus);
 
@@ -80,7 +81,7 @@
 
 
 
-RKFileBrowserWidget::RKFileBrowserWidget (QWidget *parent) : Q3VBox (parent) {
+RKFileBrowserWidget::RKFileBrowserWidget (QWidget *parent) : KVBox (parent) {
 	RK_TRACE (APP);
 
 	KToolBar *toolbar = new KToolBar (this);

Modified: branches/KDE4_port/rkward/windows/rkfilebrowser.h
===================================================================
--- branches/KDE4_port/rkward/windows/rkfilebrowser.h	2007-10-15 23:49:57 UTC (rev 2076)
+++ branches/KDE4_port/rkward/windows/rkfilebrowser.h	2007-10-16 00:11:44 UTC (rev 2077)
@@ -20,9 +20,7 @@
 
 #include "rkmdiwindow.h"
 
-#include <q3vbox.h>
-//Added by qt3to4:
-#include <QEvent>
+#include <kvbox.h>
 
 class KDirOperator;
 class RKFileBrowserWidget;
@@ -43,7 +41,7 @@
 	void currentWDChanged ();
 private:
 	RKFileBrowserWidget *real_widget;
-	Q3VBox *layout_widget;
+	KVBox *layout_widget;
 friend class RKWardMainWindow;
 	static RKFileBrowser *main_browser;
 };
@@ -51,7 +49,7 @@
 /** The internal widget used in RKFileBrowser 
 TODO: KDE4: check whether there is a ready widget for this. Much of the implementation is a modified copy from Kate / kdevelop.
 */
-class RKFileBrowserWidget : public Q3VBox {
+class RKFileBrowserWidget : public KVBox {
 	Q_OBJECT
 public:
 	RKFileBrowserWidget (QWidget *widget);

Modified: branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp	2007-10-15 23:49:57 UTC (rev 2076)
+++ branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp	2007-10-16 00:11:44 UTC (rev 2077)
@@ -51,6 +51,8 @@
 	RK_ASSERT (!container);
 
 	container = new KHBox (splitter);
+	splitter->setContentsMargins (0, 0, 0, 0);
+	container->layout ()->setContentsMargins (0, 0, 0, 0);
 	container->layout ()->setSpacing (0);
 	container->layout ()->setMargin (0);
 	container->hide ();


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