From 5484598d6b6b8ab97b77fb01233aaa75f2382683 Mon Sep 17 00:00:00 2001 From: peter mckinna Date: Fri, 25 Nov 2016 17:32:55 +1100 Subject: [PATCH] Fix qt sig slots tests --- m3-ui/qt/m3qtgui/test/FileBrowse/src/Window.m3 | 4 ++-- m3-ui/qt/m3qtgui/test/SigSlots/src/Main.m3 | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/m3-ui/qt/m3qtgui/test/FileBrowse/src/Window.m3 b/m3-ui/qt/m3qtgui/test/FileBrowse/src/Window.m3 index 02a2ad4f4a..d9eda85867 100644 --- a/m3-ui/qt/m3qtgui/test/FileBrowse/src/Window.m3 +++ b/m3-ui/qt/m3qtgui/test/FileBrowse/src/Window.m3 @@ -64,7 +64,7 @@ OVERRIDES init := New_Window; END; -PROCEDURE Browse(args,obj : ADDRESS) = +PROCEDURE Browse(obj : ROOT; args : ADDRESS) = VAR dir : TEXT; BEGIN @@ -93,7 +93,7 @@ BEGIN END Browse; -PROCEDURE Find(args,obj : ADDRESS) = +PROCEDURE Find(obj : ROOT; args : ADDRESS) = BEGIN IO.Put("In M3 callback Find "); diff --git a/m3-ui/qt/m3qtgui/test/SigSlots/src/Main.m3 b/m3-ui/qt/m3qtgui/test/SigSlots/src/Main.m3 index 5a6d9fdfbb..18bf84f9f2 100644 --- a/m3-ui/qt/m3qtgui/test/SigSlots/src/Main.m3 +++ b/m3-ui/qt/m3qtgui/test/SigSlots/src/Main.m3 @@ -25,7 +25,7 @@ VAR dyn1,dyn2,dyn3 : QtDynamic.DynamicQObject; -PROCEDURE Callback1(obj : ADDRESS; args : ADDRESS) = +PROCEDURE Callback1(obj : ROOT; args : ADDRESS) = VAR i : INTEGER; BEGIN @@ -38,7 +38,7 @@ BEGIN END Callback1; -PROCEDURE Callback2(obj : ADDRESS; args : ADDRESS) = +PROCEDURE Callback2(obj : ROOT; args : ADDRESS) = VAR month,year : INTEGER; BEGIN @@ -53,7 +53,7 @@ BEGIN END Callback2; -PROCEDURE Callback3(obj : ADDRESS; args : ADDRESS) = +PROCEDURE Callback3(obj : ROOT; args : ADDRESS) = VAR date := NEW(QDate); doy : INTEGER; @@ -95,7 +95,7 @@ BEGIN cal := NEW(QtCalendarWidget.T).init_0(mainWin); cal.move(100,100); - cal.resize(200,160); + cal.resize(220,200); dyn1 := NEW(QtDynamic.DynamicQObject).init_0(Callback1,NIL);