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

[tfry at users.sourceforge.net]

Revision: 2854
          http://rkward.svn.sourceforge.net/rkward/?rev=2854&view=rev
Author:   tfry
Date:     2010-05-01 19:28:12 +0000 (Sat, 01 May 2010)

Log Message:
-----------
Safety check before using smart interface

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2010-05-01 12:07:11 UTC (rev 2853)
+++ trunk/rkward/ChangeLog	2010-05-01 19:28:12 UTC (rev 2854)
@@ -1,3 +1,5 @@
+TODO: Do not use SmartInterface for KDE 4.5 and above
+
 - The tabs in the main window can now be re-ordered by dragging with the mouse (left click if compiled with Qt 4.5 or above, middle click for earlier versions)
 - Add alternating row backgrounds in data.frame-editor
 

Modified: trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp	2010-05-01 12:07:11 UTC (rev 2853)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp	2010-05-01 19:28:12 UTC (rev 2854)
@@ -566,6 +566,7 @@
 
 void RKCommandEditorWindow::addBlock (int index, const KTextEditor::Range& range) {
 	RK_TRACE (COMMANDEDITOR);
+	if (!smart_iface) return;	// may happen in KDE => 4.6 if compiled with KDE <= 4.4
 	RK_ASSERT ((index >= 0) && (index < block_records.size ()));
 
 	clearUnusedBlocks ();
@@ -589,6 +590,7 @@
 
 void RKCommandEditorWindow::removeBlock (int index, bool was_deleted) {
 	RK_TRACE (COMMANDEDITOR);
+	if (!smart_iface) return;	// may happen in KDE => 4.6 if compiled with KDE <= 4.4
 	RK_ASSERT ((index >= 0) && (index < block_records.size ()));
 
 	if (!was_deleted) {


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