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

tfry at users.sourceforge.net tfry at users.sourceforge.net
Thu Oct 18 18:36:44 UTC 2007


Revision: 2095
          http://rkward.svn.sourceforge.net/rkward/?rev=2095&view=rev
Author:   tfry
Date:     2007-10-18 11:36:44 -0700 (Thu, 18 Oct 2007)

Log Message:
-----------
Remove Qt3 support code in settings subdir, and clean some layout problems

Modified Paths:
--------------
    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/rksettingsmoduler.cpp
    branches/KDE4_port/rkward/settings/rksettingsmodulewatch.cpp
    branches/KDE4_port/rkward/settings/rksettingsmodulewatch.h

Modified: branches/KDE4_port/rkward/settings/rksettings.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettings.cpp	2007-10-18 16:42:35 UTC (rev 2094)
+++ branches/KDE4_port/rkward/settings/rksettings.cpp	2007-10-18 18:36:44 UTC (rev 2095)
@@ -68,7 +68,7 @@
 RKSettings::RKSettings (QWidget *parent) : KPageDialog (parent) {
 	RK_TRACE (SETTINGS);
 
-	setFaceType (KPageDialog::Tabbed);
+	setFaceType (KPageDialog::List);
 	setCaption (i18n ("Settings"));
 	setButtons (KDialog::Ok | KDialog::Apply | KDialog::Cancel | KDialog::Help);
 // KDE4: is this needed?	setModal (false);
@@ -84,7 +84,7 @@
 RKSettings::~RKSettings() {
 	RK_TRACE (SETTINGS);
 
-	ModuleList::const_iterator it;
+	ModuleMap::const_iterator it;
 	for (it = modules.constBegin (); it != modules.constEnd (); ++it) {
 		delete *it;
 	}
@@ -96,20 +96,19 @@
 void RKSettings::initModules () {
 	RK_TRACE (SETTINGS);
 
-	modules.insert (PagePlugins, new RKSettingsModulePlugins (this, this));
-	modules.insert (PageR, new RKSettingsModuleR (this, this));
-	modules.insert (PageRPackages, new RKSettingsModuleRPackages (this, this));
-	modules.insert (PagePHP, new RKSettingsModulePHP (this, this));
-	modules.insert (PageGeneral, new RKSettingsModuleGeneral (this, this));
-	modules.insert (PageOutput, new RKSettingsModuleOutput (this, this));
-	modules.insert (PageWatch, new RKSettingsModuleWatch (this, this));
-	modules.insert (PageConsole, new RKSettingsModuleConsole (this, this));
-	modules.insert (PageObjectBrowser, new RKSettingsModuleObjectBrowser (this, this));
+	modules.insert (PagePlugins, new RKSettingsModulePlugins (this, 0));
+	modules.insert (PageR, new RKSettingsModuleR (this, 0));
+	modules.insert (PageRPackages, new RKSettingsModuleRPackages (this, 0));
+	modules.insert (PagePHP, new RKSettingsModulePHP (this, 0));
+	modules.insert (PageGeneral, new RKSettingsModuleGeneral (this, 0));
+	modules.insert (PageOutput, new RKSettingsModuleOutput (this, 0));
+	modules.insert (PageWatch, new RKSettingsModuleWatch (this, 0));
+	modules.insert (PageConsole, new RKSettingsModuleConsole (this, 0));
+	modules.insert (PageObjectBrowser, new RKSettingsModuleObjectBrowser (this, 0));
 
-	ModuleList::const_iterator it;
+	ModuleMap::const_iterator it;
 	for (it = modules.constBegin (); it != modules.constEnd (); ++it) {
 		pages[it.key ()] = addPage (it.value (), it.value ()->caption ());
-		it.value ()->show ();
 	}
 }
 
@@ -163,7 +162,7 @@
 void RKSettings::applyAll () {
 	RK_TRACE (SETTINGS);
 
-	ModuleList::const_iterator it;
+	ModuleMap::const_iterator it;
 	for (it = modules.constBegin (); it != modules.constEnd (); ++it) {
 		if (it.value ()->hasChanges ()) {
 			it.value ()->applyChanges ();

Modified: branches/KDE4_port/rkward/settings/rksettings.h
===================================================================
--- branches/KDE4_port/rkward/settings/rksettings.h	2007-10-18 16:42:35 UTC (rev 2094)
+++ branches/KDE4_port/rkward/settings/rksettings.h	2007-10-18 18:36:44 UTC (rev 2095)
@@ -70,8 +70,8 @@
 	void raisePage (SettingsPage page);
 	static void dialogClosed ();
 
-	typedef QMap<SettingsPage, RKSettingsModule *> ModuleList;
-	ModuleList modules;
+	typedef QMap<SettingsPage, RKSettingsModule *> ModuleMap;
+	ModuleMap modules;
 	KPageWidgetItem *pages[NumPages];
 
 	static RKSettings *settings_dialog;

Modified: branches/KDE4_port/rkward/settings/rksettingsmoduleconsole.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmoduleconsole.cpp	2007-10-18 16:42:35 UTC (rev 2094)
+++ branches/KDE4_port/rkward/settings/rksettingsmoduleconsole.cpp	2007-10-18 18:36:44 UTC (rev 2095)
@@ -21,13 +21,12 @@
 #include <kconfiggroup.h>
 #include <knuminput.h>
 #include <kapplication.h>
+#include <kglobal.h>
 
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <kglobal.h>
+#include <QVBoxLayout>
 
 #include "../rbackend/rcommand.h"
 #include "../rkglobals.h"
@@ -45,7 +44,7 @@
 RKSettingsModuleConsole::RKSettingsModuleConsole (RKSettings *gui, QWidget *parent) : RKSettingsModule (gui, parent) {
 	RK_TRACE (SETTINGS);
 
-	Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::marginHint ());
+	QVBoxLayout *vbox = new QVBoxLayout (this);
 
 	save_history_box = new QCheckBox (i18n ("Load/Save command history"), this);
 	save_history_box->setChecked (save_history);

Modified: branches/KDE4_port/rkward/settings/rksettingsmodulegeneral.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmodulegeneral.cpp	2007-10-18 16:42:35 UTC (rev 2094)
+++ branches/KDE4_port/rkward/settings/rksettingsmodulegeneral.cpp	2007-10-18 18:36:44 UTC (rev 2095)
@@ -26,10 +26,10 @@
 #include <qdir.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
-#include <q3buttongroup.h>
+#include <qbuttongroup.h>
+#include <qgroupbox.h>
 #include <qradiobutton.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 
 #include "../misc/getfilenamewidget.h"
 #include "../misc/rkspinbox.h"
@@ -47,15 +47,19 @@
 RKSettingsModuleGeneral::RKSettingsModuleGeneral (RKSettings *gui, QWidget *parent) : RKSettingsModule (gui, parent) {
 	RK_TRACE (SETTINGS);
 
-	Q3VBoxLayout *main_vbox = new Q3VBoxLayout (this, RKGlobals::marginHint ());
+	QVBoxLayout *main_vbox = new QVBoxLayout (this);
 	QLabel *label = new QLabel (i18n ("Settings marked with (*) do not take effect until you restart RKWard"), this);
 	label->setWordWrap (true);
 	main_vbox->addWidget (label);
 
+	main_vbox->addSpacing (2*RKGlobals::spacingHint ());
+
 	files_choser = new GetFileNameWidget (this, GetFileNameWidget::ExistingDirectory, i18n ("Directory where the logfiles should be kept (*)"), QString::null, new_files_path);
 	connect (files_choser, SIGNAL (locationChanged ()), this, SLOT (pathChanged ()));
 	main_vbox->addWidget (files_choser);
 
+	main_vbox->addSpacing (2*RKGlobals::spacingHint ());
+
 	main_vbox->addWidget (new QLabel (i18n ("Startup Action (*)"), this));
 	startup_action_choser = new QComboBox (false, this);
 	startup_action_choser->insertItem (i18n ("Start with an empty workspace"), StartupDialog::EmptyWorkspace);
@@ -77,18 +81,24 @@
 	label->setWordWrap (true);
 	main_vbox->addWidget (label);
 
-	workplace_save_chooser = new Q3ButtonGroup (this);
-	workplace_save_chooser->setColumnLayout (0, Qt::Vertical);
-	workplace_save_chooser->layout()->setSpacing (6);
-	workplace_save_chooser->layout()->setMargin (11);
-	Q3VBoxLayout *group_layout = new Q3VBoxLayout(workplace_save_chooser->layout());
-	group_layout->addWidget (new QRadioButton (i18n ("Save/restore with R workspace, when saving/loading R workspace"), workplace_save_chooser));
-	group_layout->addWidget (new QRadioButton (i18n ("Save/restore independent of R workspace (save at end of RKWard session, restore at next start)"), workplace_save_chooser));
-	group_layout->addWidget (new QRadioButton (i18n ("Do not save/restore workplace layout"), workplace_save_chooser));
-	workplace_save_chooser->setButton (static_cast<int> (workplace_save_mode));
-	connect (workplace_save_chooser, SIGNAL (clicked (int)), this, SLOT (boxChanged (int)));
-	main_vbox->addWidget (workplace_save_chooser);
+	workplace_save_chooser = new QButtonGroup (this);
+	QGroupBox* group_box = new QGroupBox (this);
+	QVBoxLayout *group_layout = new QVBoxLayout(group_box);
 
+	QAbstractButton* button;
+	button = new QRadioButton (i18n ("Save/restore with R workspace, when saving/loading R workspace"), group_box);
+	group_layout->addWidget (button);
+	workplace_save_chooser->addButton (button, SaveWorkplaceWithWorkspace);
+	button = new QRadioButton (i18n ("Save/restore independent of R workspace (save at end of RKWard session, restore at next start)"), group_box);
+	group_layout->addWidget (button);
+	workplace_save_chooser->addButton (button, SaveWorkplaceWithSession);
+	button = new QRadioButton (i18n ("Do not save/restore workplace layout"), group_box);
+	group_layout->addWidget (button);
+	workplace_save_chooser->addButton (button, DontSaveWorkplace);	
+	if ((button = workplace_save_chooser->button (workplace_save_mode))) button->setChecked (true);
+	connect (workplace_save_chooser, SIGNAL (buttonClicked (int)), this, SLOT (boxChanged (int)));
+	main_vbox->addWidget (group_box);
+
 	main_vbox->addSpacing (2*RKGlobals::spacingHint ());
 
 	label = new QLabel (i18n ("Warn when editing objects with more than this number of fields (0 for no limit):"), this);
@@ -131,11 +141,7 @@
 	new_files_path = files_choser->getLocation ();
 	startup_action = static_cast<StartupDialog::Result> (startup_action_choser->currentItem ());
 	show_help_on_startup = show_help_on_startup_box->isChecked ();
-#if QT_VERSION < 0x030200
-	workplace_save_mode = static_cast<WorkplaceSaveMode> (workplace_save_chooser->id (workplace_save_chooser->selected ()));
-#else
-	workplace_save_mode = static_cast<WorkplaceSaveMode> (workplace_save_chooser->selectedId ());
-#endif
+	workplace_save_mode = static_cast<WorkplaceSaveMode> (workplace_save_chooser->checkedId ());
 	warn_size_object_edit = warn_size_object_edit_box->intValue ();
 }
 

Modified: branches/KDE4_port/rkward/settings/rksettingsmodulegeneral.h
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmodulegeneral.h	2007-10-18 16:42:35 UTC (rev 2094)
+++ branches/KDE4_port/rkward/settings/rksettingsmodulegeneral.h	2007-10-18 18:36:44 UTC (rev 2095)
@@ -23,7 +23,7 @@
 class GetFileNameWidget;
 class QComboBox;
 class QCheckBox;
-class Q3ButtonGroup;
+class QButtonGroup;
 class RKSpinBox;
 
 /**
@@ -68,7 +68,7 @@
 private:
 	GetFileNameWidget *files_choser;
 	QComboBox *startup_action_choser;
-	Q3ButtonGroup *workplace_save_chooser;
+	QButtonGroup *workplace_save_chooser;
 	QCheckBox *show_help_on_startup_box;
 	RKSpinBox *warn_size_object_edit_box;
 

Modified: branches/KDE4_port/rkward/settings/rksettingsmoduleobjectbrowser.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmoduleobjectbrowser.cpp	2007-10-18 16:42:35 UTC (rev 2094)
+++ branches/KDE4_port/rkward/settings/rksettingsmoduleobjectbrowser.cpp	2007-10-18 18:36:44 UTC (rev 2095)
@@ -25,8 +25,7 @@
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 
 #include "../rkglobals.h"
 #include "../misc/multistringselector.h"
@@ -42,7 +41,7 @@
 
 	checkboxes = new QCheckBox*[RKObjectListViewSettings::SettingsCount];
 
-	Q3VBoxLayout *layout = new Q3VBoxLayout (this, RKGlobals::marginHint ());
+	QVBoxLayout *layout = new QVBoxLayout (this);
 
 	layout->addWidget (new QLabel (i18n ("Which objects should be shown by default?"), this));
 

Modified: branches/KDE4_port/rkward/settings/rksettingsmoduleoutput.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmoduleoutput.cpp	2007-10-18 16:42:35 UTC (rev 2094)
+++ branches/KDE4_port/rkward/settings/rksettingsmoduleoutput.cpp	2007-10-18 18:36:44 UTC (rev 2095)
@@ -22,10 +22,9 @@
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <Q3VButtonGroup>
+#include <QGroupBox>
 #include <qcheckbox.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 
 #include "../rkglobals.h"
 #include "../debug.h"
@@ -37,13 +36,14 @@
 RKSettingsModuleOutput::RKSettingsModuleOutput (RKSettings *gui, QWidget *parent) : RKSettingsModule(gui, parent) {
 	RK_TRACE (SETTINGS);
 
-	Q3VBoxLayout *main_vbox = new Q3VBoxLayout (this, RKGlobals::marginHint ());
+	QVBoxLayout *main_vbox = new QVBoxLayout (this);
 	
-	Q3VButtonGroup *group = new Q3VButtonGroup (i18n ("Output Window options"), this);
-	auto_show_box = new QCheckBox ("show window on new output", group);
+	QGroupBox *group = new QGroupBox (i18n ("Output Window options"), this);
+	QVBoxLayout* group_layout = new QVBoxLayout (group);
+	group_layout->addWidget (auto_show_box = new QCheckBox ("show window on new output", group));
 	auto_show_box->setChecked (auto_show);
 	connect (auto_show_box, SIGNAL (stateChanged (int)), this, SLOT (boxChanged (int)));
-	auto_raise_box = new QCheckBox ("raise window on new output", group);
+	group_layout->addWidget (auto_raise_box = new QCheckBox ("raise window on new output", group));
 	auto_raise_box->setChecked (auto_raise);
 	auto_raise_box->setEnabled (auto_show);
 	connect (auto_raise_box, SIGNAL (stateChanged (int)), this, SLOT (boxChanged (int)));

Modified: branches/KDE4_port/rkward/settings/rksettingsmodulephp.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmodulephp.cpp	2007-10-18 16:42:35 UTC (rev 2094)
+++ branches/KDE4_port/rkward/settings/rksettingsmodulephp.cpp	2007-10-18 18:36:44 UTC (rev 2095)
@@ -22,8 +22,7 @@
 
 #include <qlayout.h>
 #include <qlabel.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 
 #include "../misc/getfilenamewidget.h"
 #include "../misc/rkcommonfunctions.h"
@@ -36,14 +35,14 @@
 RKSettingsModulePHP::RKSettingsModulePHP (RKSettings *gui, QWidget *parent) : RKSettingsModule (gui, parent) {
 	RK_TRACE (SETTINGS);
 
-	Q3VBoxLayout *main_vbox = new Q3VBoxLayout (this, RKGlobals::marginHint ());
+	QVBoxLayout *main_vbox = new QVBoxLayout (this, RKGlobals::marginHint ());
 	QLabel *label = new QLabel (i18n ("Changes in this section take effect the next time you start a plugin"), this);
 	label->setWordWrap (true);
 	main_vbox->addWidget (label);
 	
 	main_vbox->addSpacing (2*RKGlobals::spacingHint ());
 	
-	bin_choser = new GetFileNameWidget (this, GetFileNameWidget::ExistingFile, i18n ("File-location of the PHP binary"), QString::null, php_bin);
+	bin_choser = new GetFileNameWidget (this, GetFileNameWidget::ExistingFile, i18n ("File-location of the PHP binary"), QString (), php_bin);
 	connect (bin_choser, SIGNAL (locationChanged ()), this, SLOT (pathChanged ()));
 	main_vbox->addWidget (bin_choser);
 

Modified: branches/KDE4_port/rkward/settings/rksettingsmoduleplugins.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmoduleplugins.cpp	2007-10-18 16:42:35 UTC (rev 2094)
+++ branches/KDE4_port/rkward/settings/rksettingsmoduleplugins.cpp	2007-10-18 18:36:44 UTC (rev 2095)
@@ -60,21 +60,17 @@
 	QVBoxLayout* group_layout = new QVBoxLayout (button_box);
 	button_group = new QButtonGroup (button_box);
 
-	QRadioButton* button;
+	QAbstractButton* button;
 	button = new QRadioButton (i18n ("Always prefer dialogs"), button_box);
 	group_layout->addWidget (button);
 	button_group->addButton (button, PreferDialog);
-	if (interface_pref == PreferDialog) button->setChecked (true);
 	button = new QRadioButton (i18n ("Prefer recommended interface"), button_box);
 	group_layout->addWidget (button);
-	button_group->addButton (button);
 	button_group->addButton (button, PreferRecommended);
-	if (interface_pref == PreferRecommended) button->setChecked (true);
 	button = new QRadioButton (i18n ("Always prefer wizards"), button_box);
 	group_layout->addWidget (button);
-	button_group->addButton (button);
 	button_group->addButton (button, PreferWizard);
-	if (interface_pref == PreferWizard) button->setChecked (true);
+	if ((button = button_group->button (interface_pref))) button->setChecked (true);
 
 	connect (button_group, SIGNAL (buttonClicked (int)), this, SLOT (settingChanged (int)));
 	main_vbox->addWidget (button_box);

Modified: branches/KDE4_port/rkward/settings/rksettingsmoduler.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmoduler.cpp	2007-10-18 16:42:35 UTC (rev 2094)
+++ branches/KDE4_port/rkward/settings/rksettingsmoduler.cpp	2007-10-18 18:36:44 UTC (rev 2095)
@@ -23,15 +23,12 @@
 #include <knuminput.h>
 #include <kfiledialog.h>
 
-#include <qlayout.h>
 #include <qlabel.h>
-#include <Q3VButtonGroup>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
-//Added by qt3to4:
-#include <Q3GridLayout>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
+#include <QGridLayout>
 
 #include "../misc/multistringselector.h"
 #include "../rbackend/rinterface.h"
@@ -54,7 +51,7 @@
 RKSettingsModuleR::RKSettingsModuleR (RKSettings *gui, QWidget *parent) : RKSettingsModule(gui, parent) {
 	RK_TRACE (SETTINGS);
 
-	Q3VBoxLayout *main_vbox = new Q3VBoxLayout (this, RKGlobals::marginHint ());
+	QVBoxLayout *main_vbox = new QVBoxLayout (this);
 
 	main_vbox->addSpacing (2*RKGlobals::spacingHint ());
 
@@ -62,7 +59,7 @@
 	label->setWordWrap (true);
 	main_vbox->addWidget (label);
 
-	Q3GridLayout *grid = new Q3GridLayout (main_vbox, 1, 2, RKGlobals::spacingHint ());
+	QGridLayout *grid = new QGridLayout (main_vbox, 1, 2, RKGlobals::spacingHint ());
 	int row = -1;
 
 	// options (warn)
@@ -275,7 +272,7 @@
 RKSettingsModuleRPackages::RKSettingsModuleRPackages (RKSettings *gui, QWidget *parent) : RKSettingsModule(gui, parent) {
 	RK_TRACE (SETTINGS);
 
-	Q3VBoxLayout *main_vbox = new Q3VBoxLayout (this, RKGlobals::marginHint ());
+	QVBoxLayout *main_vbox = new QVBoxLayout (this);
 
 	main_vbox->addSpacing (2*RKGlobals::spacingHint ());
 

Modified: branches/KDE4_port/rkward/settings/rksettingsmodulewatch.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmodulewatch.cpp	2007-10-18 16:42:35 UTC (rev 2094)
+++ branches/KDE4_port/rkward/settings/rksettingsmodulewatch.cpp	2007-10-18 18:36:44 UTC (rev 2095)
@@ -21,12 +21,10 @@
 #include <kconfiggroup.h>
 #include <knuminput.h>
 
-#include <qlayout.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
-//Added by qt3to4:
-#include <Q3GridLayout>
-#include <Q3VBoxLayout>
+#include <QGridLayout>
+#include <QVBoxLayout>
 
 #include "../rbackend/rcommand.h"
 #include "rksettings.h"
@@ -120,14 +118,14 @@
 RKSettingsModuleWatch::RKSettingsModuleWatch (RKSettings *gui, QWidget *parent) : RKSettingsModule (gui, parent) {
 	RK_TRACE (SETTINGS);
 
-	Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::marginHint ());
+	QVBoxLayout *vbox = new QVBoxLayout (this, RKGlobals::marginHint ());
 
 	QLabel *label = new QLabel (i18n ("For now, settings only apply to new commands. All previous commands remain visible/invisible."), this);
 	label->setWordWrap (true);
 	vbox->addWidget (label);
 	vbox->addSpacing (10);
 	
-	Q3GridLayout *grid = new Q3GridLayout (vbox, 5, 5);
+	QGridLayout *grid = new QGridLayout (vbox, 5, 5);
 
 	label = new QLabel (i18n ("always show command"), this);
 	label->setWordWrap (true);
@@ -180,7 +178,7 @@
 	return ret;
 }
 
-RKSettingsModuleWatch::FilterBoxes *RKSettingsModuleWatch::addFilterSettings (QWidget *parent, Q3GridLayout *layout, int row, const QString &label, int state) {
+RKSettingsModuleWatch::FilterBoxes *RKSettingsModuleWatch::addFilterSettings (QWidget *parent, QGridLayout *layout, int row, const QString &label, int state) {
 	RK_TRACE (SETTINGS);
 
 	FilterBoxes *filter_boxes = new FilterBoxes;

Modified: branches/KDE4_port/rkward/settings/rksettingsmodulewatch.h
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmodulewatch.h	2007-10-18 16:42:35 UTC (rev 2094)
+++ branches/KDE4_port/rkward/settings/rksettingsmodulewatch.h	2007-10-18 18:36:44 UTC (rev 2095)
@@ -18,12 +18,10 @@
 #define RKSETTINGSMODULEWATCH_H
 
 #include "rksettingsmodule.h"
-//Added by qt3to4:
-#include <Q3GridLayout>
 
 class RCommand;
 class QCheckBox;
-class Q3GridLayout;
+class QGridLayout;
 class KIntSpinBox;
 
 /**
@@ -78,7 +76,7 @@
 	FilterBoxes *user_filter_boxes;
 
 	int getFilterSettings (FilterBoxes *boxes);
-	FilterBoxes *addFilterSettings (QWidget *parent, Q3GridLayout *layout, int row, const QString &label, int state);
+	FilterBoxes *addFilterSettings (QWidget *parent, QGridLayout *layout, int row, const QString &label, int state);
 
 	static uint max_log_lines;
 


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