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

[tfry at users.sourceforge.net]

Revision: 2082
          http://rkward.svn.sourceforge.net/rkward/?rev=2082&view=rev
Author:   tfry
Date:     2007-10-16 06:33:16 -0700 (Tue, 16 Oct 2007)

Log Message:
-----------
Tab completion in console works

Modified Paths:
--------------
    branches/KDE4_port/TODO_KDE4
    branches/KDE4_port/rkward/rkconsole.cpp

Modified: branches/KDE4_port/TODO_KDE4
===================================================================
--- branches/KDE4_port/TODO_KDE4	2007-10-16 13:20:44 UTC (rev 2081)
+++ branches/KDE4_port/TODO_KDE4	2007-10-16 13:33:16 UTC (rev 2082)
@@ -88,3 +88,7 @@
 
 rkcommandlog:
 	- does the RMB-menu work?
+
+rkhtmlwindow:
+	- when this is open, we always seem to crash on close
+

Modified: branches/KDE4_port/rkward/rkconsole.cpp
===================================================================
--- branches/KDE4_port/rkward/rkconsole.cpp	2007-10-16 13:20:44 UTC (rev 2081)
+++ branches/KDE4_port/rkward/rkconsole.cpp	2007-10-16 13:33:16 UTC (rev 2082)
@@ -313,11 +313,11 @@
 			if (i % 3) {
 				doc->insertText (KTextEditor::Cursor (doc->lines () - 1, 0), (*it).leftJustified (35));
 			} else {
-				doc->insertText (KTextEditor::Cursor (doc->lines (), 0), *it);
+				doc->insertLine (doc->lines (), *it);
 			}
 			++i;
 		}
-		doc->insertText (KTextEditor::Cursor (doc->lines (), 0), prefix + line);
+		doc->insertLine (doc->lines (), prefix + line);
 		cursorAtTheEnd ();
 	} else {
 		tab_key_pressed_before = true;
@@ -330,16 +330,15 @@
 			bool ok = true;
 			QChar current;
 			for (it = entries.constBegin (); it != entries.constEnd (); ++it) {
+				if ((*it).length () <= i) {
+					ok = false;
+					break;
+				}
 				if (it == entries.constBegin ()) {
 					current = (*it).at(i);
-				}
-				QChar dummy = (*it).at(i);
-				if (dummy.isNull ()) {
+				} else if ((*it).at(i) != current) {
 					ok = false;
 					break;
-				} else if (dummy != current) {
-					ok = false;
-					break;
 				}
 			}
 			if (ok) common.append (current);


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