Mercurial > octave-libtiff

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
182 if (qsbutton.at (i) == defbutton) 182 if (qsbutton.at (i) == defbutton)
183 setDefaultButton (pbutton); 183 setDefaultButton (pbutton);
184 // Make the last button the button pressed when <esc> key activated. 184 // Make the last button the button pressed when <esc> key activated.
185 if (i == N-1) 185 if (i == N-1)
186 { 186 {
187 // FIXME: Why define and then immediately test value?
187 #define ACTIVE_ESCAPE 1 188 #define ACTIVE_ESCAPE 1
188 #if ACTIVE_ESCAPE 189 #if ACTIVE_ESCAPE
189 setEscapeButton (pbutton); 190 setEscapeButton (pbutton);
190 #else 191 #else
191 setEscapeButton (0); 192 setEscapeButton (0);
246 // with something down the road, but just testing capability. 247 // with something down the road, but just testing capability.
247 QString prompt_string; 248 QString prompt_string;
248 for (int j = 0; j < prompt.length (); j++) 249 for (int j = 0; j < prompt.length (); j++)
249 { 250 {
250 if (j > 0) 251 if (j > 0)
252 // FIXME: Why define and then immediately test value?
251 #define RICH_TEXT 1 253 #define RICH_TEXT 1
252 #if RICH_TEXT 254 #if RICH_TEXT
253 prompt_string.append ("<br>"); 255 prompt_string.append ("<br>");
254 #else 256 #else
255 prompt_string.append ("\n"); 257 prompt_string.append ("\n");
352 InputDialog::InputDialog (const QStringList& prompt, const QString& title, 354 InputDialog::InputDialog (const QStringList& prompt, const QString& title,
353 const QFloatList& nr, const QFloatList& nc, 355 const QFloatList& nr, const QFloatList& nc,
354 const QStringList& defaults) 356 const QStringList& defaults)
355 : QDialog () 357 : QDialog ()
356 { 358 {
357 359 // FIXME: Why define and then immediately test value?
358 #define LINE_EDIT_FOLLOWS_PROMPT 0 360 #define LINE_EDIT_FOLLOWS_PROMPT 0
359 361
360 #if LINE_EDIT_FOLLOWS_PROMPT 362 #if LINE_EDIT_FOLLOWS_PROMPT
361 // Prompt on left followed by input on right. 363 // Prompt on left followed by input on right.
362 QGridLayout *promptInputLayout = new QGridLayout; 364 QGridLayout *promptInputLayout = new QGridLayout;