From 70f42c4e83bc824e956b3f5fa08599bb7b55a1b5 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 25 Feb 2003 14:40:59 +0000
Subject: [PATCH] some indent stuff
---
Fltk/GUI.cpp | 8 ++++++--
doc/README.indent | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index b2c13ae853..ad8292285c 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.227 2003-02-24 20:21:37 geuzaine Exp $
+// $Id: GUI.cpp,v 1.228 2003-02-25 14:40:59 geuzaine Exp $
//
// Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
//
@@ -82,6 +82,8 @@ extern Context_T CTX;
// We can not use the 'g', 'm' 's' and 'p' mnemonics since they are
// already defined as global shortcuts (geometry, mesh, solver, post).
+// *INDENT-OFF*
+
Fl_Menu_Item m_menubar_table[] = {
{"&File", 0, 0, 0, FL_SUBMENU},
{"&Open...", FL_CTRL+'o', (Fl_Callback *)file_open_cb, 0},
@@ -340,6 +342,8 @@ static Fl_Menu_Item menu_line_display[] = {
{0}
};
+// *INDENT-ON*
+
// Definition of global shortcuts
int GUI::global_shortcuts(int event){
@@ -656,7 +660,7 @@ GUI::GUI(int argc, char **argv) {
m_window->icon((char *)LoadImage(fl_display, MAKEINTRESOURCE(IDI_ICON),
IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR));
#elif defined(__APPLE__)
- /* ??? */
+ // Mac icons are defined in the resource fork or in the bundle
#else
fl_open_display();
Pixmap p1 = XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display),
diff --git a/doc/README.indent b/doc/README.indent
index 8070f332c3..d24c8680cc 100644
--- a/doc/README.indent
+++ b/doc/README.indent
@@ -1,4 +1,8 @@
-Should we apply this?
+All code should be preferably formatted using:
-indent --braces-on-if-line --cuddle-do-while --honour-newlines --no-space-after-casts --no-space-after-function-call-names --dont-break-procedure-type --no-space-after-for --no-space-after-if --no-space-after-while --no-tabs */*.cpp
\ No newline at end of file
+indent --braces-on-if-line --cuddle-do-while --honour-newlines --no-space-after-casts --no-space-after-function-call-names --no-space-after-for --no-space-after-if --no-space-after-while --no-tabs --dont-format-comments --comment-indentation1 */*.cpp
+
+Do we want the return type on the same line as the function name? Then, use
+
+--dont-break-procedure-type
\ No newline at end of file
--
GitLab