openlp-core team mailing list archive

[Phill <phill.ridout@xxxxxxxxx>]

Just some style fixes please.

There's a couple inline comments.

Also you've got a right mismatch between single and double quoted strings. Can you change these so that strings use single quotes. I'm not sure there is a standard for quotes within the string, but double quotes are tidier as they do not need escaping. I'm sure I've seen this somewhere in the wiki, but I cannot find it on the coding standards page.

Diff comments:

> 
> === modified file 'openlp/core/projectors/constants.py'
> --- openlp/core/projectors/constants.py	2017-11-10 11:59:38 +0000
> +++ openlp/core/projectors/constants.py	2017-12-05 00:54:42 +0000
> @@ -144,6 +144,24 @@
>               }
>  }
>  
> +# QAbstractSocketState enums converted to string
> +S_QSOCKET_STATE = {
> +    0: 'QSocketState - UnconnectedState',
> +    1: 'QSocketState - HostLookupState',
> +    2: 'QSocketState - ConnectingState',
> +    3: 'QSocketState - ConnectedState',
> +    4: 'QSocketState - BoundState',
> +    5: 'QSocketState - ListeningState (internal use only)',
> +    6: 'QSocketState - ClosingState',
> +    'UnconnectedState': 0,
> +    'HostLookupState': 1,
> +    'ConnectingState': 2,
> +    'ConnectedState': 3,
> +    'BoundState': 4,
> +    'ListeningState': 5,
> +    'ClosingState': 6,

Comma after 6 not required

> +}
> +
>  # Error and status codes
>  S_OK = E_OK = 0  # E_OK included since I sometimes forget
>  # Error codes. Start at 200 so we don't duplicate system error codes.
> 
> === modified file 'openlp/core/projectors/pjlink.py'
> --- openlp/core/projectors/pjlink.py	2017-11-24 19:08:23 +0000
> +++ openlp/core/projectors/pjlink.py	2017-12-05 00:54:42 +0000
> @@ -123,7 +122,8 @@
>              'INST': self.process_inst,
>              'LAMP': self.process_lamp,
>              'NAME': self.process_name,
> -            'PJLINK': self.check_login,
> +            'PJLINK': self.process_pjlink,
> +            # 'PJLINK': self.check_login,

Whats happening with this commented out code?

>              'POWR': self.process_powr,
>              'SNUM': self.process_snum,
>              'SVER': self.process_sver,


-- 
https://code.launchpad.net/~alisonken1/openlp/pjlink2-m/+merge/334722
Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/pjlink2-m into lp:openlp.