[moserial] update constructors to new syntax



commit 5815d9e91bc3430f14e680bc6590aadec585f452
Author: Marlo <brooss teambb gmail com>
Date:   Mon Feb 14 09:51:57 2011 -0500

    update constructors to new syntax

 src/MainWindow.vala            |    3 +--
 src/Preferences.vala           |   16 ++++++++--------
 src/PreferencesDialog.vala     |    2 +-
 src/ReceiveChooserDialog.vala  |    2 +-
 src/ReceiveProgressDialog.vala |    2 +-
 src/RecordDialog.vala          |    2 +-
 src/Rzwrapper.vala             |    7 +++----
 src/SendChooserDialog.vala     |    2 +-
 src/SendProgressDialog.vala    |    2 +-
 src/Settings.vala              |   17 +++++++++--------
 src/SettingsDialog.vala        |    2 +-
 src/Szwrapper.vala             |    6 +++---
 src/XmodemFilenameDialog.vala  |    2 +-
 13 files changed, 32 insertions(+), 33 deletions(-)
---
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index ab4701b..510d57f 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -96,8 +96,7 @@ public class moserial.MainWindow : Gtk.Window //Have to extend Gtk.Winow to get
 
         //private Gtk.RecentChooser recentChooser;
         public MainWindow(Builder builder, string? profileFilename) {
-                this.builder=builder;
-                this.startupProfileFilename=profileFilename;
+		GLib.Object(builder: builder, startupProfileFilename: profileFilename);
         }
         construct {
                 //setup window
diff --git a/src/Preferences.vala b/src/Preferences.vala
index 477d670..c419e66 100644
--- a/src/Preferences.vala
+++ b/src/Preferences.vala
@@ -37,14 +37,14 @@ public class Preferences : GLib.Object
 	public int timeout {get; construct;}
 	
 	public Preferences (bool useSystemMonospaceFont, string? font, string? fontColor,string? backgroundColor,string? highlightColor, bool recordLaunch, bool enableTimeout, int timeout) {
-		this.useSystemMonospaceFont=useSystemMonospaceFont;
-		this.font=font;
-		this.recordLaunch=recordLaunch;
-		this.fontColor=fontColor;
-		this.backgroundColor=backgroundColor;
-		this.highlightColor=highlightColor;
-		this.enableTimeout=enableTimeout;
-		this.timeout=timeout;
+		GLib.Object(useSystemMonospaceFont: useSystemMonospaceFont,
+			font: font, 
+			recordLaunch: recordLaunch, 
+			fontColor: fontColor, 
+			backgroundColor: backgroundColor, 
+			highlightColor: highlightColor, 
+			enableTimeout: enableTimeout, 
+			timeout: timeout);
 	}
 	construct {
 		if(font==null)
diff --git a/src/PreferencesDialog.vala b/src/PreferencesDialog.vala
index b833cba..1ecc1d7 100644
--- a/src/PreferencesDialog.vala
+++ b/src/PreferencesDialog.vala
@@ -34,7 +34,7 @@ public class moserial.PreferencesDialog : GLib.Object
         private SpinButton timeout;
         public signal void updatePreferences(Preferences preferences);
         public PreferencesDialog(Builder builder) {
-                this.builder=builder;
+		GLib.Object(builder: builder);
         }
         construct {
                 dialog = (Dialog)builder.get_object("preferences_dialog");
diff --git a/src/ReceiveChooserDialog.vala b/src/ReceiveChooserDialog.vala
index 9aba721..46d793d 100644
--- a/src/ReceiveChooserDialog.vala
+++ b/src/ReceiveChooserDialog.vala
@@ -26,7 +26,7 @@ public class moserial.ReceiveChooserDialog : GLib.Object
         public signal void startTransfer();
         public string path;
         public ReceiveChooserDialog(Builder builder) {
-                this.builder=builder;
+		GLib.Object(builder: builder);
         }
 
         construct {
diff --git a/src/ReceiveProgressDialog.vala b/src/ReceiveProgressDialog.vala
index bbaff8c..5555dd4 100644
--- a/src/ReceiveProgressDialog.vala
+++ b/src/ReceiveProgressDialog.vala
@@ -27,7 +27,7 @@ public class moserial.ReceiveProgressDialog : GLib.Object
         private ProgressBar progressBar;
         public signal void transferCanceled();
         public ReceiveProgressDialog(Builder builder) {
-                this.builder=builder;
+		GLib.Object(builder: builder);
         }
         construct {
                 dialog = (Dialog)builder.get_object("receive_progress_dialog");
diff --git a/src/RecordDialog.vala b/src/RecordDialog.vala
index 0c3397f..cc5bfc0 100644
--- a/src/RecordDialog.vala
+++ b/src/RecordDialog.vala
@@ -29,7 +29,7 @@ public class moserial.RecordDialog : GLib.Object
         public signal void stopRecording();
         public SerialStreamRecorder.Direction direction;
         public RecordDialog(Builder builder) {
-                this.builder=builder;
+		GLib.Object(builder: builder);
         }
         construct {
                 dialog = (FileChooserDialog)builder.get_object("record_dialog");
diff --git a/src/Rzwrapper.vala b/src/Rzwrapper.vala
index 2758624..7c81d7f 100644
--- a/src/Rzwrapper.vala
+++ b/src/Rzwrapper.vala
@@ -36,10 +36,9 @@ public class moserial.Rzwrapper: GLib.Object
         public string? path {get; construct;}
         public string filename {get; construct;}
 	public Rzwrapper(Protocol? protocol, SerialConnection? sc, string? p, string? filename) {
-		this.protocol = protocol;
-		this.sc = sc;
-		this.path = p;
-		this.filename = filename;
+		GLib.Object(protocol: protocol, 
+			sc: sc, path: p, 
+			filename: filename);
 	}
 	construct {
 		if(protocol==Protocol.NULL || path==null) {
diff --git a/src/SendChooserDialog.vala b/src/SendChooserDialog.vala
index 2e81fff..77642e7 100644
--- a/src/SendChooserDialog.vala
+++ b/src/SendChooserDialog.vala
@@ -26,7 +26,7 @@ public class moserial.SendChooserDialog : GLib.Object
         public signal void startTransfer();
         public string filename;
         public SendChooserDialog(Builder builder) {
-                this.builder=builder;
+		GLib.Object(builder: builder);
         }
         construct {
                 dialog = (FileChooserDialog)builder.get_object("send_chooser_dialog");
diff --git a/src/SendProgressDialog.vala b/src/SendProgressDialog.vala
index f0126e0..5f6c18a 100644
--- a/src/SendProgressDialog.vala
+++ b/src/SendProgressDialog.vala
@@ -27,7 +27,7 @@ public class moserial.SendProgressDialog : GLib.Object
         private ProgressBar progressBar;
         public signal void transferCanceled();
         public SendProgressDialog(Builder builder) {
-                this.builder=builder;
+		GLib.Object(builder: builder);
         }
         construct {
                 dialog = (Dialog)builder.get_object("send_progress_dialog");
diff --git a/src/Settings.vala b/src/Settings.vala
index 33da9fb..ffb2b01 100644
--- a/src/Settings.vala
+++ b/src/Settings.vala
@@ -41,14 +41,15 @@ public class Settings : GLib.Object
         public AccessMode accessMode {get; construct;}
         public bool localEcho {get; construct;}
         public Settings(string? device, int baudRate, int dataBits, int stopBits, Parity parity, Handshake handshake, AccessMode accessMode, bool localEcho) {
-                this.device = device;
-                this.baudRate = baudRate;
-                this.dataBits = dataBits;
-                this.stopBits = stopBits;
-                this.parity = parity;
-                this.handshake = handshake;
-                this.accessMode = accessMode;
-                this.localEcho = localEcho;
+		GLib.Object (device: device, 
+			baudRate: baudRate, 
+			dataBits: dataBits, 
+			stopBits: stopBits, 
+			parity: parity, 
+			handshake: handshake, 
+			accessMode: accessMode, 
+			localEcho: localEcho);
+
         }
         construct {
                 if (device==null)
diff --git a/src/SettingsDialog.vala b/src/SettingsDialog.vala
index 0fcee57..41a307a 100644
--- a/src/SettingsDialog.vala
+++ b/src/SettingsDialog.vala
@@ -43,7 +43,7 @@ public class moserial.SettingsDialog : GLib.Object
 	private ListStore ls;
         public signal void updateSettings(Settings settings);
         public SettingsDialog(Builder builder) {
-                this.builder=builder;
+		GLib.Object(builder: builder);
         }
 
         construct {
diff --git a/src/Szwrapper.vala b/src/Szwrapper.vala
index 72a4434..b9ff80c 100644
--- a/src/Szwrapper.vala
+++ b/src/Szwrapper.vala
@@ -36,9 +36,9 @@ public class moserial.Szwrapper: GLib.Object
         
         public string filename {get; construct;}
 	public Szwrapper(Protocol? protocol, SerialConnection? sc, string? filename) {
-		this.protocol = protocol;
-		this.sc = sc;
-		this.filename = filename;
+		GLib.Object(protocol: protocol, 
+			sc: sc, 
+			filename: filename);
 	}
 	construct {
 		if(protocol==Protocol.NULL || filename==null) {
diff --git a/src/XmodemFilenameDialog.vala b/src/XmodemFilenameDialog.vala
index cd59e21..54c430e 100644
--- a/src/XmodemFilenameDialog.vala
+++ b/src/XmodemFilenameDialog.vala
@@ -25,7 +25,7 @@ public class moserial.XmodemFilenameDialog : GLib.Object
 	private Gtk.Entry xmodemFilename;
 	public string filename;
         public XmodemFilenameDialog(Builder builder) {
-                this.builder=builder;
+		GLib.Object(builder: builder);
         }
 	construct {
 		dialog = (Dialog)builder.get_object("xmodem_filename_dialog");



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]