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

[tfry at users.sourceforge.net]

Revision: 747
          http://svn.sourceforge.net/rkward/?rev=747&view=rev
Author:   tfry
Date:     2006-09-20 02:47:50 -0700 (Wed, 20 Sep 2006)

Log Message:
-----------
Some more UTF-8 awareness. More to come, but this will be a large and dangerous change

Modified Paths:
--------------
    trunk/rkward/rkward/dataeditor/twintable.cpp
    trunk/rkward/rkward/dataeditor/twintable.h
    trunk/rkward/rkward/rbackend/rthread.cpp

Modified: trunk/rkward/rkward/dataeditor/twintable.cpp
===================================================================
--- trunk/rkward/rkward/dataeditor/twintable.cpp	2006-09-19 12:40:06 UTC (rev 746)
+++ trunk/rkward/rkward/dataeditor/twintable.cpp	2006-09-20 09:47:50 UTC (rev 747)
@@ -353,7 +353,7 @@
 
 	QValueList<RKVariable*> col_list;
 
-	QString pasted = content;
+	QString pasted = QString::fromLocal8Bit (content);
 	int row = top_row;
 	int col = left_col;
 	int content_offset = 0;

Modified: trunk/rkward/rkward/dataeditor/twintable.h
===================================================================
--- trunk/rkward/rkward/dataeditor/twintable.h	2006-09-19 12:40:06 UTC (rev 746)
+++ trunk/rkward/rkward/dataeditor/twintable.h	2006-09-20 09:47:50 UTC (rev 747)
@@ -69,8 +69,8 @@
 	int numTrueCols ();
 	
 	void setPasteMode (RKEditor::PasteMode mode);
-    TwinTableMetaMember* varview;
-    TwinTableDataMember* dataview;
+	TwinTableMetaMember* varview;
+	TwinTableDataMember* dataview;
 /** get the object at the given column (0 if there is no object for the column) */
 	RKVariable *getColObject (long int col);
 signals:

Modified: trunk/rkward/rkward/rbackend/rthread.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rthread.cpp	2006-09-19 12:40:06 UTC (rev 746)
+++ trunk/rkward/rkward/rbackend/rthread.cpp	2006-09-20 09:47:50 UTC (rev 747)
@@ -235,7 +235,7 @@
 		current_output->type = ROutput::Output;
 		current_output->output.reserve (MAX_BUF_LENGTH + 50);
 	}
-	current_output->output.append (buf);
+	current_output->output.append (QString::fromLocal8Bit (buf));
 
 	if ((out_buf_len += buf_length) > MAX_BUF_LENGTH) {
 		RK_DO (qDebug ("Output buffer has %d characters. Forcing flush", out_buf_len), RBACKEND, DL_DEBUG);


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