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

[tfry at users.sourceforge.net]

Revision: 3428
          http://rkward.svn.sourceforge.net/rkward/?rev=3428&view=rev
Author:   tfry
Date:     2011-02-08 18:09:02 +0000 (Tue, 08 Feb 2011)

Log Message:
-----------
More small cleanups

Modified Paths:
--------------
    trunk/rkward/rkward/core/rkvariable.cpp
    trunk/rkward/rkward/core/rkvariable.h
    trunk/rkward/rkward/dataeditor/rkvareditmodel.cpp

Modified: trunk/rkward/rkward/core/rkvariable.cpp
===================================================================
--- trunk/rkward/rkward/core/rkvariable.cpp	2011-02-08 17:57:08 UTC (rev 3427)
+++ trunk/rkward/rkward/core/rkvariable.cpp	2011-02-08 18:09:02 UTC (rev 3428)
@@ -33,9 +33,6 @@
 
 #include "../debug.h"
 
-QString RKVariable::na_char ("");
-QString RKVariable::unknown_char ("?");
-
 RKVariable::RKVariable (RContainerObject *parent, const QString &name) : RObject (parent, name) {
 	RK_TRACE (OBJECTS);
 	type = Variable;
@@ -406,7 +403,7 @@
 QString RKVariable::getText (int row, bool pretty) const {
 	if (row >= getLength ()) {
 		RK_ASSERT (false);
-		return (unknown_char);
+		return (QString ());
 	}
 
 	if (data->cell_states[row] & RKVarEditData::Invalid) {
@@ -414,9 +411,7 @@
 		return (data->invalid_fields.value (row));
 	}
 
-	if (data->cell_states[row] & RKVarEditData::NA) {
-		return (na_char);
-	}
+	if (data->cell_states[row] & RKVarEditData::NA) return (QString ());
 
 	if (pretty) return (getLabeled (row));
 

Modified: trunk/rkward/rkward/core/rkvariable.h
===================================================================
--- trunk/rkward/rkward/core/rkvariable.h	2011-02-08 17:57:08 UTC (rev 3427)
+++ trunk/rkward/rkward/core/rkvariable.h	2011-02-08 18:09:02 UTC (rev 3428)
@@ -2,7 +2,7 @@
                           rkvariable  -  description
                              -------------------
     begin                : Thu Aug 12 2004
-    copyright            : (C) 2004, 2007, 2010 by Thomas Friedrichsmeier
+    copyright            : (C) 2004, 2007, 2010, 2011 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -117,11 +117,6 @@
 /** returns alignment to use for this variable */
 	CellAlign getAlignment () const;
 
-/// an empty char
-	static QString na_char;
-/// an unknown value
-	static QString unknown_char;
-
 /** creates/parses formatting options from the stored meta-property string. See also: getFormattingOptions () */
 	static FormattingOptions parseFormattingOptionsString (const QString &string);
 /** inverse of parseFormattingOptionsString () */

Modified: trunk/rkward/rkward/dataeditor/rkvareditmodel.cpp
===================================================================
--- trunk/rkward/rkward/dataeditor/rkvareditmodel.cpp	2011-02-08 17:57:08 UTC (rev 3427)
+++ trunk/rkward/rkward/dataeditor/rkvareditmodel.cpp	2011-02-08 18:09:02 UTC (rev 3428)
@@ -179,7 +179,6 @@
 // TODO: this does not emit any data change notifications to other editors
 		objects[i]->insertRows (row, count);
 	}
-#warning TODO: adjust dimensions of the data.frame!
 	endInsertRows ();
 
 	return true;


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