comparison libgui/src/settings-dialog.cc @ 21213:f7d1050b9b53

maint: Clean up various usages of #ifdef. * randmtzig.c: Use #ifdef rather than just #if. * EditControl.h : Use '#if ! defined' rather than '#ifndef' in guard block to match Octave style. * dialog.cc, settings-dialog.cc: Add FIXME notes about questionable use of #if mechanism. * file-editor-tab.cc, Array-b.cc, Array-ch.cc, Array-d.cc, Array-f.cc, Array-i.cc, Array-s.cc, MatrixType.h, quit.h, lo-sysdep.cc, lo-cutils.c, oct-alloc.h, oct-shlib.cc, sparse-sort.h: #define HAVE_XXX macros to 1, not just empty but defined. * octave-txt-lexer.h, octave-cmd.h, octave-preserve-stream-state.h, txt-eng.h, zfstream.h, oct-conf-features.h, oct-conf.h: Use octave_ namespace prefix on name of #define used to prevent multiple inclusion of headers. * parser.h, webinfo.h, ov-oncleanup.h, op-int.h, display-available.h, shared-fcns.h: Add #define guard to prevent multiple inclusion. * quadcc.cc: use all capitals for #define MIN_CQUAD_HEAPSIZE. * ov-intx.h: Add note that this file must not use guard #define. * eigs-base.h, randmtzig.h: Write '! defined' rather than '!defined'. * file-ops.cc, oct-sparse.h: Use parentheses around complex #if tests. * oct-syscalls.cc, oct-base64.cc, statdefs.h: Indent #ifdef blocks correctly. * oct-conf-post.in.h: Use "! defined". Define macros to 1, not just empty but defined.
author Rik <rik@octave.org>
date Sat, 06 Feb 2016 18:22:32 -0800
parents 710e700cdd7f
children 40de9f8f23a6
comparison
equal deleted inserted replaced
21212:7eca4ba9bb6d 21213:f7d1050b9b53
40 # include "octave-qscintilla.h" 40 # include "octave-qscintilla.h"
41 # include "octave-txt-lexer.h" 41 # include "octave-txt-lexer.h"
42 # include <QScrollArea> 42 # include <QScrollArea>
43 43
44 # if defined (HAVE_QSCI_QSCILEXEROCTAVE_H) 44 # if defined (HAVE_QSCI_QSCILEXEROCTAVE_H)
45 # define HAVE_LEXER_OCTAVE 45 # define HAVE_LEXER_OCTAVE 1
46 # include <Qsci/qscilexeroctave.h> 46 # include <Qsci/qscilexeroctave.h>
47 # elif defined (HAVE_QSCI_QSCILEXERMATLAB_H) 47 # elif defined (HAVE_QSCI_QSCILEXERMATLAB_H)
48 # define HAVE_LEXER_MATLAB 48 # define HAVE_LEXER_MATLAB 1
49 # include <Qsci/qscilexermatlab.h> 49 # include <Qsci/qscilexermatlab.h>
50 # endif 50 # endif
51 51
52 # include <Qsci/qscilexercpp.h> 52 # include <Qsci/qscilexercpp.h>
53 # include <Qsci/qscilexerbash.h> 53 # include <Qsci/qscilexerbash.h>