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

[tfry at users.sourceforge.net]

Revision: 2268
          http://rkward.svn.sourceforge.net/rkward/?rev=2268&view=rev
Author:   tfry
Date:     2007-11-22 14:19:42 -0800 (Thu, 22 Nov 2007)

Log Message:
-----------
This and that

Modified Paths:
--------------
    branches/KDE4_port/CMakeLists.txt
    branches/KDE4_port/rkward/misc/rkprogresscontrol.cpp
    branches/KDE4_port/rkward/misc/rkprogresscontrol.h
    branches/KDE4_port/rkward/rbackend/rembedinternal.cpp
    branches/KDE4_port/rkward/robjectviewer.cpp
    branches/KDE4_port/rkward/robjectviewer.h

Modified: branches/KDE4_port/CMakeLists.txt
===================================================================
--- branches/KDE4_port/CMakeLists.txt	2007-11-22 15:20:49 UTC (rev 2267)
+++ branches/KDE4_port/CMakeLists.txt	2007-11-22 22:19:42 UTC (rev 2268)
@@ -5,7 +5,7 @@
 
 SET(CMAKE_VERBOSE_MAKEFILE OFF)
 
-ADD_DEFINITIONS(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT_NO_CAST_TO_ASCII)
 
 LINK_DIRECTORIES(${KDE4_LIB_DIR})
 

Modified: branches/KDE4_port/rkward/misc/rkprogresscontrol.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/rkprogresscontrol.cpp	2007-11-22 15:20:49 UTC (rev 2267)
+++ branches/KDE4_port/rkward/misc/rkprogresscontrol.cpp	2007-11-22 22:19:42 UTC (rev 2268)
@@ -145,7 +145,7 @@
 
 	is_done = true;
 	if (dialog) {
-		dialog->done ();
+		dialog->finished ();
 	}
 
 	if ((!modal) && autodelete) {
@@ -279,7 +279,7 @@
 	setButtonText (KDialog::Cancel, i18n ("Done"));
 }
 
-void RKProgressControlDialog::done () {
+void RKProgressControlDialog::finished () {
 	RK_TRACE (MISC);
 
 	is_done = true;

Modified: branches/KDE4_port/rkward/misc/rkprogresscontrol.h
===================================================================
--- branches/KDE4_port/rkward/misc/rkprogresscontrol.h	2007-11-22 15:20:49 UTC (rev 2267)
+++ branches/KDE4_port/rkward/misc/rkprogresscontrol.h	2007-11-22 22:19:42 UTC (rev 2268)
@@ -118,7 +118,7 @@
 public:
 	void addOutput (const ROutput *output);
 	void setCloseTextToClose ();
-	void done ();
+	void finished ();
 protected:
 	void closeEvent (QCloseEvent *e);
 private:

Modified: branches/KDE4_port/rkward/rbackend/rembedinternal.cpp
===================================================================
--- branches/KDE4_port/rkward/rbackend/rembedinternal.cpp	2007-11-22 15:20:49 UTC (rev 2267)
+++ branches/KDE4_port/rkward/rbackend/rembedinternal.cpp	2007-11-22 22:19:42 UTC (rev 2268)
@@ -20,9 +20,8 @@
 // static
 REmbedInternal *REmbedInternal::this_pointer = 0; 
 
-#define QT_NO_COMPAT
-#define TRUE (const bool)0
-#define FALSE (const bool)!0
+#define TRUE true
+#define FALSE false
 #include <qstring.h>
 #include <qtextcodec.h>
 #include "../core/robject.h"

Modified: branches/KDE4_port/rkward/robjectviewer.cpp
===================================================================
--- branches/KDE4_port/rkward/robjectviewer.cpp	2007-11-22 15:20:49 UTC (rev 2267)
+++ branches/KDE4_port/rkward/robjectviewer.cpp	2007-11-22 22:19:42 UTC (rev 2268)
@@ -110,7 +110,7 @@
 	}
 }
 
-void RObjectViewer::objectDataChanged (RObject* object) {
+void RObjectViewer::objectDataChanged (RObject* object, const RObject::ChangeSet*) {
 	RK_TRACE (APP);
 
 	if (object == _object) {

Modified: branches/KDE4_port/rkward/robjectviewer.h
===================================================================
--- branches/KDE4_port/rkward/robjectviewer.h	2007-11-22 15:20:49 UTC (rev 2267)
+++ branches/KDE4_port/rkward/robjectviewer.h	2007-11-22 22:19:42 UTC (rev 2268)
@@ -55,7 +55,7 @@
 
 	void objectRemoved (RObject *object);
 	void objectMetaChanged (RObject *object);
-	void objectDataChanged (RObject *object);
+	void objectDataChanged (RObject *object, const RObject::ChangeSet*);
 private:
 	void initDescription (bool notify);
 


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