[rkward-cvs] SF.net SVN: rkward: [1039] trunk/rkward/rkward/dataeditor

[tfry at users.sourceforge.net]

Revision: 1039
          http://svn.sourceforge.net/rkward/?rev=1039&view=rev
Author:   tfry
Date:     2007-01-02 04:43:42 -0800 (Tue, 02 Jan 2007)

Log Message:
-----------
krazy fixes

Modified Paths:
--------------
    trunk/rkward/rkward/dataeditor/editlabelsdialog.cpp
    trunk/rkward/rkward/dataeditor/rkeditordataframe.cpp
    trunk/rkward/rkward/dataeditor/rkeditordataframepart.h
    trunk/rkward/rkward/dataeditor/twintabledatamember.cpp
    trunk/rkward/rkward/dataeditor/twintablemetamember.cpp

Modified: trunk/rkward/rkward/dataeditor/editlabelsdialog.cpp
===================================================================
--- trunk/rkward/rkward/dataeditor/editlabelsdialog.cpp	2007-01-02 12:39:48 UTC (rev 1038)
+++ trunk/rkward/rkward/dataeditor/editlabelsdialog.cpp	2007-01-02 12:43:42 UTC (rev 1039)
@@ -145,7 +145,7 @@
 	if (row < numTrueRows ()) {
 		return ((*storage)[QString::number (row+1)]);
 	}
-	return QString::null;
+	return QString ();
 }
 
 void LevelsTable::paintCell (QPainter *p, int row, int col, const QRect &cr, bool selected, const QColorGroup &cg) {

Modified: trunk/rkward/rkward/dataeditor/rkeditordataframe.cpp
===================================================================
--- trunk/rkward/rkward/dataeditor/rkeditordataframe.cpp	2007-01-02 12:39:48 UTC (rev 1038)
+++ trunk/rkward/rkward/dataeditor/rkeditordataframe.cpp	2007-01-02 12:43:42 UTC (rev 1039)
@@ -101,7 +101,7 @@
 	// actually, given the object, we already know the child-names. We don't know their order, however, so we better fetch the name-row again.
 	object->markDataDirty ();
 	object->updateFromR (open_chain);
-	RCommand *command = new RCommand ("names (" + object->getFullName () + ")", RCommand::Sync | RCommand::GetStringVector, QString::null, this, GET_NAMES_COMMAND);
+	RCommand *command = new RCommand ("names (" + object->getFullName () + ')', RCommand::Sync | RCommand::GetStringVector, QString::null, this, GET_NAMES_COMMAND);
 	RKGlobals::rInterface ()->issueCommand (command, open_chain);
 
 	// since communication is asynchronous, the rest is done inside
@@ -206,12 +206,12 @@
 
 void RKEditorDataFrame::aboutToAddRow (int row) {
 	RK_TRACE (EDITOR);
-	RKGlobals::rInterface ()->issueCommand (new RCommand (".rk.data.frame.insert.row (" + getObject ()->getFullName () + ", " + QString ().setNum (row+1) + ")", RCommand::App | RCommand::Sync));
+	RKGlobals::rInterface ()->issueCommand (new RCommand (".rk.data.frame.insert.row (" + getObject ()->getFullName () + ", " + QString ().setNum (row+1) + ')', RCommand::App | RCommand::Sync));
 }
 
 void RKEditorDataFrame::aboutToRemoveRow (int row) {
 	RK_TRACE (EDITOR);
-	RKGlobals::rInterface ()->issueCommand (new RCommand (".rk.data.frame.delete.row (" + getObject ()->getFullName () + ", " + QString ().setNum (row+1) + ")", RCommand::App | RCommand::Sync));
+	RKGlobals::rInterface ()->issueCommand (new RCommand (".rk.data.frame.delete.row (" + getObject ()->getFullName () + ", " + QString ().setNum (row+1) + ')', RCommand::App | RCommand::Sync));
 }
 
 void RKEditorDataFrame::removeObject (RObject *object) {

Modified: trunk/rkward/rkward/dataeditor/rkeditordataframepart.h
===================================================================
--- trunk/rkward/rkward/dataeditor/rkeditordataframepart.h	2007-01-02 12:39:48 UTC (rev 1038)
+++ trunk/rkward/rkward/dataeditor/rkeditordataframepart.h	2007-01-02 12:43:42 UTC (rev 1039)
@@ -30,7 +30,7 @@
 class RKEditorDataFramePart : public KParts::Part {
 	Q_OBJECT
 public:
-	RKEditorDataFramePart (QWidget *parent);
+	explicit RKEditorDataFramePart (QWidget *parent);
 
 	~RKEditorDataFramePart ();
 public slots:

Modified: trunk/rkward/rkward/dataeditor/twintabledatamember.cpp
===================================================================
--- trunk/rkward/rkward/dataeditor/twintabledatamember.cpp	2007-01-02 12:39:48 UTC (rev 1038)
+++ trunk/rkward/rkward/dataeditor/twintabledatamember.cpp	2007-01-02 12:43:42 UTC (rev 1039)
@@ -135,7 +135,7 @@
 	RKVariable *var = table->getColObject (col);
 	if (!var) {
 		RK_ASSERT (false);
-		return QString::null;
+		return QString ();
 	}
 	return var->getText (row);
 }
@@ -144,7 +144,7 @@
 	RKVariable *var = table->getColObject (col);
 	if (!var) {
 		RK_ASSERT (false);
-		return QString::null;
+		return QString ();
 	}
 	return var->getRText (row);
 }

Modified: trunk/rkward/rkward/dataeditor/twintablemetamember.cpp
===================================================================
--- trunk/rkward/rkward/dataeditor/twintablemetamember.cpp	2007-01-02 12:39:48 UTC (rev 1038)
+++ trunk/rkward/rkward/dataeditor/twintablemetamember.cpp	2007-01-02 12:43:42 UTC (rev 1039)
@@ -128,7 +128,7 @@
 	RKVariable *var = table->getColObject (col);
 	if (!var) {
 		RK_ASSERT (false);
-		return QString::null;
+		return QString ();
 	}
 	if (row == NAME_ROW) {
 		return var->getShortName ();
@@ -141,7 +141,7 @@
 	} else if (row == LEVELS_ROW) {
 		return var->getValueLabelString ();
 	}
-	return QString::null;
+	return QString ();
 }
 
 QString TwinTableMetaMember::formattedText (int row, int col) const {
@@ -149,7 +149,7 @@
 	RKVariable *var = table->getColObject (col);
 	if (!var) {
 		RK_ASSERT (false);
-		return QString::null;
+		return QString ();
 	}
 	if (row == NAME_ROW) {
 		return var->getShortName ();
@@ -162,7 +162,7 @@
 	} else if (row == LEVELS_ROW) {
 		return var->getValueLabelString ();
 	}
-	return QString::null;
+	return QString ();
 }
 
 #include "twintablemetamember.moc"


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