[rkward-cvs] SF.net SVN: rkward: [2038] branches/KDE4_port/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Oct 8 15:05:13 UTC 2007
Revision: 2038
http://rkward.svn.sourceforge.net/rkward/?rev=2038&view=rev
Author: tfry
Date: 2007-10-08 08:05:13 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
qt3to4 script results
Modified Paths:
--------------
branches/KDE4_port/rkward/agents/showedittextfileagent.cpp
branches/KDE4_port/rkward/core/rcontainerobject.cpp
branches/KDE4_port/rkward/core/rfunctionobject.h
branches/KDE4_port/rkward/core/rkvariable.cpp
branches/KDE4_port/rkward/core/rkvariable.h
branches/KDE4_port/rkward/core/robjectlist.cpp
branches/KDE4_port/rkward/dataeditor/celleditor.cpp
branches/KDE4_port/rkward/dataeditor/celleditor.h
branches/KDE4_port/rkward/dataeditor/editformatdialog.cpp
branches/KDE4_port/rkward/dataeditor/editformatdialog.h
branches/KDE4_port/rkward/dataeditor/editlabelsdialog.cpp
branches/KDE4_port/rkward/dataeditor/editlabelsdialog.h
branches/KDE4_port/rkward/dataeditor/rkdrag.cpp
branches/KDE4_port/rkward/dataeditor/rkdrag.h
branches/KDE4_port/rkward/dataeditor/rkeditordataframe.cpp
branches/KDE4_port/rkward/dataeditor/twintable.cpp
branches/KDE4_port/rkward/dataeditor/twintable.h
branches/KDE4_port/rkward/dataeditor/twintabledatamember.cpp
branches/KDE4_port/rkward/dataeditor/twintablemember.cpp
branches/KDE4_port/rkward/dataeditor/twintablemember.h
branches/KDE4_port/rkward/dialogs/rkimportdialog.cpp
branches/KDE4_port/rkward/dialogs/rkimportdialog.h
branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.cpp
branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.h
branches/KDE4_port/rkward/dialogs/rkreadlinedialog.cpp
branches/KDE4_port/rkward/dialogs/startupdialog.cpp
branches/KDE4_port/rkward/dialogs/startupdialog.h
branches/KDE4_port/rkward/misc/getfilenamewidget.cpp
branches/KDE4_port/rkward/misc/multistringselector.cpp
branches/KDE4_port/rkward/misc/multistringselector.h
branches/KDE4_port/rkward/misc/rkcanceldialog.cpp
branches/KDE4_port/rkward/misc/rkcanceldialog.h
branches/KDE4_port/rkward/misc/rkcommonfunctions.cpp
branches/KDE4_port/rkward/misc/rkobjectlistview.cpp
branches/KDE4_port/rkward/misc/rkobjectlistview.h
branches/KDE4_port/rkward/misc/rkprogresscontrol.cpp
branches/KDE4_port/rkward/misc/rkprogresscontrol.h
branches/KDE4_port/rkward/misc/rksaveobjectchooser.cpp
branches/KDE4_port/rkward/misc/xmlhelper.cpp
branches/KDE4_port/rkward/misc/xmlhelper.h
branches/KDE4_port/rkward/plugin/rkcheckbox.cpp
branches/KDE4_port/rkward/plugin/rkcomponent.cpp
branches/KDE4_port/rkward/plugin/rkcomponent.h
branches/KDE4_port/rkward/plugin/rkcomponentcontext.cpp
branches/KDE4_port/rkward/plugin/rkcomponentproperties.cpp
branches/KDE4_port/rkward/plugin/rkcomponentproperties.h
branches/KDE4_port/rkward/plugin/rkdropdown.cpp
branches/KDE4_port/rkward/plugin/rkdropdown.h
branches/KDE4_port/rkward/plugin/rkformula.cpp
branches/KDE4_port/rkward/plugin/rkformula.h
branches/KDE4_port/rkward/plugin/rkinput.cpp
branches/KDE4_port/rkward/plugin/rkinput.h
branches/KDE4_port/rkward/plugin/rkpluginbrowser.cpp
branches/KDE4_port/rkward/plugin/rkpluginsaveobject.cpp
branches/KDE4_port/rkward/plugin/rkpluginspinbox.cpp
branches/KDE4_port/rkward/plugin/rkpreviewbox.cpp
branches/KDE4_port/rkward/plugin/rkpreviewbox.h
branches/KDE4_port/rkward/plugin/rkradio.cpp
branches/KDE4_port/rkward/plugin/rkradio.h
branches/KDE4_port/rkward/plugin/rkstandardcomponent.cpp
branches/KDE4_port/rkward/plugin/rkstandardcomponent.h
branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.cpp
branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.h
branches/KDE4_port/rkward/plugin/rktabpage.cpp
branches/KDE4_port/rkward/plugin/rktabpage.h
branches/KDE4_port/rkward/plugin/rktext.cpp
branches/KDE4_port/rkward/plugin/rktext.h
branches/KDE4_port/rkward/plugin/rkvarselector.cpp
branches/KDE4_port/rkward/plugin/rkvarslot.cpp
branches/KDE4_port/rkward/plugin/rkvarslot.h
branches/KDE4_port/rkward/rbackend/rcommand.cpp
branches/KDE4_port/rkward/rbackend/rcommand.h
branches/KDE4_port/rkward/rbackend/rcommandreceiver.h
branches/KDE4_port/rkward/rbackend/rembedinternal.cpp
branches/KDE4_port/rkward/rbackend/rinterface.cpp
branches/KDE4_port/rkward/rbackend/rinterface.h
branches/KDE4_port/rkward/rbackend/rklocalesupport.cpp
branches/KDE4_port/rkward/rbackend/rthread.cpp
branches/KDE4_port/rkward/rbackend/rthread.h
branches/KDE4_port/rkward/rkconsole.cpp
branches/KDE4_port/rkward/rkconsole.h
branches/KDE4_port/rkward/rkward.cpp
branches/KDE4_port/rkward/rkward.h
branches/KDE4_port/rkward/robjectbrowser.cpp
branches/KDE4_port/rkward/robjectbrowser.h
branches/KDE4_port/rkward/robjectviewer.cpp
branches/KDE4_port/rkward/robjectviewer.h
branches/KDE4_port/rkward/scriptbackends/phpbackend.h
branches/KDE4_port/rkward/scriptbackends/scriptbackend.cpp
branches/KDE4_port/rkward/scriptbackends/scriptbackend.h
branches/KDE4_port/rkward/settings/rksettings.cpp
branches/KDE4_port/rkward/settings/rksettings.h
branches/KDE4_port/rkward/settings/rksettingsmoduleconsole.cpp
branches/KDE4_port/rkward/settings/rksettingsmodulegeneral.cpp
branches/KDE4_port/rkward/settings/rksettingsmodulegeneral.h
branches/KDE4_port/rkward/settings/rksettingsmoduleobjectbrowser.cpp
branches/KDE4_port/rkward/settings/rksettingsmoduleoutput.cpp
branches/KDE4_port/rkward/settings/rksettingsmodulephp.cpp
branches/KDE4_port/rkward/settings/rksettingsmoduleplugins.cpp
branches/KDE4_port/rkward/settings/rksettingsmoduleplugins.h
branches/KDE4_port/rkward/settings/rksettingsmoduler.cpp
branches/KDE4_port/rkward/settings/rksettingsmodulewatch.cpp
branches/KDE4_port/rkward/settings/rksettingsmodulewatch.h
branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp
branches/KDE4_port/rkward/windows/detachedwindowcontainer.h
branches/KDE4_port/rkward/windows/qxembedcopy.cpp
branches/KDE4_port/rkward/windows/qxembedcopy.h
branches/KDE4_port/rkward/windows/rcontrolwindow.cpp
branches/KDE4_port/rkward/windows/rcontrolwindow.h
branches/KDE4_port/rkward/windows/rkcommandeditorwindow.cpp
branches/KDE4_port/rkward/windows/rkcommandeditorwindow.h
branches/KDE4_port/rkward/windows/rkcommandeditorwindowpart.cpp
branches/KDE4_port/rkward/windows/rkcommandlog.cpp
branches/KDE4_port/rkward/windows/rkcommandlog.h
branches/KDE4_port/rkward/windows/rkfilebrowser.cpp
branches/KDE4_port/rkward/windows/rkfilebrowser.h
branches/KDE4_port/rkward/windows/rkhelpsearchwindow.cpp
branches/KDE4_port/rkward/windows/rkhelpsearchwindow.h
branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp
branches/KDE4_port/rkward/windows/rkhtmlwindow.h
branches/KDE4_port/rkward/windows/rkmdiwindow.cpp
branches/KDE4_port/rkward/windows/rkmdiwindow.h
branches/KDE4_port/rkward/windows/rkwindowcatcher.cpp
branches/KDE4_port/rkward/windows/rkwindowcatcher.h
branches/KDE4_port/rkward/windows/rkworkplace.cpp
branches/KDE4_port/rkward/windows/rkworkplace.h
branches/KDE4_port/rkward/windows/rkworkplaceview.cpp
branches/KDE4_port/rkward/windows/rkworkplaceview.h
Modified: branches/KDE4_port/rkward/agents/showedittextfileagent.cpp
===================================================================
--- branches/KDE4_port/rkward/agents/showedittextfileagent.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/agents/showedittextfileagent.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -23,6 +23,8 @@
#include <qlabel.h>
#include <qlayout.h>
#include <qfile.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
#include "../windows/rkcommandeditorwindow.h"
#include "../rbackend/rinterface.h"
@@ -127,7 +129,7 @@
ShowEditTextFileDialog::ShowEditTextFileDialog (const QString &text, const QString &caption) : KDialogBase ((QWidget*) 0, 0, false, caption, KDialogBase::Ok, KDialogBase::Ok) {
QWidget *page = new QWidget (this);
setMainWidget (page);
- QVBoxLayout *layout = new QVBoxLayout (page, 0, spacingHint ());
+ Q3VBoxLayout *layout = new Q3VBoxLayout (page, 0, spacingHint ());
QLabel *label = new QLabel (text, page);
label->setAlignment (Qt::WordBreak | Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs);
layout->addWidget (label);
Modified: branches/KDE4_port/rkward/core/rcontainerobject.cpp
===================================================================
--- branches/KDE4_port/rkward/core/rcontainerobject.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/core/rcontainerobject.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -17,6 +17,8 @@
#include "rcontainerobject.h"
#include <qregexp.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include "../rbackend/rinterface.h"
#include "robjectlist.h"
@@ -155,7 +157,7 @@
}
// now find out, which old ones are missing
- QValueList<RObject*> removed_list;
+ Q3ValueList<RObject*> removed_list;
for (RObjectMap::const_iterator it = childmap.constBegin (); it != childmap.constEnd (); ++it) {
QString child_string = it.key ();
@@ -169,7 +171,7 @@
}
// finally delete the missing old ones
- for (QValueList<RObject*>::iterator it = removed_list.begin (); it != removed_list.end (); ++it) {
+ for (Q3ValueList<RObject*>::iterator it = removed_list.begin (); it != removed_list.end (); ++it) {
RK_DO (qDebug ("child no longer present: %s.", (*it)->getFullName ().latin1 ()), OBJECTS, DL_DEBUG);
RKGlobals::tracker ()->removeObject ((*it), 0, true);
}
Modified: branches/KDE4_port/rkward/core/rfunctionobject.h
===================================================================
--- branches/KDE4_port/rkward/core/rfunctionobject.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/core/rfunctionobject.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -20,7 +20,7 @@
#include "robject.h"
#include <qpair.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
class RCommand;
Modified: branches/KDE4_port/rkward/core/rkvariable.cpp
===================================================================
--- branches/KDE4_port/rkward/core/rkvariable.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/core/rkvariable.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -17,6 +17,8 @@
#include "rkvariable.h"
#include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include "float.h"
#include "math.h"
@@ -693,13 +695,13 @@
void RKVariable::removeRows (int from_row, int to_row) {
RK_TRACE (OBJECTS);
- QValueList<int> *changed_invalids = 0;
+ Q3ValueList<int> *changed_invalids = 0;
int offset = (to_row - from_row) + 1;
for (int row = from_row; row < getLength (); ++row) {
QString *dummy = myData ()->invalid_fields.take (row);
if (dummy) {
- if (!changed_invalids) changed_invalids = new QValueList<int>;
+ if (!changed_invalids) changed_invalids = new Q3ValueList<int>;
changed_invalids->append (row);
if (row > to_row) {
changed_invalids->append (row - offset);
@@ -724,7 +726,7 @@
}
if (changed_invalids) {
- for (QValueList<int>::const_iterator it = changed_invalids->constBegin (); it != changed_invalids->constEnd (); ++it) {
+ for (Q3ValueList<int>::const_iterator it = changed_invalids->constBegin (); it != changed_invalids->constEnd (); ++it) {
writeInvalidField (*it, 0);
}
delete changed_invalids;
@@ -748,11 +750,11 @@
myData ()->cell_states[i] = RKVarEditData::NA;
}
- QValueList<int> *changed_invalids = 0;
+ Q3ValueList<int> *changed_invalids = 0;
for (int i = getLength () - count - 1; i >= row; --i) {
QString *dummy = myData ()->invalid_fields.take (i);
if (dummy) {
- if (!changed_invalids) changed_invalids = new QValueList<int>;
+ if (!changed_invalids) changed_invalids = new Q3ValueList<int>;
changed_invalids->append (i);
changed_invalids->append (i + count);
myData ()->invalid_fields.replace (i + count, dummy);
@@ -774,7 +776,7 @@
}
if (changed_invalids) {
- for (QValueList<int>::const_iterator it = changed_invalids->constBegin (); it != changed_invalids->constEnd (); ++it) {
+ for (Q3ValueList<int>::const_iterator it = changed_invalids->constBegin (); it != changed_invalids->constEnd (); ++it) {
writeInvalidField (*it, 0);
}
delete changed_invalids;
Modified: branches/KDE4_port/rkward/core/rkvariable.h
===================================================================
--- branches/KDE4_port/rkward/core/rkvariable.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/core/rkvariable.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,7 +18,7 @@
#define RKVARIABLE_H
#include <qstring.h>
-#include <qintdict.h>
+#include <q3intdict.h>
#include "robject.h"
@@ -165,7 +165,7 @@
/// the formatting options set for this var (see FormattingOptions) */
FormattingOptions *formatting_options;
/// storage for invalid fields
- QIntDict<QString> invalid_fields;
+ Q3IntDict<QString> invalid_fields;
};
/** reimplemented from RObject */
void allocateEditData (RKEditor *editor);
Modified: branches/KDE4_port/rkward/core/robjectlist.cpp
===================================================================
--- branches/KDE4_port/rkward/core/robjectlist.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/core/robjectlist.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -24,6 +24,8 @@
#include <qtimer.h>
#include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include <klocale.h>
@@ -103,7 +105,7 @@
void RObjectList::updateEnvironments (QString *env_names, unsigned int env_count) {
RK_TRACE (OBJECTS);
- QValueList<REnvironmentObject *> removelist;
+ Q3ValueList<REnvironmentObject *> removelist;
// check which envs are removed
// we could as well iterate over the childmap, but this is easier
@@ -119,7 +121,7 @@
}
// remove the environments which are gone
- for (QValueList<REnvironmentObject *>::const_iterator it = removelist.constBegin (); it != removelist.constEnd (); ++it) {
+ for (Q3ValueList<REnvironmentObject *>::const_iterator it = removelist.constBegin (); it != removelist.constEnd (); ++it) {
RK_DO (qDebug ("removing toplevel environment %s from list", (*it)->getShortName ().latin1 ()), OBJECTS, DL_INFO);
RKGlobals::tracker ()->removeObject (*it, 0, true);
}
Modified: branches/KDE4_port/rkward/dataeditor/celleditor.cpp
===================================================================
--- branches/KDE4_port/rkward/dataeditor/celleditor.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/celleditor.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -17,8 +17,13 @@
#include "celleditor.h"
#include <qapplication.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
#include <qstyle.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <Q3Frame>
+#include <QTimerEvent>
+#include <QKeyEvent>
#include "twintablemember.h"
#include "../debug.h"
@@ -34,10 +39,10 @@
timer_id = 0;
if (named_values) {
- value_list = new QPopupMenu ();
+ value_list = new Q3PopupMenu ();
value_list->setFont (font ());
value_list->setPalette (palette ());
- value_list->setFrameStyle (QFrame::Box | QFrame::Plain);
+ value_list->setFrameStyle (Q3Frame::Box | Q3Frame::Plain);
value_list->setLineWidth (1);
value_list->setFocusProxy (this);
Modified: branches/KDE4_port/rkward/dataeditor/celleditor.h
===================================================================
--- branches/KDE4_port/rkward/dataeditor/celleditor.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/celleditor.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,12 +18,17 @@
#define CELLEDITOR_H
#include <qlineedit.h>
-#include <qintdict.h>
+#include <q3intdict.h>
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <QEvent>
+#include <QTimerEvent>
+#include <Q3PopupMenu>
#include "../core/robject.h"
class QStringList;
-class QPopupMenu;
+class Q3PopupMenu;
class TwinTableMember;
/**
@@ -50,9 +55,9 @@
/// needed to catch Tab-keypresses (not usually sent to keyPressEvent) and relay those to the parent
bool event (QEvent *e);
private:
- QPopupMenu *value_list;
+ Q3PopupMenu *value_list;
int timer_id;
- QIntDict<QString> popup_values;
+ Q3IntDict<QString> popup_values;
TwinTableMember *table;
};
Modified: branches/KDE4_port/rkward/dataeditor/editformatdialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dataeditor/editformatdialog.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/editformatdialog.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -20,13 +20,15 @@
#include "../rkglobals.h"
#include "../debug.h"
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
#include <qradiobutton.h>
#include <qpushbutton.h>
#include <qspinbox.h>
#include <qlayout.h>
#include <qstring.h>
#include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
#include <klocale.h>
@@ -39,24 +41,24 @@
EditFormatDialog::mode = mode;
EditFormatDialog::options = var->getFormattingOptions ();
- QVBoxLayout *vbox = new QVBoxLayout (this, RKGlobals::marginHint (), RKGlobals::spacingHint ());
+ Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::marginHint (), RKGlobals::spacingHint ());
- alignment_group = new QButtonGroup (i18n ("Alignment"), this);
+ alignment_group = new Q3ButtonGroup (i18n ("Alignment"), this);
alignment_group->setColumnLayout (0, Qt::Vertical);
alignment_group->layout()->setSpacing (RKGlobals::spacingHint ());
alignment_group->layout()->setMargin (RKGlobals::marginHint ());
- QVBoxLayout *group_layout = new QVBoxLayout (alignment_group->layout());
+ Q3VBoxLayout *group_layout = new Q3VBoxLayout (alignment_group->layout());
group_layout->addWidget (new QRadioButton (i18n ("Default for type '%1'").arg (RObject::typeToText (var->getDataType ())), alignment_group));
group_layout->addWidget (new QRadioButton (i18n ("Left"), alignment_group));
group_layout->addWidget (new QRadioButton (i18n ("Right"), alignment_group));
alignment_group->setButton ((int) RKVariable::FormattingOptions::AlignDefault);
vbox->addWidget (alignment_group);
- precision_group = new QButtonGroup (i18n ("Decimal Places"), this);
+ precision_group = new Q3ButtonGroup (i18n ("Decimal Places"), this);
precision_group->setColumnLayout (0, Qt::Vertical);
precision_group->layout()->setSpacing (RKGlobals::spacingHint ());
precision_group->layout()->setMargin (RKGlobals::marginHint ());
- group_layout = new QVBoxLayout (precision_group->layout());
+ group_layout = new Q3VBoxLayout (precision_group->layout());
group_layout->addWidget (new QRadioButton (i18n ("Default setting"), precision_group));
group_layout->addWidget (new QRadioButton (i18n ("As required"), precision_group));
group_layout->addWidget (new QRadioButton (i18n ("Fixed precision:"), precision_group));
Modified: branches/KDE4_port/rkward/dataeditor/editformatdialog.h
===================================================================
--- branches/KDE4_port/rkward/dataeditor/editformatdialog.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/editformatdialog.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -21,7 +21,7 @@
#include "../core/rkvariable.h"
-class QButtonGroup;
+class Q3ButtonGroup;
class QSpinBox;
/**
@@ -41,8 +41,8 @@
/// reimplemented to submit the changes to the backend
void accept ();
private:
- QButtonGroup *alignment_group;
- QButtonGroup *precision_group;
+ Q3ButtonGroup *alignment_group;
+ Q3ButtonGroup *precision_group;
QSpinBox *precision_field;
RKVariable::FormattingOptions *options;
Modified: branches/KDE4_port/rkward/dataeditor/editlabelsdialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dataeditor/editlabelsdialog.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/editlabelsdialog.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -29,6 +29,10 @@
#include <qrect.h>
#include <qpalette.h>
#include <qstyle.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QResizeEvent>
+#include <Q3VBoxLayout>
#include "../core/rkvariable.h"
#include "rkdrag.h"
@@ -47,7 +51,7 @@
setNumCols (1);
setNumRows (storage->count () + 1);
horizontalHeader ()->setLabel (0, i18n ("Label"));
- setHScrollBarMode (QScrollView::AlwaysOff);
+ setHScrollBarMode (Q3ScrollView::AlwaysOff);
setLeftMargin (40);
setMinimumWidth (80);
@@ -191,7 +195,7 @@
setColumnWidth (0, nwidth);
updating_size = false;
- QTable::resizeEvent (e);
+ Q3Table::resizeEvent (e);
}
void LevelsTable::columnWidthChanged (int col) {
@@ -208,7 +212,7 @@
updating_size = false;
- QTable::columnWidthChanged (col);
+ Q3Table::columnWidthChanged (col);
}
@@ -221,12 +225,12 @@
EditLabelsDialog::var = var;
EditLabelsDialog::mode = mode;
- QVBoxLayout *mainvbox = new QVBoxLayout (this, KDialog::marginHint (), KDialog::spacingHint ());
+ Q3VBoxLayout *mainvbox = new Q3VBoxLayout (this, KDialog::marginHint (), KDialog::spacingHint ());
QLabel *label = new QLabel (i18n ("Levels can be assigned only to consecutive integers starting with 1 (the index column is read only). To remove levels at the end of the list, just set them to empty."), this);
label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
mainvbox->addWidget (label);
- QHBoxLayout *hbox = new QHBoxLayout (mainvbox, KDialog::spacingHint ());
+ Q3HBoxLayout *hbox = new Q3HBoxLayout (mainvbox, KDialog::spacingHint ());
RObject::ValueLabels *labels = var->getValueLabels ();
if (!labels) {
@@ -236,7 +240,7 @@
table = new LevelsTable (this, labels);
hbox->addWidget (table);
- QHBoxLayout *buttonbox = new QHBoxLayout (mainvbox, KDialog::spacingHint ());
+ Q3HBoxLayout *buttonbox = new Q3HBoxLayout (mainvbox, KDialog::spacingHint ());
QPushButton *ok_button = new QPushButton (i18n ("Ok"), this);
connect (ok_button, SIGNAL (clicked ()), this, SLOT (accept ()));
Modified: branches/KDE4_port/rkward/dataeditor/editlabelsdialog.h
===================================================================
--- branches/KDE4_port/rkward/dataeditor/editlabelsdialog.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/editlabelsdialog.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,6 +18,8 @@
#define EDITLABELSDIALOG_H
#include <qdialog.h>
+//Added by qt3to4:
+#include <QResizeEvent>
#include "../core/robject.h"
Modified: branches/KDE4_port/rkward/dataeditor/rkdrag.cpp
===================================================================
--- branches/KDE4_port/rkward/dataeditor/rkdrag.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/rkdrag.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -20,8 +20,10 @@
#include "twintablemember.h"
#include "../debug.h"
+//Added by qt3to4:
+#include <Q3CString>
-RKDrag::RKDrag (TwinTableMember *drag_source) : QDragObject (drag_source){
+RKDrag::RKDrag (TwinTableMember *drag_source) : Q3DragObject (drag_source){
RK_TRACE (EDITOR);
RK_ASSERT (drag_source);
@@ -52,7 +54,7 @@
return data;
}
- return QCString ();
+ return Q3CString ();
}
bool RKDrag::provides (const char *mimeType) {
Modified: branches/KDE4_port/rkward/dataeditor/rkdrag.h
===================================================================
--- branches/KDE4_port/rkward/dataeditor/rkdrag.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/rkdrag.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,14 +18,16 @@
#ifndef RKDRAG_H
#define RKDRAG_H
-#include <qdragobject.h>
+#include <q3dragobject.h>
+//Added by qt3to4:
+#include <Q3CString>
class TwinTableMember;
/** A QDragObject that gets its data from a TwinTableMember. Used for all copy/paste/drag operations involving TwinTableMembers.
*@author Thomas Friedrichsmeier
*/
-class RKDrag : public QDragObject {
+class RKDrag : public Q3DragObject {
public:
RKDrag (TwinTableMember *drag_source=0);
~RKDrag ();
@@ -33,7 +35,7 @@
QByteArray encodedData (const char * mimeType) const;
bool provides (const char *mimeType);
private:
- QCString data;
+ Q3CString data;
};
#endif
Modified: branches/KDE4_port/rkward/dataeditor/rkeditordataframe.cpp
===================================================================
--- branches/KDE4_port/rkward/dataeditor/rkeditordataframe.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/rkeditordataframe.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -142,7 +142,7 @@
open_chain = RKGlobals::rInterface ()->closeChain (open_chain);
/* make sure enough rows are displayed. Note: Calling QTable::insertRows, since no data should be juggled around, only the number of visible rows is to be changed. */
if (dataview->numTrueRows () < getColObject (0)->getLength ()) {
- dataview->QTable::insertRows (0, getColObject (0)->getLength () - dataview->numTrueRows ());
+ dataview->Q3Table::insertRows (0, getColObject (0)->getLength () - dataview->numTrueRows ());
}
enableEditing (true);
}
Modified: branches/KDE4_port/rkward/dataeditor/twintable.cpp
===================================================================
--- branches/KDE4_port/rkward/dataeditor/twintable.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/twintable.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -22,11 +22,14 @@
#include <qsplitter.h>
#include <qlayout.h>
#include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
#include <qimage.h>
#include <qpixmap.h>
-#include <qpopupmenu.h>
-#include <qcstring.h>
+#include <q3popupmenu.h>
+#include <q3cstring.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3ValueList>
#include "twintabledatamember.h"
#include "twintablemetamember.h"
@@ -51,7 +54,7 @@
TwinTable::TwinTable (QWidget *parent) : RKEditor (parent) {
RK_TRACE (EDITOR);
- QGridLayout *grid_layout = new QGridLayout(this);
+ Q3GridLayout *grid_layout = new Q3GridLayout(this);
QSplitter *splitter = new QSplitter(this);
splitter->setOrientation(QSplitter::Vertical);
@@ -77,7 +80,7 @@
dataview->horizontalHeader ()->hide ();
dataview->setTopMargin (0);
dataview->setLeftMargin (varview->leftMargin ());
- varview->setHScrollBarMode (QScrollView::AlwaysOff);
+ varview->setHScrollBarMode (Q3ScrollView::AlwaysOff);
grid_layout->addWidget (splitter, 0, 0);
@@ -95,14 +98,14 @@
connect (varview, SIGNAL (headerRightClick (int, int)), this, SLOT (varviewHeaderRightClicked (int, int)));
// which will be reacted upon by the following popup-menu:
- top_header_menu = new QPopupMenu (this);
+ top_header_menu = new Q3PopupMenu (this);
top_header_menu->insertItem (i18n ("Insert new variable left"), this, SLOT (insertColumnLeft ()), 0, HEADER_MENU_ID_ADD_COL_LEFT);
top_header_menu->insertItem (i18n ("Insert new variable right"), this, SLOT (insertColumnRight ()), 0, HEADER_MENU_ID_ADD_COL_RIGHT);
top_header_menu->insertItem (i18n ("Delete this variable"), this, SLOT (requestDeleteColumn ()), 0, HEADER_MENU_ID_DEL_COL);
// and the same for the left header
connect (dataview, SIGNAL (headerRightClick (int, int)), this, SLOT (dataviewHeaderRightClicked (int, int)));
- left_header_menu = new QPopupMenu (this);
+ left_header_menu = new Q3PopupMenu (this);
left_header_menu->insertItem (i18n ("Insert new case above"), this, SLOT (insertRowAbove ()), 0, HEADER_MENU_ID_ADD_ROW_ABOVE);
left_header_menu->insertItem (i18n ("Insert new case below"), this, SLOT (insertRowBelow ()), 0, HEADER_MENU_ID_ADD_ROW_BELOW);
left_header_menu->insertItem (QString::null, this, SLOT (deleteRow ()), 0, HEADER_MENU_ID_DEL_ROW);
@@ -210,7 +213,7 @@
void TwinTable::headerClicked (int col) {
RK_TRACE (EDITOR);
- QTableSelection selection;
+ Q3TableSelection selection;
selection.init (0, col);
selection.expandTo (dataview->numTrueRows (), col);
@@ -355,7 +358,7 @@
if (bottom_row >= varview->numTrueRows ()) bottom_row = varview->numTrueRows () - 1;
}
- QValueList<RKVariable*> col_list;
+ Q3ValueList<RKVariable*> col_list;
QString pasted = QString::fromLocal8Bit (content);
int row = top_row;
@@ -399,7 +402,7 @@
} while (content_offset < content_length);
// now do the syncing
- for (QValueList<RKVariable*>::ConstIterator it = col_list.constBegin (); it != col_list.constEnd (); ++it) {
+ for (Q3ValueList<RKVariable*>::ConstIterator it = col_list.constBegin (); it != col_list.constEnd (); ++it) {
(*it)->syncDataToR ();
(*it)->setSyncing (true);
}
@@ -489,7 +492,7 @@
long int TwinTable::getObjectCol (RObject *object) {
RK_TRACE (EDITOR);
- for (QIntDictIterator<RKVariable> it (col_map); it.current (); ++it) {
+ for (Q3IntDictIterator<RKVariable> it (col_map); it.current (); ++it) {
if (it.current () == object) return it.currentKey ();
}
Modified: branches/KDE4_port/rkward/dataeditor/twintable.h
===================================================================
--- branches/KDE4_port/rkward/dataeditor/twintable.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/twintable.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -22,18 +22,23 @@
#include <qvariant.h>
#include <qstring.h>
-#include <qintdict.h>
+#include <q3intdict.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
+#include <Q3PopupMenu>
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
+class Q3VBoxLayout;
+class Q3HBoxLayout;
+class Q3GridLayout;
class QSplitter;
class TwinTableMember;
class TwinTableDataMember;
class TwinTableMetaMember;
class TableColumn;
-class QPopupMenu;
-class QTable;
+class Q3PopupMenu;
+class Q3Table;
class RKDrag;
class RObject;
struct RObject::ChangeSet;
@@ -89,15 +94,15 @@
void dataClearSelection ();
private:
/** PopupMenu shown when top header is right-clicked */
- QPopupMenu *top_header_menu;
+ Q3PopupMenu *top_header_menu;
/** PopupMenu shown when top header is right-clicked */
- QPopupMenu *left_header_menu;
+ Q3PopupMenu *left_header_menu;
/** position (row or col) the header_menu is operating on */
int header_pos;
RKEditor::PasteMode paste_mode;
- typedef QIntDict<RKVariable> ColMap;
+ typedef Q3IntDict<RKVariable> ColMap;
ColMap col_map;
protected:
/** set a row of cells, expanding the table if necessary. Assumes you provide the correct amount of data! */
Modified: branches/KDE4_port/rkward/dataeditor/twintabledatamember.cpp
===================================================================
--- branches/KDE4_port/rkward/dataeditor/twintabledatamember.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/twintabledatamember.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -35,7 +35,7 @@
void TwinTableDataMember::removeRow (int row) {
RK_TRACE (EDITOR);
- QTable::removeRow (row);
+ Q3Table::removeRow (row);
for (int i=0; i < table->numTrueCols (); ++i) {
table->getColObject (i)->removeRow (row);
}
@@ -51,7 +51,7 @@
for (int i=0; i < table->numTrueCols (); ++i) {
table->getColObject (i)->insertRows (row, count);
}
- QTable::insertRows (row, count);
+ Q3Table::insertRows (row, count);
}
void TwinTableDataMember::setText (int row, int col, const QString &text) {
Modified: branches/KDE4_port/rkward/dataeditor/twintablemember.cpp
===================================================================
--- branches/KDE4_port/rkward/dataeditor/twintablemember.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/twintablemember.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -20,19 +20,24 @@
#include <qevent.h>
#include <qpainter.h>
#include <qstyle.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <Q3MemArray>
#include "celleditor.h"
#include "twintable.h"
#include "../debug.h"
-TwinTableMember::TwinTableMember (QWidget *parent, TwinTable *table, int trailing_rows, int trailing_cols) : QTable (parent){
+TwinTableMember::TwinTableMember (QWidget *parent, TwinTable *table, int trailing_rows, int trailing_cols) : Q3Table (parent){
twin = 0;
TwinTableMember::table = table;
setRowMovingEnabled (false);
- setVScrollBarMode (QScrollView::AlwaysOn);
+ setVScrollBarMode (Q3ScrollView::AlwaysOn);
horizontalHeader()->installEventFilter (this);
verticalHeader()->installEventFilter (this);
- setSelectionMode (QTable::Single);
+ setSelectionMode (Q3Table::Single);
TwinTableMember::trailing_cols = trailing_cols;
TwinTableMember::trailing_rows = trailing_rows;
@@ -51,7 +56,7 @@
}
int TwinTableMember::numTrueRows () const {
- return QTable::numRows () - trailing_rows;
+ return Q3Table::numRows () - trailing_rows;
}
void TwinTableMember::setTwin (TwinTableMember * new_twin) {
@@ -60,7 +65,7 @@
void TwinTableMember::columnWidthChanged (int col) {
// does all repainting and stuff ...
- QTable::columnWidthChanged (col);
+ Q3Table::columnWidthChanged (col);
// syncs the twin
if (twin) {
@@ -91,7 +96,7 @@
}
// default processing
- return (QTable::eventFilter (object, event));
+ return (Q3Table::eventFilter (object, event));
}
// virtual
@@ -99,7 +104,7 @@
return (RObject::rQuote (text (row, col)));
}
-void TwinTableMember::removeRows (const QMemArray<int> &) {
+void TwinTableMember::removeRows (const Q3MemArray<int> &) {
RK_ASSERT (false);
}
@@ -167,7 +172,7 @@
viewport ()->setFocus ();
}
-QCString TwinTableMember::encodeSelection () {
+Q3CString TwinTableMember::encodeSelection () {
RK_TRACE (EDITOR);
int top_row, left_col, bottom_row, right_col;
@@ -176,7 +181,7 @@
return (encodeRange (top_row, left_col, bottom_row, right_col));
}
-QCString TwinTableMember::encodeRange (int top_row, int left_col, int bottom_row, int right_col) {
+Q3CString TwinTableMember::encodeRange (int top_row, int left_col, int bottom_row, int right_col) {
RK_TRACE (EDITOR);
QString data;
@@ -220,7 +225,7 @@
if (currentSelection () >= 0) selnum = currentSelection ();
else if (numSelections () >= 1) selnum = 0; // this is the one and only selection, as we only allow one single selection. Unfortunately, QTable does not regard a selection as current, if it was added programatically, instead of user-selected.
if (selnum >= 0) {
- QTableSelection sel = selection (selnum);
+ Q3TableSelection sel = selection (selnum);
*top_row = sel.topRow ();
*left_col = sel.leftCol ();
*bottom_row = sel.bottomRow ();
@@ -300,7 +305,7 @@
blankSelected ();
e->accept ();
} else {
- QTable::keyPressEvent (e);
+ Q3Table::keyPressEvent (e);
}
}
Modified: branches/KDE4_port/rkward/dataeditor/twintablemember.h
===================================================================
--- branches/KDE4_port/rkward/dataeditor/twintablemember.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dataeditor/twintablemember.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,8 +18,14 @@
#ifndef TWINTABLEMEMBER_H
#define TWINTABLEMEMBER_H
-#include <qtable.h>
+#include <q3table.h>
#include <qpoint.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <QEvent>
+#include <Q3MemArray>
+#include <QMouseEvent>
+#include <QKeyEvent>
#define LABEL_ROW 0
#define TYPE_ROW 1
@@ -35,7 +41,7 @@
*@author Thomas Friedrichsmeier
*/
-class TwinTableMember : public QTable {
+class TwinTableMember : public Q3Table {
Q_OBJECT
public:
TwinTableMember (QWidget *parent, TwinTable *table, int trailing_rows=0, int trailing_cols=0);
@@ -52,7 +58,7 @@
/** like QTable::numCols (), but returns only the "true", i.e. active columns (excluding the trailing_cols) */
int numTrueCols () const;
/** reimplemented form QTable not to use QTableItems. This one raises an assert (should never be called) */
- void removeRows (const QMemArray<int> &rows);
+ void removeRows (const Q3MemArray<int> &rows);
/** reimplemented form QTable not to use QTableItems. This one has no effect */
void swapRows (int row1, int row2, bool swapHeader);
/** reimplemented form QTable not to use QTableItems. This one raises an assert (should never be called) */
@@ -60,11 +66,11 @@
/** reimplemented form QTable not to use QTableItems. This one has no effect */
void swapColumns (int col1, int col2, bool swapHeader);
/** reimplemented form QTable not to use QTableItems. This one always returns 0 */
- QTableItem *item (int, int) { return 0; }
+ Q3TableItem *item (int, int) { return 0; }
/** reimplemented form QTable not to use QTableItems. This one has no effect */
- void setItem (int, int, QTableItem *) {};
+ void setItem (int, int, Q3TableItem *) {};
/** reimplemented form QTable not to use QTableItems. This one has no effect */
- void takeItem (QTableItem *) {};
+ void takeItem (Q3TableItem *) {};
/** reimplemented form QTable not to use QTableItems. This one always returns 0 or tted */
QWidget *cellWidget (int row, int col) const;
/** reimplemented form QTable not to use QTableItems. This one has no effect */
@@ -81,8 +87,8 @@
bool eventFilter (QObject *object, QEvent *event);
/** reimplemented to delete cell contents on DEL and BACKSPACE. Placed in public, here, so CellEditor can have access */
void keyPressEvent (QKeyEvent *e);
- QCString encodeSelection ();
- QCString encodeRange (int top_row, int left_col, int bottom_row, int right_col);
+ Q3CString encodeSelection ();
+ Q3CString encodeRange (int top_row, int left_col, int bottom_row, int right_col);
/** blanks out the currently selected cells (or the currently active cell, if there is no selection) */
void blankSelected ();
/** shortcut to get the boundaries of the current selection */
Modified: branches/KDE4_port/rkward/dialogs/rkimportdialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dialogs/rkimportdialog.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dialogs/rkimportdialog.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -21,7 +21,7 @@
#include <kfilefiltercombo.h>
#include <klocale.h>
-#include <qhbox.h>
+#include <q3hbox.h>
#include <qcombobox.h>
#include <qlabel.h>
Modified: branches/KDE4_port/rkward/dialogs/rkimportdialog.h
===================================================================
--- branches/KDE4_port/rkward/dialogs/rkimportdialog.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dialogs/rkimportdialog.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -21,7 +21,7 @@
#include <kfiledialog.h>
#include <qstringlist.h>
-#include <qhbox.h>
+#include <q3hbox.h>
class QComboBox;
class RKContextMap;
@@ -56,7 +56,7 @@
};
/** Internal helper class to RKImportDialog. Needed solely to work around a design flaw in the KFileDialog API */
-class RKImportDialogFormatSelector : public QHBox {
+class RKImportDialogFormatSelector : public Q3HBox {
friend class RKImportDialog;
private:
RKImportDialogFormatSelector ();
Modified: branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,13 +18,19 @@
#include <qwidget.h>
#include <qlayout.h>
-#include <qlistview.h>
+#include <q3listview.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <qcheckbox.h>
#include <qdir.h>
#include <qregexp.h>
#include <qtimer.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3CString>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
+#include <QCloseEvent>
#include <klocale.h>
#include <kprocess.h>
@@ -54,18 +60,18 @@
RK_TRACE (DIALOGS);
RKLoadLibsDialog::chain = chain;
- QFrame *page = addPage (i18n ("Local packages"));
- QVBoxLayout *layout = new QVBoxLayout (page, 0, KDialog::spacingHint ());
+ Q3Frame *page = addPage (i18n ("Local packages"));
+ Q3VBoxLayout *layout = new Q3VBoxLayout (page, 0, KDialog::spacingHint ());
LoadUnloadWidget *luwidget = new LoadUnloadWidget (this, page);
connect (this, SIGNAL (installedPackagesChanged ()), luwidget, SLOT (updateInstalledPackages ()));
layout->addWidget (luwidget);
page = addPage (i18n ("Update"));
- layout = new QVBoxLayout (page, 0, KDialog::spacingHint ());
+ layout = new Q3VBoxLayout (page, 0, KDialog::spacingHint ());
layout->addWidget (new UpdatePackagesWidget (this, page));
page = addPage (i18n ("Install"));
- layout = new QVBoxLayout (page, 0, KDialog::spacingHint ());
+ layout = new Q3VBoxLayout (page, 0, KDialog::spacingHint ());
layout->addWidget (install_packages_widget = new InstallPackagesWidget (this, page));
setButtonText (KDialogBase::User1, i18n ("Configure Repositories"));
@@ -180,8 +186,8 @@
QDir dir = RKSettingsModuleGeneral::filesPath ();
QFile file (dir.filePath ("install_script.R"));
// WORKADOUND END
- if (file.open (IO_WriteOnly)) {
- QTextStream stream (&file);
+ if (file.open (QIODevice::WriteOnly)) {
+ Q3TextStream stream (&file);
stream << "options (repos=" + repos_string + ")\n" + command_string;
if (as_root) {
#ifdef __FreeBSD__
@@ -222,12 +228,12 @@
void RKLoadLibsDialog::installationProcessOutput (KProcess *, char *buffer, int buflen) {
RK_TRACE (DIALOGS);
- emit (installationOutput (QCString (buffer, buflen)));
+ emit (installationOutput (Q3CString (buffer, buflen)));
}
void RKLoadLibsDialog::installationProcessError (KProcess *, char *buffer, int buflen) {
RK_TRACE (DIALOGS);
- emit (installationError (QCString (buffer, buflen)));
+ emit (installationError (Q3CString (buffer, buflen)));
}
void RKLoadLibsDialog::processExited (KProcess *) {
@@ -245,23 +251,23 @@
RK_TRACE (DIALOGS);
LoadUnloadWidget::parent = dialog;
- QVBoxLayout *mvbox = new QVBoxLayout (this, 0, KDialog::spacingHint ());
+ Q3VBoxLayout *mvbox = new Q3VBoxLayout (this, 0, KDialog::spacingHint ());
QLabel *label = new QLabel (i18n ("There are no safeguards against removing essential packages. For example, unloading \"rkward\" will prevent this application from running properly. Please be careful about the packages you unload."), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::TextExpandTabs | Qt::TextWordWrap);
mvbox->addWidget (label);
- QHBoxLayout *hbox = new QHBoxLayout (mvbox, KDialog::spacingHint ());
- QVBoxLayout *instvbox = new QVBoxLayout (hbox, KDialog::spacingHint ());
- QVBoxLayout *buttonvbox = new QVBoxLayout (hbox, KDialog::spacingHint ());
- QVBoxLayout *loadedvbox = new QVBoxLayout (hbox, KDialog::spacingHint ());
+ Q3HBoxLayout *hbox = new Q3HBoxLayout (mvbox, KDialog::spacingHint ());
+ Q3VBoxLayout *instvbox = new Q3VBoxLayout (hbox, KDialog::spacingHint ());
+ Q3VBoxLayout *buttonvbox = new Q3VBoxLayout (hbox, KDialog::spacingHint ());
+ Q3VBoxLayout *loadedvbox = new Q3VBoxLayout (hbox, KDialog::spacingHint ());
label = new QLabel (i18n ("Installed packages"), this);
- installed_view = new QListView (this);
+ installed_view = new Q3ListView (this);
installed_view->addColumn (i18n ("Name"));
installed_view->addColumn (i18n ("Title"));
installed_view->addColumn (i18n ("Version"));
installed_view->addColumn (i18n ("Location"));
- installed_view->setSelectionMode (QListView::Extended);
+ installed_view->setSelectionMode (Q3ListView::Extended);
instvbox->addWidget (label);
instvbox->addWidget (installed_view);
@@ -275,9 +281,9 @@
buttonvbox->addStretch (2);
label = new QLabel (i18n ("Loaded packages"), this);
- loaded_view = new QListView (this);
+ loaded_view = new Q3ListView (this);
loaded_view->addColumn (i18n ("Name"));
- loaded_view->setSelectionMode (QListView::Extended);
+ loaded_view->setSelectionMode (Q3ListView::Extended);
loadedvbox->addWidget (label);
loadedvbox->addWidget (loaded_view);
@@ -310,7 +316,7 @@
RK_ASSERT (count == version->getDataLength ());
RK_ASSERT (count == libpath->getDataLength ());
for (unsigned int i=0; i < count; ++i) {
- new QListViewItem (installed_view, package->getStringVector ()[i], title->getStringVector ()[i], version->getStringVector ()[i], libpath->getStringVector ()[i]);
+ new Q3ListViewItem (installed_view, package->getStringVector ()[i], title->getStringVector ()[i], version->getStringVector ()[i], libpath->getStringVector ()[i]);
}
} else if (command->getFlags () == GET_LOADED_PACKAGES) {
RK_ASSERT (command->getDataType () == RData::StringVector);
@@ -318,7 +324,7 @@
loaded_view->clear ();
for (unsigned int i=0; i < command->getDataLength (); ++i) {
- new QListViewItem (loaded_view, command->getStringVector ()[i]);
+ new Q3ListViewItem (loaded_view, command->getStringVector ()[i]);
}
setEnabled (true);
updateCurrentList ();
@@ -341,10 +347,10 @@
void LoadUnloadWidget::loadButtonClicked () {
RK_TRACE (DIALOGS);
- QListViewItem *installed = installed_view->firstChild ();
+ Q3ListViewItem *installed = installed_view->firstChild ();
while (installed) {
if (installed->isSelected ()) {
- QListViewItem *loaded = loaded_view->firstChild ();
+ Q3ListViewItem *loaded = loaded_view->firstChild ();
// find out, whether package is already loaded
bool dup = false;
while (loaded) {
@@ -356,7 +362,7 @@
}
}
if (!dup) {
- new QListViewItem (loaded_view, installed->text (0));
+ new Q3ListViewItem (loaded_view, installed->text (0));
}
}
installed = installed->nextSibling ();
@@ -366,9 +372,9 @@
void LoadUnloadWidget::detachButtonClicked () {
RK_TRACE (DIALOGS);
- QListViewItem *loaded = loaded_view->firstChild ();
+ Q3ListViewItem *loaded = loaded_view->firstChild ();
while (loaded) {
- QListViewItem *next = loaded->nextSibling ();
+ Q3ListViewItem *next = loaded->nextSibling ();
if (loaded->isSelected ()) {
delete loaded;
}
@@ -386,7 +392,7 @@
RK_TRACE (DIALOGS);
prev_packages.clear ();
- QListViewItem *loaded = loaded_view->firstChild ();
+ Q3ListViewItem *loaded = loaded_view->firstChild ();
while (loaded) {
prev_packages.append (loaded->text (0));
loaded = loaded->nextSibling ();
@@ -400,7 +406,7 @@
connect (this, SIGNAL (loadUnloadDone ()), control, SLOT (done ()));
// load packages previously not loaded
- QListViewItem *loaded = loaded_view->firstChild ();
+ Q3ListViewItem *loaded = loaded_view->firstChild ();
while (loaded) {
if (!prev_packages.contains (loaded->text (0))) {
RCommand *command = new RCommand ("library (\"" + loaded->text (0) + "\")", RCommand::App | RCommand::ObjectListUpdate, QString::null, this, LOAD_PACKAGE_COMMAND);
@@ -415,7 +421,7 @@
bool found = false;
loaded = loaded_view->firstChild ();
while (loaded) {
- QListViewItem *next = loaded->nextSibling ();
+ Q3ListViewItem *next = loaded->nextSibling ();
if (loaded->text (0) == (*it)) {
found = true;
loaded = 0;
@@ -452,22 +458,22 @@
RK_TRACE (DIALOGS);
UpdatePackagesWidget::parent = dialog;
- QVBoxLayout *mvbox = new QVBoxLayout (this, 0, KDialog::spacingHint ());
+ Q3VBoxLayout *mvbox = new Q3VBoxLayout (this, 0, KDialog::spacingHint ());
QLabel *label = new QLabel (i18n ("In order to find out, which of your installed packaged have an update available, click \"Fetch List\". This feature requires a working internet connection."), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::TextExpandTabs | Qt::TextWordWrap);
mvbox->addWidget (label);
- QHBoxLayout *hbox = new QHBoxLayout (mvbox, KDialog::spacingHint ());
+ Q3HBoxLayout *hbox = new Q3HBoxLayout (mvbox, KDialog::spacingHint ());
- updateable_view = new QListView (this);
+ updateable_view = new Q3ListView (this);
updateable_view->addColumn (i18n ("Name"));
updateable_view->addColumn (i18n ("Location"));
updateable_view->addColumn (i18n ("Local Version"));
updateable_view->addColumn (i18n ("Online Version"));
- updateable_view->setSelectionMode (QListView::Extended);
+ updateable_view->setSelectionMode (Q3ListView::Extended);
hbox->addWidget (updateable_view);
- QVBoxLayout *buttonvbox = new QVBoxLayout (hbox, KDialog::spacingHint ());
+ Q3VBoxLayout *buttonvbox = new Q3VBoxLayout (hbox, KDialog::spacingHint ());
get_list_button = new QPushButton (i18n ("Fetch list"), this);
connect (get_list_button, SIGNAL (clicked ()), this, SLOT (getListButtonClicked ()));
update_selected_button = new QPushButton (i18n ("Update Selected"), this);
@@ -489,7 +495,7 @@
update_all_button->setEnabled (false);
updateable_view->setEnabled (false);
//placeholder = new QListViewItem (updateable_view, i18n ("[Click \"Fetch list\" for updates]"));
- placeholder = new QListViewItem (updateable_view, "...");
+ placeholder = new Q3ListViewItem (updateable_view, "...");
connect (dialog, SIGNAL (okClicked ()), this, SLOT (ok ()));
connect (dialog, SIGNAL (cancelClicked ()), this, SLOT (cancel ()));
@@ -520,7 +526,7 @@
RK_ASSERT (count == installed->getDataLength ());
RK_ASSERT (count == reposver->getDataLength ());
for (unsigned int i=0; i < count; ++i) {
- new QListViewItem (updateable_view, package->getStringVector ()[i], libpath->getStringVector ()[i], installed->getStringVector ()[i], reposver->getStringVector ()[i]);
+ new Q3ListViewItem (updateable_view, package->getStringVector ()[i], libpath->getStringVector ()[i], installed->getStringVector ()[i], reposver->getStringVector ()[i]);
}
updateable_view->setEnabled (true);
@@ -529,7 +535,7 @@
update_selected_button->setEnabled (true);
update_all_button->setEnabled (true);
} else {
- placeholder = new QListViewItem (updateable_view, i18n ("[No updates available]"));
+ placeholder = new Q3ListViewItem (updateable_view, i18n ("[No updates available]"));
}
RK_ASSERT (reposstring->getDataLength () == 1);
@@ -556,7 +562,7 @@
void UpdatePackagesWidget::updateSelectedButtonClicked () {
RK_TRACE (DIALOGS);
QStringList list;
- for (QListViewItem *item = updateable_view->firstChild (); item; item = item->nextSibling ()) {
+ for (Q3ListViewItem *item = updateable_view->firstChild (); item; item = item->nextSibling ()) {
if (item->isSelected ()) list.append (item->text (0));
}
updatePackages (list);
@@ -565,7 +571,7 @@
void UpdatePackagesWidget::updateAllButtonClicked () {
RK_TRACE (DIALOGS);
QStringList list;
- for (QListViewItem *item = updateable_view->firstChild (); item; item = item->nextSibling ()) {
+ for (Q3ListViewItem *item = updateable_view->firstChild (); item; item = item->nextSibling ()) {
list.append (item->text (0));
}
updatePackages (list);
@@ -603,19 +609,19 @@
RK_TRACE (DIALOGS);
InstallPackagesWidget::parent = dialog;
- QVBoxLayout *mvbox = new QVBoxLayout (this, 0, KDialog::spacingHint ());
+ Q3VBoxLayout *mvbox = new Q3VBoxLayout (this, 0, KDialog::spacingHint ());
QLabel *label = new QLabel (i18n ("Many packages are available on CRAN (Comprehensive R Archive Network), and other repositories (click \"Configure Repositories\" to add more sources). Click \"Fetch List\" to find out, which packages are available. This feature requires a working internet connection."), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::TextExpandTabs | Qt::TextWordWrap);
mvbox->addWidget (label);
- QHBoxLayout *hbox = new QHBoxLayout (mvbox, KDialog::spacingHint ());
+ Q3HBoxLayout *hbox = new Q3HBoxLayout (mvbox, KDialog::spacingHint ());
- installable_view = new QListView (this);
+ installable_view = new Q3ListView (this);
installable_view->addColumn (i18n ("Name"));
installable_view->addColumn (i18n ("Version"));
- installable_view->setSelectionMode (QListView::Extended);
+ installable_view->setSelectionMode (Q3ListView::Extended);
hbox->addWidget (installable_view);
- QVBoxLayout *buttonvbox = new QVBoxLayout (hbox, KDialog::spacingHint ());
+ Q3VBoxLayout *buttonvbox = new Q3VBoxLayout (hbox, KDialog::spacingHint ());
get_list_button = new QPushButton (i18n ("Fetch list"), this);
connect (get_list_button, SIGNAL (clicked ()), this, SLOT (getListButtonClicked ()));
install_selected_button = new QPushButton (i18n ("Install Selected"), this);
@@ -633,7 +639,7 @@
install_selected_button->setEnabled (false);
installable_view->setEnabled (false);
//placeholder = new QListViewItem (installable_view, i18n ("[Click \"Fetch list\" to see available packages]"));
- placeholder = new QListViewItem (installable_view, "...");
+ placeholder = new Q3ListViewItem (installable_view, "...");
connect (dialog, SIGNAL (okClicked ()), this, SLOT (ok ()));
connect (dialog, SIGNAL (cancelClicked ()), this, SLOT (cancel ()));
@@ -662,14 +668,14 @@
RK_ASSERT (repos->getDataLength () == 1);
for (unsigned int i=0; i < count; ++i) {
- new QListViewItem (installable_view, names->getStringVector ()[i], versions->getStringVector ()[i]);
+ new Q3ListViewItem (installable_view, names->getStringVector ()[i], versions->getStringVector ()[i]);
}
installable_view->setEnabled (true);
if (installable_view->firstChild ()) {
install_selected_button->setEnabled (true);
} else {
- placeholder = new QListViewItem (installable_view, i18n ("[No packages available]"));
+ placeholder = new Q3ListViewItem (installable_view, i18n ("[No packages available]"));
}
// this is after the repository was chosen. Update the repository string.
@@ -695,7 +701,7 @@
void InstallPackagesWidget::installSelectedButtonClicked () {
RK_TRACE (DIALOGS);
QStringList list;
- for (QListViewItem *item = installable_view->firstChild (); item; item = item->nextSibling ()) {
+ for (Q3ListViewItem *item = installable_view->firstChild (); item; item = item->nextSibling ()) {
if (item->isSelected ()) list.append (item->text (0));
}
installPackages (list);
@@ -717,7 +723,7 @@
RK_TRACE (DIALOGS);
bool found = false;
- for (QListViewItem *item = installable_view->firstChild (); item; item = item->nextSibling ()) {
+ for (Q3ListViewItem *item = installable_view->firstChild (); item; item = item->nextSibling ()) {
if (item->text (0) == package_name) {
found = true;
item->setSelected (true);
@@ -750,7 +756,7 @@
PackageInstallParamsWidget::PackageInstallParamsWidget (QWidget *parent, bool ask_depends) : QWidget (parent) {
RK_TRACE (DIALOGS);
- QVBoxLayout *vbox = new QVBoxLayout (this, 0, KDialog::spacingHint ());
+ Q3VBoxLayout *vbox = new Q3VBoxLayout (this, 0, KDialog::spacingHint ());
vbox->addWidget (new QLabel (i18n ("Install packages to:"), this));
libloc_selector = new QComboBox (this);
vbox->addWidget (libloc_selector);
Modified: branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.h
===================================================================
--- branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -20,11 +20,13 @@
#include <kdialogbase.h>
#include <qstringlist.h>
+//Added by qt3to4:
+#include <QCloseEvent>
#include "../settings/rksettingsmoduler.h"
#include "../rbackend/rcommandreceiver.h"
-class QListView;
+class Q3ListView;
class QComboBox;
class QPushButton;
class RKProgressControl;
@@ -121,8 +123,8 @@
void updateCurrentList ();
void doLoadUnload ();
- QListView *loaded_view;
- QListView *installed_view;
+ Q3ListView *loaded_view;
+ Q3ListView *installed_view;
QPushButton *load_button;
QPushButton *detach_button;
@@ -154,8 +156,8 @@
void rCommandDone (RCommand *command);
private:
void updatePackages (const QStringList &list);
- QListView *updateable_view;
- QListViewItem *placeholder;
+ Q3ListView *updateable_view;
+ Q3ListViewItem *placeholder;
QPushButton *update_selected_button;
QPushButton *update_all_button;
@@ -187,8 +189,8 @@
void rCommandDone (RCommand *command);
private:
void installPackages (const QStringList &list);
- QListView *installable_view;
- QListViewItem *placeholder;
+ Q3ListView *installable_view;
+ Q3ListViewItem *placeholder;
QPushButton *install_selected_button;
QPushButton *get_list_button;
Modified: branches/KDE4_port/rkward/dialogs/rkreadlinedialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dialogs/rkreadlinedialog.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dialogs/rkreadlinedialog.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,9 +18,9 @@
#include "rkreadlinedialog.h"
#include <qlineedit.h>
-#include <qtextedit.h>
+#include <q3textedit.h>
#include <qlabel.h>
-#include <qvbox.h>
+#include <q3vbox.h>
#include <qapplication.h>
#include <qdesktopwidget.h>
@@ -36,7 +36,7 @@
RK_TRACE (DIALOGS);
RK_ASSERT (command);
- QVBox *page = makeVBoxMainWidget ();
+ Q3VBox *page = makeVBoxMainWidget ();
new QLabel (caption, page);
int screen_width = qApp->desktop ()->width () - 2*marginHint() - 2*spacingHint (); // TODO is this correct on xinerama?
@@ -45,11 +45,11 @@
if (!context.isEmpty ()) {
new QLabel (i18n ("Context:"), page);
- QTextEdit *output = new QTextEdit (page);
+ Q3TextEdit *output = new Q3TextEdit (page);
output->setUndoRedoEnabled (false);
- output->setTextFormat (QTextEdit::PlainText);
+ output->setTextFormat (Q3TextEdit::PlainText);
output->setCurrentFont (QFont ("Courier"));
- output->setWordWrap (QTextEdit::NoWrap);
+ output->setWordWrap (Q3TextEdit::NoWrap);
output->setText (context);
output->setReadOnly (true);
int cwidth = output->contentsWidth ();
Modified: branches/KDE4_port/rkward/dialogs/startupdialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dialogs/startupdialog.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dialogs/startupdialog.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -19,12 +19,15 @@
#include <qpushbutton.h>
#include <qradiobutton.h>
#include <qcheckbox.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
#include <qlayout.h>
#include <qlabel.h>
-#include <qlistview.h>
+#include <q3listview.h>
#include <qstringlist.h>
#include <qpixmap.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
#include <kdeversion.h>
#if !KDE_IS_VERSION (3, 2,0)
@@ -44,18 +47,18 @@
setCaption (i18n ("What would you like to do?"));
- QVBoxLayout *vbox = new QVBoxLayout (this);
+ Q3VBoxLayout *vbox = new Q3VBoxLayout (this);
logo = new QPixmap (RKCommonFunctions::getRKWardDataDir () + "icons/rkward_logo.png");
QLabel *pic = new QLabel (this);
pic->setPixmap (*logo);
vbox->addWidget (pic);
- choser = new QButtonGroup (this);
+ choser = new Q3ButtonGroup (this);
choser->setColumnLayout (0, Qt::Vertical);
choser->layout()->setSpacing (6);
choser->layout()->setMargin (11);
- QVBoxLayout *choser_layout = new QVBoxLayout(choser->layout());
+ Q3VBoxLayout *choser_layout = new Q3VBoxLayout(choser->layout());
choser_layout->addWidget (empty_workspace_button = new QRadioButton (i18n ("Start with an empty workspace"), choser));
choser_layout->addWidget (empty_table_button = new QRadioButton (i18n ("Start with an empty table"), choser));
open_button = new QRadioButton (i18n ("Load an existing workspace:"), choser);
@@ -63,24 +66,24 @@
empty_table_button->setChecked (true);
choser_layout->addWidget (open_button);
- file_list = new QListView (choser);
+ file_list = new Q3ListView (choser);
file_list->addColumn (i18n ("Filename"));
file_list->setSorting (-1);
- chose_file_item = new QListViewItem (file_list, i18n ("<<Open another file>>"));
+ chose_file_item = new Q3ListViewItem (file_list, i18n ("<<Open another file>>"));
if (recent_files) {
QStringList items = recent_files->items ();
for (QStringList::iterator it = items.begin (); it != items.end (); ++it) {
- if (!(*it).isEmpty ()) new QListViewItem (file_list, (*it));
+ if (!(*it).isEmpty ()) new Q3ListViewItem (file_list, (*it));
}
}
- connect (file_list, SIGNAL (selectionChanged (QListViewItem *)), this, SLOT (listClicked (QListViewItem*)));
- connect (file_list, SIGNAL (doubleClicked (QListViewItem *, const QPoint &, int)), this, SLOT (listDoubleClicked (QListViewItem*, const QPoint &, int)));
+ connect (file_list, SIGNAL (selectionChanged (Q3ListViewItem *)), this, SLOT (listClicked (Q3ListViewItem*)));
+ connect (file_list, SIGNAL (doubleClicked (Q3ListViewItem *, const QPoint &, int)), this, SLOT (listDoubleClicked (Q3ListViewItem*, const QPoint &, int)));
choser_layout->addWidget (file_list);
choser_layout->addWidget (remember_box = new QCheckBox (i18n ("Always do this on startup"), choser));
vbox->addWidget (choser);
- QHBoxLayout *button_hbox = new QHBoxLayout (vbox);
+ Q3HBoxLayout *button_hbox = new Q3HBoxLayout (vbox);
ok_button = new QPushButton (i18n ("Ok"), this);
connect (ok_button, SIGNAL (clicked ()), this, SLOT (accept ()));
button_hbox->addWidget (ok_button);
@@ -106,7 +109,7 @@
} else if (empty_table_button->isChecked ()) {
result->result = EmptyTable;
} else if (open_button->isChecked ()) {
- QListViewItem *item = file_list->selectedItem ();
+ Q3ListViewItem *item = file_list->selectedItem ();
if (item == chose_file_item) {
result->result = ChoseFile;
} else {
@@ -128,7 +131,7 @@
QDialog::reject ();
}
-void StartupDialog::listDoubleClicked (QListViewItem *item, const QPoint &, int) {
+void StartupDialog::listDoubleClicked (Q3ListViewItem *item, const QPoint &, int) {
RK_TRACE (DIALOGS);
if (item) {
@@ -138,7 +141,7 @@
}
}
-void StartupDialog::listClicked (QListViewItem *item) {
+void StartupDialog::listClicked (Q3ListViewItem *item) {
RK_TRACE (DIALOGS);
if (item) {
Modified: branches/KDE4_port/rkward/dialogs/startupdialog.h
===================================================================
--- branches/KDE4_port/rkward/dialogs/startupdialog.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/dialogs/startupdialog.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,15 +18,17 @@
#define STARTUPDIALOG_H
#include <qdialog.h>
+//Added by qt3to4:
+#include <QPixmap>
#include <kurl.h>
class QPushButton;
class QCheckBox;
-class QButtonGroup;
+class Q3ButtonGroup;
class QRadioButton;
-class QListView;
-class QListViewItem;
+class Q3ListView;
+class Q3ListViewItem;
class QPixmap;
class KRecentFilesAction;
@@ -60,8 +62,8 @@
public slots:
void accept ();
void reject ();
- void listDoubleClicked (QListViewItem *item, const QPoint &, int);
- void listClicked (QListViewItem *item);
+ void listDoubleClicked (Q3ListViewItem *item, const QPoint &, int);
+ void listClicked (Q3ListViewItem *item);
void openButtonSelected (int state);
private:
QPushButton *ok_button;
@@ -71,10 +73,10 @@
QRadioButton *open_button;
QCheckBox *remember_box;
- QButtonGroup *choser;
+ Q3ButtonGroup *choser;
- QListView *file_list;
- QListViewItem *chose_file_item;
+ Q3ListView *file_list;
+ Q3ListViewItem *chose_file_item;
QPixmap *logo;
Modified: branches/KDE4_port/rkward/misc/getfilenamewidget.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/getfilenamewidget.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/misc/getfilenamewidget.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,6 +18,8 @@
#include <qlayout.h>
#include <qlabel.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
#include <klocale.h>
#include <klineedit.h>
@@ -27,7 +29,7 @@
GetFileNameWidget::GetFileNameWidget (QWidget *parent, FileType mode, const QString &label, const QString &caption, const QString &initial) : QWidget (parent) {
RK_TRACE (MISC);
- QVBoxLayout *vbox = new QVBoxLayout (this);
+ Q3VBoxLayout *vbox = new Q3VBoxLayout (this);
vbox->setResizeMode (QLayout::Minimum);
vbox->addWidget (new QLabel (label, this));
Modified: branches/KDE4_port/rkward/misc/multistringselector.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/multistringselector.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/misc/multistringselector.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -17,10 +17,13 @@
#include "multistringselector.h"
-#include <qlistview.h>
+#include <q3listview.h>
#include <qpushbutton.h>
#include <qlayout.h>
#include <qlabel.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
#include <klocale.h>
@@ -30,17 +33,17 @@
MultiStringSelector::MultiStringSelector (const QString& label, QWidget* parent) : QWidget (parent) {
RK_TRACE (MISC);
- QHBoxLayout *hbox = new QHBoxLayout (this, RKGlobals::spacingHint ());
+ Q3HBoxLayout *hbox = new Q3HBoxLayout (this, RKGlobals::spacingHint ());
- QVBoxLayout *main_box = new QVBoxLayout (hbox, RKGlobals::spacingHint ());
- QVBoxLayout *button_box = new QVBoxLayout (hbox, RKGlobals::spacingHint ());
+ Q3VBoxLayout *main_box = new Q3VBoxLayout (hbox, RKGlobals::spacingHint ());
+ Q3VBoxLayout *button_box = new Q3VBoxLayout (hbox, RKGlobals::spacingHint ());
QLabel *label_widget = new QLabel (label, this);
main_box->addWidget (label_widget);
- list_view = new QListView (this);
+ list_view = new Q3ListView (this);
list_view->addColumn (i18n ("Filename"));
- list_view->setSelectionMode (QListView::Single);
+ list_view->setSelectionMode (Q3ListView::Single);
list_view->setSorting (-1);
connect (list_view, SIGNAL (selectionChanged ()), this, SLOT (listSelectionChanged ()));
main_box->addWidget (list_view);
@@ -76,7 +79,7 @@
RK_TRACE (MISC);
QStringList list;
- QListViewItem *item = list_view->firstChild ();
+ Q3ListViewItem *item = list_view->firstChild ();
while (item) {
list.append (item->text (0));
@@ -91,7 +94,7 @@
list_view->clear ();
for (QStringList::const_iterator it = values.begin (); it != values.end (); ++it) {
- QListViewItem *item = new QListViewItem (list_view, list_view->lastItem ());
+ Q3ListViewItem *item = new Q3ListViewItem (list_view, list_view->lastItem ());
item->setText (0, (*it));
}
listSelectionChanged ();
@@ -104,7 +107,7 @@
QStringList new_strings;
emit (getNewStrings (&new_strings));
for (QStringList::const_iterator it = new_strings.begin (); it != new_strings.end (); ++it) {
- QListViewItem *item = new QListViewItem (list_view, list_view->lastItem ());
+ Q3ListViewItem *item = new Q3ListViewItem (list_view, list_view->lastItem ());
item->setText (0, (*it));
}
emit (listChanged ());
@@ -121,10 +124,10 @@
void MultiStringSelector::upButtonClicked () {
RK_TRACE (MISC);
- QListViewItem *sel = list_view->selectedItem ();
+ Q3ListViewItem *sel = list_view->selectedItem ();
RK_ASSERT (sel);
- QListViewItem *above = sel->itemAbove ();
+ Q3ListViewItem *above = sel->itemAbove ();
if (above) {
above->moveItem (sel);
}
@@ -134,7 +137,7 @@
void MultiStringSelector::downButtonClicked () {
RK_TRACE (MISC);
- QListViewItem *sel = list_view->selectedItem ();
+ Q3ListViewItem *sel = list_view->selectedItem ();
RK_ASSERT (sel);
if (sel->nextSibling ()) sel->moveItem (sel->nextSibling ());
Modified: branches/KDE4_port/rkward/misc/multistringselector.h
===================================================================
--- branches/KDE4_port/rkward/misc/multistringselector.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/misc/multistringselector.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -22,7 +22,7 @@
#include <qstringlist.h>
#include <qstring.h>
-class QListView;
+class Q3ListView;
class QPushButton;
/** This convenience widget allows to select one or more strings (e.g. filenames) and sort them in any order. The function to acutally select new strings to add to the selection is not implemented in this class for more flexibility. Rather, connect to the getNewStrings () signal and assign the desired QString(s) in a custom slot.
@@ -47,7 +47,7 @@
void downButtonClicked ();
void listSelectionChanged ();
private:
- QListView* list_view;
+ Q3ListView* list_view;
QPushButton* add_button;
QPushButton* remove_button;
QPushButton* up_button;
Modified: branches/KDE4_port/rkward/misc/rkcanceldialog.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/rkcanceldialog.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/misc/rkcanceldialog.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -19,6 +19,9 @@
#include <qlayout.h>
#include <qlabel.h>
#include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <QCloseEvent>
#include <klocale.h>
#include <kdialog.h>
@@ -32,7 +35,7 @@
RK_TRACE (DIALOGS);
setCaption (caption);
- QVBoxLayout *layout = new QVBoxLayout (this, KDialog::marginHint (), KDialog::spacingHint ());
+ Q3VBoxLayout *layout = new Q3VBoxLayout (this, KDialog::marginHint (), KDialog::spacingHint ());
QLabel *label = new QLabel (text, this);
label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
layout->addWidget (label);
Modified: branches/KDE4_port/rkward/misc/rkcanceldialog.h
===================================================================
--- branches/KDE4_port/rkward/misc/rkcanceldialog.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/misc/rkcanceldialog.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,6 +18,8 @@
#define RKCANCELDIALOG_H
#include <qdialog.h>
+//Added by qt3to4:
+#include <QCloseEvent>
class RCommand;
Modified: branches/KDE4_port/rkward/misc/rkcommonfunctions.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/rkcommonfunctions.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/misc/rkcommonfunctions.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -19,6 +19,8 @@
#include <qstringlist.h>
#include <qdom.h>
#include <qregexp.h>
+//Added by qt3to4:
+#include <Q3PtrList>
#include <kxmlguiclient.h>
#include <kglobal.h>
@@ -50,7 +52,7 @@
from->setXMLGUIBuildDocument (doc);
if (recursive) {
- QPtrList <KXMLGUIClient> *children = const_cast<QPtrList <KXMLGUIClient> *> (from->childClients ());
+ Q3PtrList <KXMLGUIClient> *children = const_cast<Q3PtrList <KXMLGUIClient> *> (from->childClients ());
if (children) {
for (KXMLGUIClient *child = children->first (); child; child = children->next ()) {
removeContainers (child, names, true);
@@ -90,7 +92,7 @@
// recurse
if (recursive) {
- QPtrList <KXMLGUIClient> *children = const_cast<QPtrList <KXMLGUIClient> *> (client->childClients ());
+ Q3PtrList <KXMLGUIClient> *children = const_cast<Q3PtrList <KXMLGUIClient> *> (client->childClients ());
if (children) {
for (KXMLGUIClient *child = children->first (); child; child = children->next ()) {
moveContainer (child, tagname, name, to_name, true);
Modified: branches/KDE4_port/rkward/misc/rkobjectlistview.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/rkobjectlistview.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/misc/rkobjectlistview.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -19,7 +19,7 @@
#include <klocale.h>
#include <kiconloader.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
#include <qpixmap.h>
#include <qimage.h>
@@ -40,7 +40,7 @@
QPixmap *RKObjectListView::package_environment = 0;
QPixmap *RKObjectListView::environment = 0;
-RKObjectListView::RKObjectListView (QWidget *parent) : QListView (parent) {
+RKObjectListView::RKObjectListView (QWidget *parent) : Q3ListView (parent) {
RK_TRACE (APP);
if (icon_function == 0) {
icon_function = new QPixmap (QImage (RKCommonFunctions::getRKWardDataDir () + "icons/function.png"));
@@ -57,11 +57,11 @@
settings = new RKObjectListViewSettings ();
connect (settings, SIGNAL (settingsChanged ()), this, SLOT (objectBrowserSettingsChanged ()));
- menu = new QPopupMenu (this);
+ menu = new Q3PopupMenu (this);
menu->insertItem (i18n ("Show Objects"), settings->showObjectsMenu ());
menu->insertItem (i18n ("Show Fields"), settings->showFieldsMenu ());
menu->insertItem (i18n ("Configure Defaults"), this, SLOT (popupConfigure ()));
- connect (this, SIGNAL (contextMenuRequested (QListViewItem *, const QPoint &, int)), this, SLOT (requestedContextMenu (QListViewItem*, const QPoint&, int)));
+ connect (this, SIGNAL (contextMenuRequested (Q3ListViewItem *, const QPoint &, int)), this, SLOT (requestedContextMenu (Q3ListViewItem*, const QPoint&, int)));
setShowToolTips (false);
tip = new RKObjectListViewTip (this);
@@ -89,34 +89,34 @@
}
void RKObjectListView::objectBrowserSettingsChanged () {
- setColumnWidthMode (0, QListView::Maximum);
+ setColumnWidthMode (0, Q3ListView::Maximum);
if (settings->settingActive (RKObjectListViewSettings::ShowFieldsLabel)) {
if (columnWidth (1) == 0) setColumnWidth (1, 50);
- setColumnWidthMode (1, QListView::Maximum);
+ setColumnWidthMode (1, Q3ListView::Maximum);
} else {
- setColumnWidthMode (1, QListView::Manual);
+ setColumnWidthMode (1, Q3ListView::Manual);
hideColumn (1);
}
if (settings->settingActive (RKObjectListViewSettings::ShowFieldsType)) {
if (columnWidth (2) == 0) setColumnWidth (2, 50);
- setColumnWidthMode (2, QListView::Maximum);
+ setColumnWidthMode (2, Q3ListView::Maximum);
} else {
- setColumnWidthMode (2, QListView::Manual);
+ setColumnWidthMode (2, Q3ListView::Manual);
hideColumn (2);
}
if (settings->settingActive (RKObjectListViewSettings::ShowFieldsClass)) {
if (columnWidth (3) == 0) setColumnWidth (3, 50);
- setColumnWidthMode (3, QListView::Maximum);
+ setColumnWidthMode (3, Q3ListView::Maximum);
} else {
- setColumnWidthMode (3, QListView::Manual);
+ setColumnWidthMode (3, Q3ListView::Manual);
hideColumn (3);
}
triggerUpdate ();
- for (QListViewItemIterator it (this); it.current (); ++it) {
+ for (Q3ListViewItemIterator it (this); it.current (); ++it) {
RObject *object = findItemObject (static_cast<RKListViewItem*> (it.current ()));
RK_ASSERT (object);
@@ -129,7 +129,7 @@
RKSettings::configureSettings (RKSettings::ObjectBrowser, this);
}
-void RKObjectListView::requestedContextMenu (QListViewItem *item, const QPoint &pos, int) {
+void RKObjectListView::requestedContextMenu (Q3ListViewItem *item, const QPoint &pos, int) {
RObject *object = findItemObject (static_cast<RKListViewItem *> (item));
menu_object = object;
@@ -346,14 +346,14 @@
//////////////////// RKListViewItem //////////////////////////
-int RKListViewItem::width (const QFontMetrics &fm, const QListView * lv, int c) const {
+int RKListViewItem::width (const QFontMetrics &fm, const Q3ListView * lv, int c) const {
if (parent ()) {
if (!parent ()->isOpen ()) {
return 0;
}
}
- int ret = QListViewItem::width (fm, lv, c);
+ int ret = Q3ListViewItem::width (fm, lv, c);
if (ret > 200) return 200;
return ret;
}
@@ -424,7 +424,7 @@
void RKObjectListViewSettings::createContextMenus () {
RK_TRACE (APP);
- show_objects_menu = new QPopupMenu (0);
+ show_objects_menu = new Q3PopupMenu (0);
insertPopupItem (show_objects_menu, ShowObjectsAllEnvironments, i18n ("All Environments"));
insertPopupItem (show_objects_menu, ShowObjectsContainer, i18n ("Objects with children"));
insertPopupItem (show_objects_menu, ShowObjectsVariable, i18n ("Variables"));
@@ -432,7 +432,7 @@
show_objects_menu->insertSeparator ();
insertPopupItem (show_objects_menu, ShowObjectsHidden, i18n ("Hidden Objects"));
- show_fields_menu = new QPopupMenu (0);
+ show_fields_menu = new Q3PopupMenu (0);
insertPopupItem (show_fields_menu, ShowFieldsType, i18n ("Type"));
insertPopupItem (show_fields_menu, ShowFieldsLabel, i18n ("Label"));
insertPopupItem (show_fields_menu, ShowFieldsClass, i18n ("Class"));
@@ -454,7 +454,7 @@
emit (settingsChanged ());
}
-void RKObjectListViewSettings::insertPopupItem (QPopupMenu *menu, Settings setting, const QString &text) {
+void RKObjectListViewSettings::insertPopupItem (Q3PopupMenu *menu, Settings setting, const QString &text) {
RK_TRACE (APP);
menu->insertItem (text, setting);
Modified: branches/KDE4_port/rkward/misc/rkobjectlistview.h
===================================================================
--- branches/KDE4_port/rkward/misc/rkobjectlistview.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/misc/rkobjectlistview.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -17,13 +17,16 @@
#ifndef RKOBJECTLISTVIEW_H
#define RKOBJECTLISTVIEW_H
-#include <qlistview.h>
+#include <q3listview.h>
#include <qtooltip.h>
#include <qmap.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <Q3PopupMenu>
class RObject;
class QPixmap;
-class QPopupMenu;
+class Q3PopupMenu;
class RKListViewItem;
class RKObjectListViewTip;
class RKObjectListViewSettings;
@@ -33,7 +36,7 @@
@author Thomas Friedrichsmeier
*/
-class RKObjectListView : public QListView {
+class RKObjectListView : public Q3ListView {
Q_OBJECT
public:
explicit RKObjectListView (QWidget *parent);
@@ -47,7 +50,7 @@
/** This function returns a pointer to the context menu of the RKObjectListView. It is provided so you can add your own items.
@returns a pointer to the context menu
@see aboutToShowContextMenu */
- QPopupMenu *contextMenu () { return menu; };
+ Q3PopupMenu *contextMenu () { return menu; };
/** This function returns the RObject the context menu has last been invoked on (or 0 if not invoked on an RObject). You can use this in slots called
from your custom menu items, to figure out, which object you should operate on. */
RObject *menuObject () { return menu_object; };
@@ -74,7 +77,7 @@
void objectBrowserSettingsChanged ();
- void requestedContextMenu (QListViewItem *item, const QPoint &pos, int col);
+ void requestedContextMenu (Q3ListViewItem *item, const QPoint &pos, int col);
virtual void popupConfigure ();
private:
@@ -90,7 +93,7 @@
bool update_in_progress;
bool changes;
- QPopupMenu *menu;
+ Q3PopupMenu *menu;
RObject *menu_object;
RKObjectListViewSettings *settings;
@@ -106,13 +109,13 @@
@author Thomas Friedrichsmeier
*/
-class RKListViewItem : public QListViewItem {
+class RKListViewItem : public Q3ListViewItem {
public:
- RKListViewItem (QListView *parent) : QListViewItem (parent) {};
- RKListViewItem (QListViewItem *parent) : QListViewItem (parent) {};
+ RKListViewItem (Q3ListView *parent) : Q3ListViewItem (parent) {};
+ RKListViewItem (Q3ListViewItem *parent) : Q3ListViewItem (parent) {};
~RKListViewItem () {};
- int width (const QFontMetrics &fm, const QListView * lv, int c) const;
+ int width (const QFontMetrics &fm, const Q3ListView * lv, int c) const;
};
class RKObjectListViewTip : public QToolTip {
@@ -159,8 +162,8 @@
bool shouldShowObject (RObject *object);
- QPopupMenu *showObjectsMenu () { return show_objects_menu; };
- QPopupMenu *showFieldsMenu () { return show_fields_menu; };
+ Q3PopupMenu *showObjectsMenu () { return show_objects_menu; };
+ Q3PopupMenu *showFieldsMenu () { return show_fields_menu; };
signals:
void settingsChanged ();
public slots:
@@ -169,12 +172,12 @@
private:
State *settings;
bool *settings_default;
- void insertPopupItem (QPopupMenu *menu, Settings setting, const QString &text);
+ void insertPopupItem (Q3PopupMenu *menu, Settings setting, const QString &text);
void createContextMenus ();
void updateSelf ();
- QPopupMenu *show_objects_menu;
- QPopupMenu *show_fields_menu;
+ Q3PopupMenu *show_objects_menu;
+ Q3PopupMenu *show_fields_menu;
};
#endif
Modified: branches/KDE4_port/rkward/misc/rkprogresscontrol.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/rkprogresscontrol.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/misc/rkprogresscontrol.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -23,6 +23,11 @@
#include "../rbackend/rinterface.h"
#include "../debug.h"
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QCloseEvent>
+#include <Q3ValueList>
+#include <Q3VBoxLayout>
RKProgressControl::RKProgressControl (QObject *parent, const QString &text, const QString &caption, int mode_flags) : QObject (parent) {
RK_TRACE (MISC);
@@ -157,7 +162,7 @@
dialog = new RKProgressControlDialog (text, caption, mode, modal);
connect (dialog, SIGNAL (destroyed ()), this, SLOT (dialogDestroyed ()));
if (is_done) done ();
- for (QValueList<ROutput>::const_iterator it = output_log.begin (); it != output_log.end (); ++it) {
+ for (Q3ValueList<ROutput>::const_iterator it = output_log.begin (); it != output_log.end (); ++it) {
dialog->addOutput (&(*it));
}
}
@@ -184,17 +189,17 @@
//////////////////////////// RKProgressControlDialog ///////////////////////////////////////////7
#include <qlayout.h>
-#include <qtextedit.h>
+#include <q3textedit.h>
#include <qlabel.h>
#include <qpushbutton.h>
-#include <qvbox.h>
+#include <q3vbox.h>
RKProgressControlDialog::RKProgressControlDialog (const QString &text, const QString &caption, int mode_flags, bool modal) : QDialog (0, 0, modal, Qt::WDestructiveClose) {
RK_TRACE (MISC);
setCaption (caption);
- QVBoxLayout *vbox = new QVBoxLayout (this, RKGlobals::marginHint (), RKGlobals::spacingHint ());
+ Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::marginHint (), RKGlobals::spacingHint ());
QLabel *label = new QLabel (text, this);
label->setAlignment (Qt::AlignAuto | Qt::ExpandTabs | Qt::WordBreak);
@@ -205,7 +210,7 @@
error_indicator->hide ();
vbox->addWidget (error_indicator);
- output_box = new QVBox (this);
+ output_box = new Q3VBox (this);
vbox->addWidget (output_box);
if (mode_flags & (RKProgressControl::IncludeErrorOutput | RKProgressControl::IncludeRegularOutput)) {
QString ocaption;
@@ -220,7 +225,7 @@
}
output_caption = new QLabel (ocaption, output_box);
- output_text = new QTextEdit (output_box);
+ output_text = new Q3TextEdit (output_box);
output_text->setReadOnly (true);
output_text->setTextFormat (PlainText);
output_text->setUndoRedoEnabled (false);
@@ -230,7 +235,7 @@
}
}
- QHBoxLayout *button_layout = new QHBoxLayout (0, 0, RKGlobals::spacingHint ());
+ Q3HBoxLayout *button_layout = new Q3HBoxLayout (0, 0, RKGlobals::spacingHint ());
vbox->addLayout (button_layout);
toggle_output_button = new QPushButton (show_output_text, this);
Modified: branches/KDE4_port/rkward/misc/rkprogresscontrol.h
===================================================================
--- branches/KDE4_port/rkward/misc/rkprogresscontrol.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/misc/rkprogresscontrol.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,6 +18,10 @@
#define RKPROGRESSCONTROL_H
#include <qobject.h>
+//Added by qt3to4:
+#include <QLabel>
+#include <Q3ValueList>
+#include <QCloseEvent>
#include "../rbackend/rcommandreceiver.h"
#include <qstring.h>
@@ -25,8 +29,8 @@
class QDialog;
class QLabel;
-class QTextEdit;
-class QVBox;
+class Q3TextEdit;
+class Q3VBox;
class RKProgressControlDialog;
@@ -92,7 +96,7 @@
void createDialog ();
RKProgressControlDialog *dialog;
- QValueList<ROutput> output_log;
+ Q3ValueList<ROutput> output_log;
RCommand *done_command;
@@ -126,8 +130,8 @@
private:
QLabel *output_caption;
QLabel *error_indicator;
- QTextEdit *output_text;
- QVBox *output_box;
+ Q3TextEdit *output_text;
+ Q3VBox *output_box;
QString show_output_text;
QString hide_output_text;
Modified: branches/KDE4_port/rkward/misc/rksaveobjectchooser.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/rksaveobjectchooser.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/misc/rksaveobjectchooser.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -21,6 +21,8 @@
#include <qcheckbox.h>
#include <qlayout.h>
#include <qlabel.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
#include <klocale.h>
@@ -34,7 +36,7 @@
prev_ok = true;
object_exists = false;
- QVBoxLayout *layout = new QVBoxLayout (this);
+ Q3VBoxLayout *layout = new Q3VBoxLayout (this);
QLabel *label = new QLabel (prompt.isNull () ? i18n ("Object name to save to") : prompt, this);
layout->addWidget (label);
Modified: branches/KDE4_port/rkward/misc/xmlhelper.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/xmlhelper.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/misc/xmlhelper.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -60,7 +60,7 @@
highest_error = 0;
QFile f (filename);
- if (!f.open (IO_ReadOnly)) displayError (0, i18n("Could not open file for reading"), debug_level, DL_ERROR);
+ if (!f.open (QIODevice::ReadOnly)) displayError (0, i18n("Could not open file for reading"), debug_level, DL_ERROR);
if (!doc.setContent(&f, false, &error_message, &error_line, &error_column)) {
displayError (0, i18n ("Error parsing XML-file. Error-message was: '%1' in line '%2', column '%3'. Expect further errors to be reported below").arg (error_message).arg (QString::number (error_line)).arg (QString::number (error_column)), debug_level, DL_ERROR);
}
Modified: branches/KDE4_port/rkward/misc/xmlhelper.h
===================================================================
--- branches/KDE4_port/rkward/misc/xmlhelper.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/misc/xmlhelper.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -19,10 +19,10 @@
#define XMLHELPER_H
#include <qdom.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
/** a helper type used to pass a list of direct child elements of a node */
-typedef QValueList<QDomElement> XMLChildList;
+typedef Q3ValueList<QDomElement> XMLChildList;
/** This class contains some convenience functions for parsing XML files (DOM). Usually you will use a static instance of this class (getStaticHelper ()), which will be created early in rkward initialization. The error-logs will be reset every time you open a new XML-file using openXMLFile (). This is fine as long as you are parsing files one by one instead of mixing several files. In the latter case you will want to create additional instances of XMLHelper (it's quite possible, this mechanism will be changed, but I want to get going before considering all implications ;-)).
Modified: branches/KDE4_port/rkward/plugin/rkcheckbox.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkcheckbox.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkcheckbox.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,6 +18,8 @@
#include <qlayout.h>
#include <qcheckbox.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
#include "../rkglobals.h"
#include "../misc/xmlhelper.h"
@@ -34,7 +36,7 @@
connect (state, SIGNAL (valueChanged (RKComponentPropertyBase *)), this, SLOT (changedState (RKComponentPropertyBase *)));
// create checkbox
- QVBoxLayout *vbox = new QVBoxLayout (this, RKGlobals::spacingHint ());
+ Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::spacingHint ());
checkbox = new QCheckBox (xml->getStringAttribute (element, "label", QString::null, DL_WARNING), this);
vbox->addWidget (checkbox);
checkbox->setChecked (xml->getBoolAttribute (element, "checked", false, DL_INFO));
Modified: branches/KDE4_port/rkward/plugin/rkcomponent.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkcomponent.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkcomponent.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -46,7 +46,7 @@
void RKComponentBase::fetchPropertyValuesRecursive (QMap<QString, QString> *list, bool include_top_level, const QString &prefix) {
RK_TRACE (PLUGIN);
- for (QDictIterator<RKComponentBase> it (child_map); it.current (); ++it) {
+ for (Q3DictIterator<RKComponentBase> it (child_map); it.current (); ++it) {
if (it.currentKey () != "#noid#") {
if (it.current ()->isProperty ()) {
if (include_top_level) {
@@ -157,7 +157,7 @@
setEnabled (enabled); /* We do this, even if the state *seems* to be unchanged. This is needed, as isEnabled () also returns false, if the parent QWidget is not enabled. However, the parent QWidget may not always be the parent component. */
if (enabled != isEnabled ()) {
- for (QDictIterator<RKComponentBase> it (child_map); it.current (); ++it) {
+ for (Q3DictIterator<RKComponentBase> it (child_map); it.current (); ++it) {
if (it.current ()->isComponent()) {
static_cast<RKComponent*> (it.current ())->updateEnablednessRecursive ();
}
@@ -168,7 +168,7 @@
bool RKComponent::isValid () {
RK_TRACE (PLUGIN);
- for (QDictIterator<RKComponentBase> it (child_map); it.current (); ++it) {
+ for (Q3DictIterator<RKComponentBase> it (child_map); it.current (); ++it) {
if (!(it.current ()->isSatisfied ())) return false;
}
return true;
@@ -234,7 +234,7 @@
RK_TRACE (PLUGIN);
if (!parentComponent ()) return;
- for (QDictIterator<RKComponentBase> it (parentComponent ()->child_map); it.current (); ++it) {
+ for (Q3DictIterator<RKComponentBase> it (parentComponent ()->child_map); it.current (); ++it) {
if (it.current () == this) {
QString key = it.currentKey ();
// unfortunately, several items might hvae the same key, and there seems to be no way to selectively remove the current item only.
Modified: branches/KDE4_port/rkward/plugin/rkcomponent.h
===================================================================
--- branches/KDE4_port/rkward/plugin/rkcomponent.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkcomponent.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,7 +18,7 @@
#ifndef RKCOMPONENT_H
#define RKCOMPONENT_H
-#include <qdict.h>
+#include <q3dict.h>
#include <qmap.h>
#include <qwidget.h>
@@ -84,7 +84,7 @@
/** simple convenience function to add a child to the map of children */
void addChild (const QString &id, RKComponentBase *child);
protected:
- QDict<RKComponentBase> child_map;
+ Q3Dict<RKComponentBase> child_map;
bool required;
/** recursively fetch the current values of all properties present as direct or indirect children of this component. Used to transfer values e.g. when switching interfaces (or to store settings per plugin in the future). Values are placed in the dictionary provided (be sure to create one first!).
@param list the list to store the object values in
Modified: branches/KDE4_port/rkward/plugin/rkcomponentcontext.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkcomponentcontext.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkcomponentcontext.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -108,7 +108,7 @@
RKComponent *component = handle->invoke (0, 0);
// set context values
- for (QDictIterator<RKComponentBase> it (child_map); it.current (); ++it) {
+ for (Q3DictIterator<RKComponentBase> it (child_map); it.current (); ++it) {
if (it.currentKey () != "#noid#") {
QString id = it.currentKey ();
QString remainder;
Modified: branches/KDE4_port/rkward/plugin/rkcomponentproperties.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkcomponentproperties.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkcomponentproperties.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -94,6 +94,8 @@
#include "rkcomponentproperties.h"
#include "../debug.h"
+//Added by qt3to4:
+#include <Q3ValueList>
///////////////////////////////////////////// Base //////////////////////////////////////////
@@ -774,7 +776,7 @@
return (object_list.first ());
}
-QValueList<RObject *> RKComponentPropertyRObjects::objectList () {
+Q3ValueList<RObject *> RKComponentPropertyRObjects::objectList () {
RK_TRACE (PLUGIN);
return (object_list);
@@ -943,7 +945,7 @@
// first find out the list of objects from the listview
ObjectList newlist;
- QListViewItem *current;
+ Q3ListViewItem *current;
current = list_view->firstChild ();
while (current->itemBelow ()) {
current = current->itemBelow ();
@@ -1105,7 +1107,7 @@
void RKComponentPropertyConvert::sourcePropertyChanged (RKComponentPropertyBase *) {
RK_TRACE (PLUGIN);
- for (QValueList<Source>::const_iterator it = sources.constBegin (); it != sources.constEnd (); ++it) {
+ for (Q3ValueList<Source>::const_iterator it = sources.constBegin (); it != sources.constEnd (); ++it) {
Source source = *it; // easier typing
switch (_mode) {
case Equals: {
Modified: branches/KDE4_port/rkward/plugin/rkcomponentproperties.h
===================================================================
--- branches/KDE4_port/rkward/plugin/rkcomponentproperties.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkcomponentproperties.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -211,10 +211,10 @@
class RKObjectListView;
#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
/** for easier typing. A list of RObjects. Should probably be defined somewhere in core-dir instead. */
-typedef QValueList<RObject *> ObjectList;
+typedef Q3ValueList<RObject *> ObjectList;
/** special type of RKComponentProperty, that prepresents one or more RObject (s) */
class RKComponentPropertyRObjects : public RKComponentPropertyBase {
@@ -390,7 +390,7 @@
RKComponentPropertyBase *property;
QString modifier;
};
- QValueList<Source> sources;
+ Q3ValueList<Source> sources;
};
#endif
Modified: branches/KDE4_port/rkward/plugin/rkdropdown.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkdropdown.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkdropdown.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -21,7 +21,9 @@
#include <qlabel.h>
#include <qlayout.h>
#include <qcombobox.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
#include <klocale.h>
@@ -36,7 +38,7 @@
XMLHelper *xml = XMLHelper::getStaticHelper ();
// create layout
- QVBoxLayout *vbox = new QVBoxLayout (this, RKGlobals::spacingHint ());
+ Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::spacingHint ());
QLabel *label = new QLabel (xml->getStringAttribute (element, "label", i18n ("Select one:"), DL_INFO), this);
vbox->addWidget (label);
@@ -45,7 +47,7 @@
box = new QComboBox (false, this);
if (!(box->listBox ())) {
// make sure the combo box uses a list box internally
- box->setListBox (new QListBox (this));
+ box->setListBox (new Q3ListBox (this));
}
addOptionsAndInit (element);
@@ -61,9 +63,9 @@
void RKDropDown::comboItemActivated (int id) {
RK_TRACE (PLUGIN);
- QListBox *list = box->listBox ();
+ Q3ListBox *list = box->listBox ();
RK_ASSERT (list);
- QListBoxItem *item = list->item (id);
+ Q3ListBoxItem *item = list->item (id);
RK_ASSERT (item);
if (!item->isSelectable ()) return; // yes, apparently not selectable items can be "activated"
@@ -85,9 +87,9 @@
void RKDropDown::setItemEnabledInGUI (int id, bool enabled) {
RK_TRACE (PLUGIN);
- QListBox *list = box->listBox ();
+ Q3ListBox *list = box->listBox ();
RK_ASSERT (list);
- QListBoxItem *item = list->item (id);
+ Q3ListBoxItem *item = list->item (id);
RK_ASSERT (item);
if (item->rtti () != ID_RKDROPDOWNLISTITEM) {
@@ -103,7 +105,7 @@
#include <qpainter.h>
-RKDropDownListItem::RKDropDownListItem (QListBox *listbox, const QString &text) : QListBoxText (listbox, text) {
+RKDropDownListItem::RKDropDownListItem (Q3ListBox *listbox, const QString &text) : Q3ListBoxText (listbox, text) {
RK_TRACE (PLUGIN);
}
@@ -113,7 +115,7 @@
painter->setPen (QColor (150, 150, 150));
}
- QListBoxText::paint (painter);
+ Q3ListBoxText::paint (painter);
}
#include "rkdropdown.moc"
Modified: branches/KDE4_port/rkward/plugin/rkdropdown.h
===================================================================
--- branches/KDE4_port/rkward/plugin/rkdropdown.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkdropdown.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -42,14 +42,14 @@
QComboBox *box;
};
-#include <qlistbox.h>
+#include <q3listbox.h>
#define ID_RKDROPDOWNLISTITEM 1001
/** Item used in RKDropDown. The difference to a regular QListBoxText is that the item looks different when disabled */
-class RKDropDownListItem : public QListBoxText {
+class RKDropDownListItem : public Q3ListBoxText {
public:
- RKDropDownListItem (QListBox *listbox, const QString &text);
+ RKDropDownListItem (Q3ListBox *listbox, const QString &text);
~RKDropDownListItem () {};
int rtti () const { return ID_RKDROPDOWNLISTITEM; };
protected:
Modified: branches/KDE4_port/rkward/plugin/rkformula.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkformula.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkformula.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -16,14 +16,17 @@
***************************************************************************/
#include "rkformula.h"
-#include <qlistview.h>
+#include <q3listview.h>
#include <qpushbutton.h>
#include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
#include <qspinbox.h>
#include <qwidget.h>
#include <qlayout.h>
#include <qdom.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
#include <klocale.h>
#include <kiconloader.h>
@@ -56,28 +59,28 @@
XMLHelper *xml = XMLHelper::getStaticHelper ();
// create layout
- QVBoxLayout *vbox = new QVBoxLayout (this, RKGlobals::spacingHint ());
+ Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::spacingHint ());
- type_selector = new QButtonGroup (this);
+ type_selector = new Q3ButtonGroup (this);
type_selector->setColumnLayout (0, Qt::Vertical);
type_selector->layout ()->setSpacing (RKGlobals::spacingHint ());
type_selector->layout ()->setMargin (RKGlobals::marginHint ());
- QVBoxLayout *group_layout = new QVBoxLayout (type_selector->layout());
+ Q3VBoxLayout *group_layout = new Q3VBoxLayout (type_selector->layout());
group_layout->addWidget (new QRadioButton (i18n ("Full Model"), type_selector));
group_layout->addWidget (new QRadioButton (i18n ("Main Effects only"), type_selector));
group_layout->addWidget (new QRadioButton (i18n ("Custom Model:"), type_selector));
connect (type_selector, SIGNAL (clicked (int)), this, SLOT (typeChange (int)));
custom_model_widget = new QWidget (type_selector);
- QHBoxLayout *model_hbox = new QHBoxLayout (custom_model_widget, RKGlobals::spacingHint ());
- predictors_view = new QListView (custom_model_widget);
+ Q3HBoxLayout *model_hbox = new Q3HBoxLayout (custom_model_widget, RKGlobals::spacingHint ());
+ predictors_view = new Q3ListView (custom_model_widget);
predictors_view->addColumn (i18n ("Name"));
- predictors_view->setSelectionMode (QListView::Extended);
+ predictors_view->setSelectionMode (Q3ListView::Extended);
predictors_view->setSorting (100);
model_hbox->addWidget (predictors_view);
model_hbox->addSpacing (6);
- QVBoxLayout *model_vbox = new QVBoxLayout (model_hbox, RKGlobals::spacingHint ());
+ Q3VBoxLayout *model_vbox = new Q3VBoxLayout (model_hbox, RKGlobals::spacingHint ());
add_button = new QPushButton (QString::null, custom_model_widget);
add_button->setPixmap (SmallIcon ("1rightarrow"));
connect (add_button, SIGNAL (clicked ()), this, SLOT (addButtonClicked ()));
@@ -91,7 +94,7 @@
model_vbox->addWidget (level_box);
model_hbox->addSpacing (6);
- model_view = new QListView (custom_model_widget);
+ model_view = new Q3ListView (custom_model_widget);
model_view->addColumn (i18n ("Level"));
model_view->addColumn (i18n ("Term"));
model_view->setSorting (0);
@@ -128,7 +131,7 @@
item_map.clear ();
ObjectList fixed_list = fixed_factors->objectList ();
for (ObjectList::const_iterator it = fixed_list.begin (); it != fixed_list.end (); ++it) {
- QListViewItem *new_item = new QListViewItem (predictors_view, (*it)->getShortName ());
+ Q3ListViewItem *new_item = new Q3ListViewItem (predictors_view, (*it)->getShortName ());
item_map.insert (new_item, (*it));
}
checkCustomModel ();
@@ -261,16 +264,16 @@
// find an appropriate parent item
if (level_map.find (level) == level_map.end ()) {
- QListViewItem *item = new QListViewItem (model_view, QString().setNum (level));
+ Q3ListViewItem *item = new Q3ListViewItem (model_view, QString().setNum (level));
level_map.insert (level, item);
}
- QListViewItem *parent = level_map[level];
+ Q3ListViewItem *parent = level_map[level];
parent->setOpen (true);
// check for duplicates (remove from old list - new terms might have a different order of naming)
for (int inter = 0; inter < num_interactions; ++inter) {
Interaction *new_inter = &(interactions[inter]);
- QListViewItem *dupe = 0;
+ Q3ListViewItem *dupe = 0;
for (InteractionMap::Iterator it = interaction_map.begin (); it != interaction_map.end (); ++it) {
Interaction *existing_inter = &(it.data ());
// BEGIN: actual comparison
@@ -305,7 +308,7 @@
}
dummy.append (interactions[i].vars[j]->getShortName ());
}
- QListViewItem *item = new QListViewItem (parent, QString::null, dummy);
+ Q3ListViewItem *item = new Q3ListViewItem (parent, QString::null, dummy);
interaction_map.insert (item, interactions[i]);
}
@@ -375,10 +378,10 @@
void RKFormula::removeButtonClicked () {
RK_TRACE (PLUGIN);
- QListViewItem *current = model_view->firstChild ();
+ Q3ListViewItem *current = model_view->firstChild ();
while (current) {
if (current->isSelected ()) {
- QListViewItem *next = current->nextSibling ();
+ Q3ListViewItem *next = current->nextSibling ();
if (current->parent ()) { // single item
InteractionMap::iterator it = interaction_map.find (current);
delete it.data ().vars;
@@ -386,8 +389,8 @@
interaction_map.remove (it);
next = current->parent ();
} else { // level item: remove all children
- for (QListViewItem *child = current->firstChild (); child; ) {
- QListViewItem *next_child = child->nextSibling ();
+ for (Q3ListViewItem *child = current->firstChild (); child; ) {
+ Q3ListViewItem *next_child = child->nextSibling ();
InteractionMap::iterator it = interaction_map.find (child);
delete it.data ().vars;
delete it.key ();
@@ -446,7 +449,7 @@
}
if (found_vars < (inter.level + 1)) {
delete [] (in.data ().vars);
- QListViewItem *parent = in.key ()->parent ();
+ Q3ListViewItem *parent = in.key ()->parent ();
delete in.key ();
if (!parent->firstChild ()) {
delete parent;
Modified: branches/KDE4_port/rkward/plugin/rkformula.h
===================================================================
--- branches/KDE4_port/rkward/plugin/rkformula.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkformula.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -23,12 +23,12 @@
#include <qmap.h>
#include "../core/robject.h"
-class QListView;
+class Q3ListView;
class QPushButton;
-class QButtonGroup;
+class Q3ButtonGroup;
class QWidget;
class QSpinBox;
-class QListViewItem;
+class Q3ListViewItem;
class QDomElement;
/**
@@ -65,11 +65,11 @@
enum ModelType { FullModel=0, MainEffects=1, Custom=2 };
ModelType model_type;
- QButtonGroup *type_selector;
+ Q3ButtonGroup *type_selector;
QWidget *custom_model_widget;
- QListView *model_view;
- QListView *predictors_view;
+ Q3ListView *model_view;
+ Q3ListView *predictors_view;
QPushButton *add_button;
QPushButton *remove_button;
QSpinBox *level_box;
@@ -78,7 +78,7 @@
void makeModelString ();
QString mangleName (RObject *var);
- typedef QMap<QListViewItem*, RObject*> ItemMap;
+ typedef QMap<Q3ListViewItem*, RObject*> ItemMap;
ItemMap item_map;
struct Interaction {
@@ -86,10 +86,10 @@
RObjectPtr* vars;
};
- typedef QMap<QListViewItem*, Interaction> InteractionMap;
+ typedef QMap<Q3ListViewItem*, Interaction> InteractionMap;
InteractionMap interaction_map;
- typedef QMap<int, QListViewItem*> LevelMap;
+ typedef QMap<int, Q3ListViewItem*> LevelMap;
LevelMap level_map;
/** recursively cross the given source variables on level level. Returns the resulting terms in an array. The number
Modified: branches/KDE4_port/rkward/plugin/rkinput.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkinput.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkinput.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,9 +18,11 @@
#include "rkinput.h"
#include <qlayout.h>
-#include <qtextedit.h>
+#include <q3textedit.h>
#include <qlineedit.h>
#include <qlabel.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
#include <klocale.h>
@@ -45,13 +47,13 @@
connect (requirednessProperty (), SIGNAL (valueChanged (RKComponentPropertyBase*)), this, SLOT (requirednessChanged (RKComponentPropertyBase*)));
// do all the layouting
- QVBoxLayout *vbox = new QVBoxLayout (this, RKGlobals::spacingHint ());
+ Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::spacingHint ());
QLabel *label = new QLabel (xml->getStringAttribute (element, "label", i18n ("Enter text"), DL_INFO), this);
vbox->addWidget (label);
int size = xml->getMultiChoiceAttribute (element, "size", "small;medium;large", 1, DL_INFO);
if (size == 2) {
- textedit = new QTextEdit (this);
+ textedit = new Q3TextEdit (this);
int lheight = textedit->fontMetrics ().lineSpacing ();
int margin = textedit->height () - textedit->visibleHeight () + textedit->fontMetrics ().descent () + 2;
textedit->setMinimumSize (250, lheight * 4 + margin);
Modified: branches/KDE4_port/rkward/plugin/rkinput.h
===================================================================
--- branches/KDE4_port/rkward/plugin/rkinput.h 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkinput.h 2007-10-08 15:05:13 UTC (rev 2038)
@@ -22,7 +22,7 @@
#include "rkcomponentproperties.h"
-class QTextEdit;
+class Q3TextEdit;
class QLineEdit;
class QDomElement;
@@ -53,7 +53,7 @@
private:
void updateColor ();
bool updating;
- QTextEdit *textedit;
+ Q3TextEdit *textedit;
QLineEdit *lineedit;
};
Modified: branches/KDE4_port/rkward/plugin/rkpluginbrowser.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkpluginbrowser.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkpluginbrowser.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,6 +18,8 @@
#include "rkpluginbrowser.h"
#include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
#include <klocale.h>
@@ -39,7 +41,7 @@
setRequired (xml->getBoolAttribute (element, "required", true, DL_INFO));
connect (requirednessProperty (), SIGNAL (valueChanged(RKComponentPropertyBase*)), this, SLOT (requirednessChanged(RKComponentPropertyBase*)));
- QVBoxLayout *vbox = new QVBoxLayout (this, RKGlobals::spacingHint ());
+ Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::spacingHint ());
int intmode = xml->getMultiChoiceAttribute (element, "type", "file;dir;savefile", 0, DL_INFO);
GetFileNameWidget::FileType mode;
Modified: branches/KDE4_port/rkward/plugin/rkpluginsaveobject.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkpluginsaveobject.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkpluginsaveobject.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,6 +18,8 @@
#include "rkpluginsaveobject.h"
#include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
#include <klocale.h>
@@ -36,7 +38,7 @@
addChild ("selection", selection = new RKComponentPropertyBase (this, xml->getBoolAttribute (element, "required", true, DL_INFO)));
connect (selection, SIGNAL (valueChanged (RKComponentPropertyBase *)), this, SLOT (selectionChanged (RKComponentPropertyBase *)));
- QVBoxLayout *vbox = new QVBoxLayout (this, RKGlobals::spacingHint ());
+ Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::spacingHint ());
selector = new RKSaveObjectChooser (this, xml->getStringAttribute (element, "initial", i18n ("my.data"), DL_INFO), xml->getStringAttribute (element, "label", i18n ("Save to:"), DL_INFO));
connect (selector, SIGNAL (changed ()), SLOT (selectionChanged ()));
Modified: branches/KDE4_port/rkward/plugin/rkpluginspinbox.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkpluginspinbox.cpp 2007-10-08 14:48:05 UTC (rev 2037)
+++ branches/KDE4_port/rkward/plugin/rkpluginspinbox.cpp 2007-10-08 15:05:13 UTC (rev 2038)
@@ -18,6 +18,8 @@
#include <qlayout.h>
#include <qlabel.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
#include <klocale.h>
@@ -39,7 +41,7 @@
addChild ("real", realvalue = new RKComponentPropertyDouble (this, !intmode, 0));
// layout and label
- QVBoxLayout *vbox = new QVBoxLayout (this, RKGlobals::spacingHint ());
@@ Diff output truncated at 100000 characters. @@
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