[rkward-cvs] SF.net SVN: rkward: [2118] branches/KDE4_port/rkward/windows
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Tue Oct 23 15:44:13 UTC 2007
Revision: 2118
http://rkward.svn.sourceforge.net/rkward/?rev=2118&view=rev
Author: tfry
Date: 2007-10-23 08:44:12 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
Some easy Qt3 support removals
Modified Paths:
--------------
branches/KDE4_port/rkward/windows/rkcommandlog.h
branches/KDE4_port/rkward/windows/rkhelpsearchwindow.cpp
branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp
branches/KDE4_port/rkward/windows/rkwindowcatcher.cpp
branches/KDE4_port/rkward/windows/rkwindowcatcher.h
branches/KDE4_port/rkward/windows/rkworkplace.h
branches/KDE4_port/rkward/windows/rkworkplaceview.cpp
Modified: branches/KDE4_port/rkward/windows/rkcommandlog.h
===================================================================
--- branches/KDE4_port/rkward/windows/rkcommandlog.h 2007-10-23 15:25:09 UTC (rev 2117)
+++ branches/KDE4_port/rkward/windows/rkcommandlog.h 2007-10-23 15:44:12 UTC (rev 2118)
@@ -27,7 +27,6 @@
class RCommand;
class ROutput;
-class Q3TextEdit;
class RKCommandLogView;
class RKCommandLogPart;
Modified: branches/KDE4_port/rkward/windows/rkhelpsearchwindow.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkhelpsearchwindow.cpp 2007-10-23 15:25:09 UTC (rev 2117)
+++ branches/KDE4_port/rkward/windows/rkhelpsearchwindow.cpp 2007-10-23 15:44:12 UTC (rev 2118)
@@ -28,10 +28,9 @@
#include <qlayout.h>
#include <qlabel.h>
#include <qpushbutton.h>
-//Added by qt3to4:
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
#include <QFocusEvent>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include "../rbackend/rinterface.h"
#include "../rbackend/rcommandreceiver.h"
@@ -53,10 +52,12 @@
initializeActivationSignals ();
setFocusPolicy (Qt::ClickFocus);
- Q3VBoxLayout* main_layout = new Q3VBoxLayout (this, RKGlobals::marginHint (), RKGlobals::spacingHint ());
- Q3HBoxLayout* selection_layout = new Q3HBoxLayout (main_layout, RKGlobals::spacingHint ());
+ QVBoxLayout* main_layout = new QVBoxLayout (this);
+ QHBoxLayout* selection_layout = new QHBoxLayout (main_layout);
+ selection_layout->setContentsMargins (0, 0, 0, 0);
- Q3VBoxLayout* labels_layout = new Q3VBoxLayout (selection_layout, RKGlobals::spacingHint ());
+ QVBoxLayout* labels_layout = new QVBoxLayout (selection_layout);
+ labels_layout->setContentsMargins (0, 0, 0, 0);
QLabel *label = new QLabel (i18n ("Find:"), this);
label->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Minimum);
labels_layout->addWidget (label);
@@ -64,13 +65,15 @@
label->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Minimum);
labels_layout->addWidget (label);
- Q3VBoxLayout* main_settings_layout = new Q3VBoxLayout (selection_layout, RKGlobals::spacingHint ());
+ QVBoxLayout* main_settings_layout = new QVBoxLayout (selection_layout, RKGlobals::spacingHint ());
+ main_settings_layout->setContentsMargins (0, 0, 0, 0);
field = new QComboBox (true, this);
field->setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
connect (field->lineEdit () , SIGNAL (returnPressed ()), this, SLOT (slotFindButtonClicked ()));
main_settings_layout->addWidget (field);
- Q3HBoxLayout* fields_packages_layout = new Q3HBoxLayout (main_settings_layout, RKGlobals::spacingHint ());
+ QHBoxLayout* fields_packages_layout = new QHBoxLayout (main_settings_layout, RKGlobals::spacingHint ());
+ fields_packages_layout->setContentsMargins (0, 0, 0, 0);
fieldsList = new QComboBox (false, this);
// HACK the sequence of options is hardcoded, do not modify
fieldsList->insertItem (i18n("All"));
@@ -87,7 +90,8 @@
packagesList->insertItem (i18n("All"));
fields_packages_layout->addWidget (packagesList);
- Q3VBoxLayout* checkboxes_layout = new Q3VBoxLayout (selection_layout, RKGlobals::spacingHint ());
+ QVBoxLayout* checkboxes_layout = new QVBoxLayout (selection_layout, RKGlobals::spacingHint ());
+ checkboxes_layout->setContentsMargins (0, 0, 0, 0);
caseSensitiveCheckBox = new QCheckBox (i18n ("Case sensitive"), this);
checkboxes_layout->addWidget (caseSensitiveCheckBox);
fuzzyCheckBox = new QCheckBox (i18n ("Fuzzy matching"), this);
Modified: branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp 2007-10-23 15:25:09 UTC (rev 2117)
+++ branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp 2007-10-23 15:44:12 UTC (rev 2118)
@@ -31,8 +31,7 @@
#include <qlayout.h>
#include <qtimer.h>
#include <qdir.h>
-//Added by qt3to4:
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
#include "../rkglobals.h"
#include "rkhelpsearchwindow.h"
@@ -57,7 +56,8 @@
setFocusProxy (khtmlpart->widget ());
khtmlpart->widget ()->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding);
- Q3HBoxLayout *pLayout = new Q3HBoxLayout (this);
+ QHBoxLayout *pLayout = new QHBoxLayout (this);
+ pLayout->setContentsMargins (0, 0, 0, 0);
pLayout->addWidget (khtmlpart->widget ());
// We have to connect this in order to allow browsing.
Modified: branches/KDE4_port/rkward/windows/rkwindowcatcher.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkwindowcatcher.cpp 2007-10-23 15:25:09 UTC (rev 2117)
+++ branches/KDE4_port/rkward/windows/rkwindowcatcher.cpp 2007-10-23 15:44:12 UTC (rev 2118)
@@ -100,15 +100,16 @@
initializeActivationSignals ();
setFocusPolicy (Qt::ClickFocus);
- Q3VBoxLayout *layout = new Q3VBoxLayout (this);
- box_widget = new Q3VBox (this);
+ QVBoxLayout *layout = new QVBoxLayout (this);
+ layout->setContentsMargins (0, 0, 0, 0);
+ box_widget = new KVBox (this);
layout->addWidget (box_widget);
scroll_widget = new Q3ScrollView (this);
scroll_widget->setFrameStyle (Q3Frame::NoFrame);
scroll_widget->hide ();
layout->addWidget (scroll_widget);
//KDE4 TODO: workaround below still needed?
- xembed_container = new Q3VBox (box_widget); // QXEmbed can not be reparented (between the box_widget, and the scroll_widget) directly. Therefore we place it into a container, and reparent that instead
+ xembed_container = new KVBox (box_widget); // QXEmbed can not be reparented (between the box_widget, and the scroll_widget) directly. Therefore we place it into a container, and reparent that instead
dynamic_size = true;
dynamic_size_action->setChecked (true);
Modified: branches/KDE4_port/rkward/windows/rkwindowcatcher.h
===================================================================
--- branches/KDE4_port/rkward/windows/rkwindowcatcher.h 2007-10-23 15:25:09 UTC (rev 2117)
+++ branches/KDE4_port/rkward/windows/rkwindowcatcher.h 2007-10-23 15:44:12 UTC (rev 2118)
@@ -79,7 +79,7 @@
class KToggleAction;
class QXEmbedCopy;
class Q3ScrollView;
-class Q3VBox;
+class KVBox;
class RKProgressControl;
class QX11EmbedContainer;
@@ -123,9 +123,9 @@
friend class RKCaughtX11WindowPart; // needs access to the actions
int device_number;
WId embedded;
- Q3VBox *xembed_container;
+ KVBox *xembed_container;
Q3ScrollView *scroll_widget;
- Q3VBox *box_widget;
+ KVBox *box_widget;
RKProgressControl *error_dialog;
QX11EmbedContainer *capture;
Modified: branches/KDE4_port/rkward/windows/rkworkplace.h
===================================================================
--- branches/KDE4_port/rkward/windows/rkworkplace.h 2007-10-23 15:25:09 UTC (rev 2117)
+++ branches/KDE4_port/rkward/windows/rkworkplace.h 2007-10-23 15:44:12 UTC (rev 2118)
@@ -18,7 +18,7 @@
#ifndef RKWORKPLACE_H
#define RKWORKPLACE_H
-#include <q3valuelist.h>
+#include <qlist.h>
#include <qstring.h>
#include <qtabwidget.h>
#include <QSplitter>
@@ -56,8 +56,8 @@
void updateActions ();
RKMDIWindow *current;
- Q3ValueList<RKMDIWindow *> back_list;
- Q3ValueList<RKMDIWindow *> forward_list;
+ QList<RKMDIWindow *> back_list;
+ QList<RKMDIWindow *> forward_list;
KAction *next_action;
KAction *prev_action;
};
@@ -77,7 +77,7 @@
RKWorkplaceView *view () { return wview; };
/** convenience typedef: A list of RKMDIWindow s */
- typedef Q3ValueList<RKMDIWindow *> RKWorkplaceObjectList;
+ typedef QList<RKMDIWindow *> RKWorkplaceObjectList;
/** Returns a list of all windows in the workplace. */
RKWorkplaceObjectList getObjectList () { return windows; };
/** Returns a list of all windows with a given type and state */
Modified: branches/KDE4_port/rkward/windows/rkworkplaceview.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkworkplaceview.cpp 2007-10-23 15:25:09 UTC (rev 2117)
+++ branches/KDE4_port/rkward/windows/rkworkplaceview.cpp 2007-10-23 15:44:12 UTC (rev 2118)
@@ -27,8 +27,6 @@
#include <qevent.h>
#include <qlayout.h>
#include <qicon.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
#include "rkmdiwindow.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list