[rkward-cvs] SF.net SVN: rkward:[2696] trunk/rkward/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Tue Oct 6 16:25:45 UTC 2009
Revision: 2696
http://rkward.svn.sourceforge.net/rkward/?rev=2696&view=rev
Author: tfry
Date: 2009-10-06 16:25:45 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
Silence a bunch of runtime warnings
Modified Paths:
--------------
trunk/rkward/rkward/dataeditor/rkeditordataframepart.rc
trunk/rkward/rkward/misc/rkdummypart.rc
trunk/rkward/rkward/rkconsolepart.rc
trunk/rkward/rkward/windows/detachedwindowcontainer.rc
trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc
trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc
trunk/rkward/rkward/windows/rkcommandlogpart.rc
trunk/rkward/rkward/windows/rkhelpwindow.rc
trunk/rkward/rkward/windows/rkhtmlwindow.cpp
trunk/rkward/rkward/windows/rkoutputwindow.rc
trunk/rkward/rkward/windows/rkstandardactions.rc
Modified: trunk/rkward/rkward/dataeditor/rkeditordataframepart.rc
===================================================================
--- trunk/rkward/rkward/dataeditor/rkeditordataframepart.rc 2009-10-06 16:12:03 UTC (rev 2695)
+++ trunk/rkward/rkward/dataeditor/rkeditordataframepart.rc 2009-10-06 16:25:45 UTC (rev 2696)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkeditordataframepart" version="0.5.0">
+<kpartgui name="rkeditordataframepart" version="50">
<MenuBar>
<Menu name="edit"><text>&Edit</text>
<Action name="cut"/>
Modified: trunk/rkward/rkward/misc/rkdummypart.rc
===================================================================
--- trunk/rkward/rkward/misc/rkdummypart.rc 2009-10-06 16:12:03 UTC (rev 2695)
+++ trunk/rkward/rkward/misc/rkdummypart.rc 2009-10-06 16:25:45 UTC (rev 2696)
@@ -1,4 +1,4 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.5.0">
+<kpartgui name="rkward" version="50">
<!-- Just an empty file to silence warnings -->
</kpartgui>
\ No newline at end of file
Modified: trunk/rkward/rkward/rkconsolepart.rc
===================================================================
--- trunk/rkward/rkward/rkconsolepart.rc 2009-10-06 16:12:03 UTC (rev 2695)
+++ trunk/rkward/rkward/rkconsolepart.rc 2009-10-06 16:25:45 UTC (rev 2696)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.5.1">
+<kpartgui name="rkward" version="51">
<MenuBar>
<Menu name="edit"><text>&Edit</text>
<Action name="rkconsole_copy"></Action>
Modified: trunk/rkward/rkward/windows/detachedwindowcontainer.rc
===================================================================
--- trunk/rkward/rkward/windows/detachedwindowcontainer.rc 2009-10-06 16:12:03 UTC (rev 2695)
+++ trunk/rkward/rkward/windows/detachedwindowcontainer.rc 2009-10-06 16:25:45 UTC (rev 2696)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.4.8">
+<kpartgui name="rkward" version="48">
<MenuBar>
<Merge/>
<Menu name="window"><text>&Window</text>
Modified: trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc
===================================================================
--- trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc 2009-10-06 16:12:03 UTC (rev 2695)
+++ trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc 2009-10-06 16:25:45 UTC (rev 2696)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.4.2">
+<kpartgui name="rkward" version="42">
<MenuBar>
<Menu name="device"><text>&Device</text>
<Action name="device_activate"/>
Modified: trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc 2009-10-06 16:12:03 UTC (rev 2695)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc 2009-10-06 16:25:45 UTC (rev 2696)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.5.1">
+<kpartgui name="rkward" version="51">
<MenuBar>
<Menu name="edit" noMerge="1"><text>&Edit</text>
<Menu name="tools"><text>&Tools Move</text>
Modified: trunk/rkward/rkward/windows/rkcommandlogpart.rc
===================================================================
--- trunk/rkward/rkward/windows/rkcommandlogpart.rc 2009-10-06 16:12:03 UTC (rev 2695)
+++ trunk/rkward/rkward/windows/rkcommandlogpart.rc 2009-10-06 16:25:45 UTC (rev 2696)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.5.1">
+<kpartgui name="rkward" version="51">
<Menubar>
<Menu name="edit"><text>&Edit</text>
<Action name="log_select_all"/>
Modified: trunk/rkward/rkward/windows/rkhelpwindow.rc
===================================================================
--- trunk/rkward/rkward/windows/rkhelpwindow.rc 2009-10-06 16:12:03 UTC (rev 2695)
+++ trunk/rkward/rkward/windows/rkhelpwindow.rc 2009-10-06 16:25:45 UTC (rev 2696)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.5.0">
+<kpartgui name="rkward" version="50">
<MenuBar>
<Menu name="file"><text>&File</text>
<Action name="print_help"/>
Modified: trunk/rkward/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkhtmlwindow.cpp 2009-10-06 16:12:03 UTC (rev 2695)
+++ trunk/rkward/rkward/windows/rkhtmlwindow.cpp 2009-10-06 16:25:45 UTC (rev 2696)
@@ -255,13 +255,16 @@
if (handleRKWardURL (url)) return true;
if (window_mode == HTMLOutputWindow) {
- // output window should not change url after initialization
- if ((url != current_url) && (!current_url.isEmpty ())) {
- RK_ASSERT (false);
- return false;
+ if (url != current_url) {
+ // output window should not change url after initialization
+ if (!current_url.isEmpty ()) {
+ RK_ASSERT (false);
+ return false;
+ }
+
+ current_url = url; // needs to be set before registering
+ RKOutputWindowManager::self ()->registerWindow (this);
}
- current_url = url; // needs to be set before registering
- RKOutputWindowManager::self ()->registerWindow (this);
} else {
if (!(url.isLocalFile ())) {
if (window_mode == HTMLHelpWindow) {
Modified: trunk/rkward/rkward/windows/rkoutputwindow.rc
===================================================================
--- trunk/rkward/rkward/windows/rkoutputwindow.rc 2009-10-06 16:12:03 UTC (rev 2695)
+++ trunk/rkward/rkward/windows/rkoutputwindow.rc 2009-10-06 16:25:45 UTC (rev 2696)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.5.0">
+<kpartgui name="rkward" version="50">
<MenuBar>
<Menu name="file"><text>&File</text>
<Action name="print_output"/>
Modified: trunk/rkward/rkward/windows/rkstandardactions.rc
===================================================================
--- trunk/rkward/rkward/windows/rkstandardactions.rc 2009-10-06 16:12:03 UTC (rev 2695)
+++ trunk/rkward/rkward/windows/rkstandardactions.rc 2009-10-06 16:25:45 UTC (rev 2696)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.5.1">
+<kpartgui name="rkward" version="51">
<!-- What is this for, wouldn't it be easier to just inline these actions in the parts where they
end up? Yes, but then they would be separate actions, internally, and each could be assigned
a shortcut of its own. This is needed to tie them all together. -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list