Mercurial > projects > dwt-linux
diff dwt/printing/Printer.d @ 238:380bad9f6852
reverted char[] to String
author | Frank Benoit <benoit@tionex.de> |
---|---|
date | Mon, 05 May 2008 00:42:55 +0200 |
parents | 997624cece6a |
children | ce446666f5a2 |
line wrap: on
line diff
--- a/dwt/printing/Printer.d Sat Apr 26 10:01:30 2008 +0200 +++ b/dwt/printing/Printer.d Mon May 05 00:42:55 2008 +0200 @@ -70,10 +70,10 @@ bool isGCCreated = false; Font systemFont; - char[] settingsData; + String settingsData; int start, end; - static const char[] GTK_LPR_BACKEND = "GtkPrintBackendLpr"; //$NON-NLS-1$ + static const String GTK_LPR_BACKEND = "GtkPrintBackendLpr"; //$NON-NLS-1$ static const bool disablePrinting = false;// System.getProperty("dwt.internal.gtk.disablePrinting") !is null; //$NON-NLS-1$ @@ -158,10 +158,10 @@ static PrinterData printerDataFromGtkPrinter(GtkPrinter* printer) { auto backend = OS.gtk_printer_get_backend(printer); auto address = OS.G_OBJECT_TYPE_NAME(backend); - char[] backendType =tango.stdc.stringz.fromStringz( address ).dup; + String backendType =tango.stdc.stringz.fromStringz( address ).dup; address = OS.gtk_printer_get_name (printer); - char[] name =tango.stdc.stringz.fromStringz( address ).dup; + String name =tango.stdc.stringz.fromStringz( address ).dup; return new PrinterData (backendType, name); } @@ -235,22 +235,22 @@ super(checkNull(data)); } -int restoreInt(char[] key) { +int restoreInt(String key) { char [] value = restoreBytes(key, false); return to!(int)( value ); } -double restoreDouble(char[] key) { +double restoreDouble(String key) { char [] value = restoreBytes(key, false); return to!(double)( value ); } -bool restoreBoolean(char[] key) { +bool restoreBoolean(String key) { char [] value = restoreBytes(key, false); return to!(bool)( value ); } -char[] restoreBytes(char[] key, bool nullTerminate) { +String restoreBytes(String key, bool nullTerminate) { //get key start = end; while (end < settingsData.length && settingsData[end] !is 0) end++; @@ -393,7 +393,7 @@ * @see #endPage * @see #endJob */ -public bool startJob(char[] jobName) { +public bool startJob(String jobName) { checkDevice(); char* buffer = tango.stdc.stringz.toStringz(jobName); printJob = OS.gtk_print_job_new (buffer, printer, settings, pageSetup);