SF.net SVN: geany: [2287] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Wed Feb 27 13:17:30 UTC 2008
Revision: 2287
http://geany.svn.sourceforge.net/geany/?rev=2287&view=rev
Author: eht16
Date: 2008-02-27 05:17:29 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
Replace all C++-style comments with usual C-like multi-line comments.
Modified Paths:
--------------
trunk/ChangeLog
trunk/plugins/autosave.c
trunk/plugins/classbuilder.c
trunk/plugins/demoplugin.c
trunk/plugins/export.c
trunk/plugins/filebrowser.c
trunk/plugins/htmlchars.c
trunk/plugins/pluginmacros.h
trunk/plugins/vcdiff.c
trunk/scintilla/include/Accessor.h
trunk/scintilla/include/KeyWords.h
trunk/scintilla/include/Platform.h
trunk/scintilla/include/PropSet.h
trunk/scintilla/include/SString.h
trunk/scintilla/include/SciLexer.h
trunk/scintilla/include/Scintilla.h
trunk/scintilla/include/ScintillaWidget.h
trunk/scintilla/include/WindowAccessor.h
trunk/src/about.c
trunk/src/build.c
trunk/src/build.h
trunk/src/callbacks.c
trunk/src/dialogs.c
trunk/src/document.c
trunk/src/document.h
trunk/src/editor.c
trunk/src/editor.h
trunk/src/encodings.c
trunk/src/filetypes.c
trunk/src/filetypes.h
trunk/src/gb.c
trunk/src/geany.h
trunk/src/geanyobject.c
trunk/src/highlighting.c
trunk/src/keybindings.c
trunk/src/keybindings.h
trunk/src/keyfile.c
trunk/src/main.c
trunk/src/main.h
trunk/src/msgwindow.c
trunk/src/msgwindow.h
trunk/src/navqueue.c
trunk/src/notebook.c
trunk/src/notebook.h
trunk/src/plugindata.h
trunk/src/plugins.c
trunk/src/prefs.c
trunk/src/printing.c
trunk/src/project.c
trunk/src/project.h
trunk/src/sciwrappers.c
trunk/src/search.c
trunk/src/search.h
trunk/src/socket.c
trunk/src/symbols.c
trunk/src/templates.c
trunk/src/tools.c
trunk/src/treeviews.c
trunk/src/ui_utils.c
trunk/src/ui_utils.h
trunk/src/utils.c
trunk/src/utils.h
trunk/src/vte.c
trunk/src/vte.h
trunk/src/win32.c
trunk/tagmanager/basic.c
trunk/tagmanager/c.c
trunk/tagmanager/conf.c
trunk/tagmanager/css.c
trunk/tagmanager/ctags.c
trunk/tagmanager/diff.c
trunk/tagmanager/general.h
trunk/tagmanager/haxe.c
trunk/tagmanager/include/tm_workspace.h
trunk/tagmanager/latex.c
trunk/tagmanager/parse.c
trunk/tagmanager/parse.h
trunk/tagmanager/perl.c
trunk/tagmanager/php.c
trunk/tagmanager/python.c
trunk/tagmanager/rest.c
trunk/tagmanager/sql.c
trunk/tagmanager/tm_tag.c
trunk/tagmanager/tm_workspace.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/ChangeLog 2008-02-27 13:17:29 UTC (rev 2287)
@@ -1,3 +1,9 @@
+2008-02-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * plugins/*, scintilla/*, src/*, tagmanager/*:
+ Replace all C++-style comments with usual C-like multi-line comments.
+
+
2008-02-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/highlighting.c:
Modified: trunk/plugins/autosave.c
===================================================================
--- trunk/plugins/autosave.c 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/plugins/autosave.c 2008-02-27 13:17:29 UTC (rev 2287)
@@ -60,14 +60,14 @@
{
idx = p_document->get_n_idx(i);
- // skip current file to save it lastly, skip files without name
+ /* skip current file to save it lastly, skip files without name */
if (idx != cur_idx && doc_list[idx].file_name != NULL)
if (p_document->save_file(idx, FALSE))
saved_files++;
}
}
- // finally save current file, do it after all other files to get correct window title and
- // symbol list
+ /* finally save current file, do it after all other files to get correct window title and
+ * symbol list */
if (doc_list[cur_idx].file_name != NULL)
if (p_document->save_file(cur_idx, FALSE))
saved_files++;
@@ -156,7 +156,7 @@
gtk_widget_show_all(vbox);
- // run the dialog and check for the response code
+ /* run the dialog and check for the response code */
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
{
GKeyFile *config = g_key_file_new();
@@ -180,13 +180,13 @@
}
else
{
- // write config to file
+ /* write config to file */
data = g_key_file_to_data(config, NULL, NULL);
p_utils->write_file(config_file, data);
g_free(data);
}
- set_timeout(); // apply the changes
+ set_timeout(); /* apply the changes */
g_free(config_dir);
g_key_file_free(config);
Modified: trunk/plugins/classbuilder.c
===================================================================
--- trunk/plugins/classbuilder.c 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/plugins/classbuilder.c 2008-02-27 13:17:29 UTC (rev 2287)
@@ -99,10 +99,10 @@
{destructor_decl}\
\n\
private:\n\
- // add your private declarations\n\
+ /* add your private declarations */\n\
};\n\
\n\
-#endif // {header_guard}\n\
+#endif /* {header_guard} */ \n\
";
static const gchar templates_cpp_class_source[] = "{fileheader}\n\n\
@@ -481,7 +481,7 @@
cc_dlg_on_create_class(cc_dlg);
gtk_widget_destroy(cc_dlg->dialog);
-// g_object_unref(G_OBJECT(cc_dlg->dialog));
+/* g_object_unref(G_OBJECT(cc_dlg->dialog)); */
}
@@ -725,7 +725,7 @@
}
}
- // only create the files if the filename is not empty
+ /* only create the files if the filename is not empty */
if (! p_utils->str_equal(class_info->source, ""))
{
text = get_template_class_source(class_info);
Modified: trunk/plugins/demoplugin.c
===================================================================
--- trunk/plugins/demoplugin.c 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/plugins/demoplugin.c 2008-02-27 13:17:29 UTC (rev 2287)
@@ -35,11 +35,11 @@
*/
-#include "geany.h" // for the GeanyApp data type
-#include "support.h" // for the _() translation macro (see also po/POTFILES.in)
+#include "geany.h" /* for the GeanyApp data type */
+#include "support.h" /* for the _() translation macro (see also po/POTFILES.in) */
-#include "plugindata.h" // this defines the plugin API
-#include "pluginmacros.h" // some useful macros to avoid typing geany_data so often
+#include "plugindata.h" /* this defines the plugin API */
+#include "pluginmacros.h" /* some useful macros to avoid typing geany_data so often */
/* These items are set by Geany before init() is called. */
@@ -55,7 +55,7 @@
PLUGIN_INFO(_("Demo"), _("Example plugin."), VERSION, _("The Geany developer team"))
-// text to be shown in the plugin dialog
+/* text to be shown in the plugin dialog */
static gchar *welcome_text = NULL;
@@ -85,7 +85,7 @@
{
GtkWidget *demo_item;
- // Add an item to the Tools menu
+ /* Add an item to the Tools menu */
demo_item = gtk_menu_item_new_with_mnemonic(_("_Demo Plugin"));
gtk_widget_show(demo_item);
gtk_container_add(GTK_CONTAINER(geany_data->tools_menu), demo_item);
@@ -93,7 +93,7 @@
welcome_text = g_strdup(_("Hello World!"));
- // keep a pointer to the menu item, so we can remove it when the plugin is unloaded
+ /* keep a pointer to the menu item, so we can remove it when the plugin is unloaded */
plugin_fields->menu_item = demo_item;
}
@@ -107,7 +107,7 @@
{
GtkWidget *dialog, *label, *entry, *vbox;
- // example configuration dialog
+ /* example configuration dialog */
dialog = gtk_dialog_new_with_buttons(_("Demo"),
GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
@@ -115,8 +115,8 @@
gtk_widget_set_name(dialog, "GeanyDialog");
gtk_box_set_spacing(GTK_BOX(vbox), 6);
- // add a label and a text entry t the dialog
- label = gtk_label_new("Welcome text to show:");
+ /* add a label and a text entry to the dialog */
+ label = gtk_label_new(_("Welcome text to show:"));
gtk_widget_show(label);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
entry = gtk_entry_new();
@@ -128,16 +128,16 @@
gtk_container_add(GTK_CONTAINER(vbox), entry);
gtk_widget_show(vbox);
- // run the dialog and check for the response code
+ /* run the dialog and check for the response code */
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
{
g_free(welcome_text);
welcome_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
- // maybe the plugin should write here the settings into a file
- // (e.g. using GLib's GKeyFile API)
- // all plugin specific files should be created in:
- // app->configdir G_DIR_SEPARATOR_S plugins G_DIR_SEPARATOR_S pluginname G_DIR_SEPARATOR_S
- // e.g. this could be: ~/.geany/plugins/Demo/, please use app->configdir
+ /* maybe the plugin should write here the settings into a file
+ * (e.g. using GLib's GKeyFile API)
+ * all plugin specific files should be created in:
+ * app->configdir G_DIR_SEPARATOR_S plugins G_DIR_SEPARATOR_S pluginname G_DIR_SEPARATOR_S
+ * e.g. this could be: ~/.geany/plugins/Demo/, please use app->configdir */
}
gtk_widget_destroy(dialog);
}
@@ -148,8 +148,8 @@
* Be sure to leave Geany as it was before init(). */
void cleanup(void)
{
- // remove the menu item added in init()
+ /* remove the menu item added in init() */
gtk_widget_destroy(plugin_fields->menu_item);
- // release other allocated strings and objects
+ /* release other allocated strings and objects */
g_free(welcome_text);
}
Modified: trunk/plugins/export.c
===================================================================
--- trunk/plugins/export.c 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/plugins/export.c 2008-02-27 13:17:29 UTC (rev 2287)
@@ -119,7 +119,7 @@
/* converts a RGB colour into a LaTeX compatible representation, taken from SciTE */
static gchar* get_tex_rgb(gint rgb_colour)
{
- //texcolor[rgb]{0,0.5,0}{....}
+ /* texcolor[rgb]{0,0.5,0}{....} */
gdouble rf = (rgb_colour % 256) / 256.0;
gdouble gf = ((rgb_colour & - 16711936) / 256) / 256.0;
gdouble bf = ((rgb_colour & 0xff0000) / 65536) / 256.0;
@@ -131,7 +131,7 @@
}
-// convert a style number (0..127) into a string representation (aa, ab, .., ba, bb, .., zy, zz)
+/* convert a style number (0..127) into a string representation (aa, ab, .., ba, bb, .., zy, zz) */
static gchar *get_tex_style(gint style)
{
static gchar buf[4];
@@ -205,7 +205,7 @@
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(app->window));
- // if the current document has a filename we use it as the default.
+ /* if the current document has a filename we use it as the default. */
gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(dialog));
if (doc_list[idx].file_name != NULL)
{
@@ -222,9 +222,9 @@
file_name = g_strconcat(short_name, suffix, extension, NULL);
locale_filename = p_utils->get_locale_from_utf8(doc_list[idx].file_name);
locale_dirname = g_path_get_dirname(locale_filename);
- // set the current name to base_name.html which probably doesn't exist yet so
- // gtk_file_chooser_set_filename() can't be used and we need
- // gtk_file_chooser_set_current_folder() additionally
+ /* set the current name to base_name.html which probably doesn't exist yet so
+ * gtk_file_chooser_set_filename() can't be used and we need
+ * gtk_file_chooser_set_current_folder() additionally */
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), locale_dirname);
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), file_name);
g_free(locale_filename);
@@ -240,7 +240,7 @@
gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(dialog));
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), fname);
- // use default startup directory(if set) if no files are open
+ /* use default startup directory(if set) if no files are open */
if (NZV(default_open_path) && g_path_is_absolute(default_open_path))
{
gchar *locale_path = p_utils->get_locale_from_utf8(default_open_path);
@@ -293,7 +293,7 @@
return "";
if (type == DATE_TYPE_HTML)
-// needs testing
+/** needs testing */
#ifdef _GNU_SOURCE
format = "%Y-%m-%dT%H:%M:%S%z";
#else
@@ -326,7 +326,7 @@
utf8_filename = p_utils->get_utf8_from_locale(new_filename);
- // check if file exists and ask whether to overwrite or not
+ /* check if file exists and ask whether to overwrite or not */
if (g_file_test(new_filename, G_FILE_TEST_EXISTS))
{
if (p_dialogs->show_question(
@@ -349,7 +349,7 @@
{
gint i, style = -1, old_style = 0, column = 0;
gchar c, c_next, *tmp;
- // 0 - fore, 1 - back, 2 - bold, 3 - italic, 4 - font size, 5 - used(0/1)
+ /* 0 - fore, 1 - back, 2 - bold, 3 - italic, 4 - font size, 5 - used(0/1) */
gint styles[STYLE_MAX + 1][MAX_TYPES];
gboolean block_open = FALSE;
GString *body;
@@ -357,7 +357,7 @@
GString *latex;
gint style_max = pow(2, p_sci->send_message(doc_list[idx].sci, SCI_GETSTYLEBITS, 0, 0));
- // first read all styles from Scintilla
+ /* first read all styles from Scintilla */
for (i = 0; i < style_max; i++)
{
styles[i][FORE] = p_sci->send_message(doc_list[idx].sci, SCI_STYLEGETFORE, i, 0);
@@ -367,7 +367,7 @@
styles[i][USED] = 0;
}
- // read the document and write the LaTeX code
+ /* read the document and write the LaTeX code */
body = g_string_new("");
for (i = 0; i < p_sci->get_length(doc_list[idx].sci); i++)
{
@@ -388,14 +388,14 @@
block_open = TRUE;
}
- // escape the current character if necessary else just add it
+ /* escape the current character if necessary else just add it */
switch (c)
{
case '\r':
case '\n':
{
if (c == '\r' && c_next == '\n')
- continue; // when using CR/LF skip CR and add the line break with LF
+ continue; /* when using CR/LF skip CR and add the line break with LF */
if (block_open)
{
@@ -411,7 +411,7 @@
gint tab_stop = geany_data->editor_prefs->tab_width -
(column % geany_data->editor_prefs->tab_width);
- column += tab_stop - 1; // -1 because we add 1 at the end of the loop
+ column += tab_stop - 1; /* -1 because we add 1 at the end of the loop */
g_string_append_printf(body, "\\hspace*{%dem}", tab_stop);
break;
}
@@ -420,7 +420,7 @@
if (c_next == ' ')
{
g_string_append(body, "{\\hspace*{1em}}");
- i++; // skip the next character
+ i++; /* skip the next character */
}
else
g_string_append_c(body, ' ');
@@ -452,37 +452,37 @@
g_string_append(body, "\\symbol{94}");
break;
}
- /// TODO still don't work for "---" or "----"
- case '-': // mask "--"
+ /** TODO still don't work for "---" or "----" */
+ case '-': /* mask "--" */
{
if (c_next == '-')
{
g_string_append(body, "-\\/-");
- i++; // skip the next character
+ i++; /* skip the next character */
}
else
g_string_append_c(body, '-');
break;
}
- case '<': // mask "<<"
+ case '<': /* mask "<<" */
{
if (c_next == '<')
{
g_string_append(body, "<\\/<");
- i++; // skip the next character
+ i++; /* skip the next character */
}
else
g_string_append_c(body, '<');
break;
}
- case '>': // mask ">>"
+ case '>': /* mask ">>" */
{
if (c_next == '>')
{
g_string_append(body, ">\\/>");
- i++; // skip the next character
+ i++; /* skip the next character */
}
else
g_string_append_c(body, '>');
@@ -499,10 +499,10 @@
block_open = FALSE;
}
- // force writing of style 0 (used at least for line breaks)
+ /* force writing of style 0 (used at least for line breaks) */
styles[0][USED] = 1;
- // write used styles in the header
+ /* write used styles in the header */
cmds = g_string_new("");
for (i = 0; i <= STYLE_MAX; i++)
{
@@ -531,7 +531,7 @@
}
}
- // write all
+ /* write all */
latex = g_string_new(TEMPLATE_LATEX);
p_utils->string_replace_all(latex, "{export_content}", body->str);
p_utils->string_replace_all(latex, "{export_styles}", cmds->str);
@@ -553,7 +553,7 @@
{
gint i, style = -1, old_style = 0, column = 0;
gchar c, c_next;
- // 0 - fore, 1 - back, 2 - bold, 3 - italic, 4 - font size, 5 - used(0/1)
+ /* 0 - fore, 1 - back, 2 - bold, 3 - italic, 4 - font size, 5 - used(0/1) */
gint styles[STYLE_MAX + 1][MAX_TYPES];
gboolean span_open = FALSE;
const gchar *font_name;
@@ -564,7 +564,7 @@
GString *html;
gint style_max = pow(2, p_sci->send_message(doc_list[idx].sci, SCI_GETSTYLEBITS, 0, 0));
- // first read all styles from Scintilla
+ /* first read all styles from Scintilla */
for (i = 0; i < style_max; i++)
{
styles[i][FORE] = ROTATE_RGB(p_sci->send_message(doc_list[idx].sci, SCI_STYLEGETFORE, i, 0));
@@ -574,22 +574,22 @@
styles[i][USED] = 0;
}
- // read Geany's font and font size
+ /* read Geany's font and font size */
font_desc = pango_font_description_from_string(prefs->editor_font);
font_name = pango_font_description_get_family(font_desc);
- //font_size = pango_font_description_get_size(font_desc) / PANGO_SCALE;
- // take the zoom level also into account
+ /*font_size = pango_font_description_get_size(font_desc) / PANGO_SCALE;*/
+ /* take the zoom level also into account */
font_size = p_sci->send_message(doc_list[idx].sci, SCI_STYLEGETSIZE, 0, 0);
if (use_zoom)
font_size += p_sci->send_message(doc_list[idx].sci, SCI_GETZOOM, 0, 0);
- // read the document and write the HTML body
+ /* read the document and write the HTML body */
body = g_string_new("");
for (i = 0; i < p_sci->get_length(doc_list[idx].sci); i++)
{
style = p_sci->get_style_at(doc_list[idx].sci, i);
c = p_sci->get_char_at(doc_list[idx].sci, i);
- // p_sci->get_char_at() takes care of index boundaries and return 0 if i is too high
+ /* p_sci->get_char_at() takes care of index boundaries and return 0 if i is too high */
c_next = p_sci->get_char_at(doc_list[idx].sci, i + 1);
if ((style != old_style || ! span_open) && ! isspace(c))
@@ -604,14 +604,14 @@
span_open = TRUE;
}
- // escape the current character if necessary else just add it
+ /* escape the current character if necessary else just add it */
switch (c)
{
case '\r':
case '\n':
{
if (c == '\r' && c_next == '\n')
- continue; // when using CR/LF skip CR and add the line break with LF
+ continue; /* when using CR/LF skip CR and add the line break with LF */
if (span_open)
{
@@ -628,7 +628,7 @@
gint tab_stop = geany_data->editor_prefs->tab_width -
(column % geany_data->editor_prefs->tab_width);
- column += tab_stop - 1; // -1 because we add 1 at the end of the loop
+ column += tab_stop - 1; /* -1 because we add 1 at the end of the loop */
for (j = 0; j < tab_stop; j++)
{
g_string_append(body, " ");
@@ -665,7 +665,7 @@
span_open = FALSE;
}
- // write used styles in the header
+ /* write used styles in the header */
css = g_string_new("");
g_string_append_printf(css,
"\tbody\n\t{\n\t\tfont-family: %s, monospace;\n\t\tfont-size: %dpt;\n\t}\n",
@@ -683,7 +683,7 @@
}
}
- // write all
+ /* write all */
html = g_string_new(TEMPLATE_HTML);
p_utils->string_replace_all(html, "{export_date}", get_date(DATE_TYPE_HTML));
p_utils->string_replace_all(html, "{export_content}", body->str);
@@ -715,21 +715,21 @@
menu_export_menu = gtk_menu_new ();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_export), menu_export_menu);
- // HTML
+ /* HTML */
menu_create_html = gtk_menu_item_new_with_mnemonic(_("As HTML"));
gtk_container_add(GTK_CONTAINER (menu_export_menu), menu_create_html);
g_signal_connect((gpointer) menu_create_html, "activate",
G_CALLBACK(on_menu_create_html_activate), NULL);
- // LaTeX
+ /* LaTeX */
menu_create_latex = gtk_menu_item_new_with_mnemonic(_("As LaTeX"));
gtk_container_add(GTK_CONTAINER (menu_export_menu), menu_create_latex);
g_signal_connect((gpointer) menu_create_latex, "activate",
G_CALLBACK(on_menu_create_latex_activate), NULL);
- // disable menu_item when there are no documents open
+ /* disable menu_item when there are no documents open */
plugin_fields->menu_item = menu_export;
plugin_fields->flags = PLUGIN_IS_DOCUMENT_SENSITIVE;
Modified: trunk/plugins/filebrowser.c
===================================================================
--- trunk/plugins/filebrowser.c 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/plugins/filebrowser.c 2008-02-27 13:17:29 UTC (rev 2287)
@@ -49,7 +49,7 @@
_("The Geany developer team"))
-// number of characters to skip the root of an absolute path("c:" or "d:" on Windows)
+/* number of characters to skip the root of an absolute path("c:" or "d:" on Windows) */
#ifdef G_OS_WIN32
# define ROOT_OFFSET 2
#else
@@ -73,8 +73,8 @@
static GtkEntryCompletion *entry_completion = NULL;
static GtkWidget *path_entry;
-static gchar *current_dir = NULL; // in locale-encoding
-static gchar *open_cmd; // in locale-encoding
+static gchar *current_dir = NULL; /* in locale-encoding */
+static gchar *open_cmd; /* in locale-encoding */
static gchar *config_file;
static struct
@@ -85,7 +85,7 @@
} popup_items;
-// Returns: whether name should be hidden.
+/* Returns: whether name should be hidden. */
static gboolean check_hidden(const gchar *base_name)
{
gsize len;
@@ -117,7 +117,7 @@
}
-// name is in locale encoding
+/* name is in locale encoding */
static void add_item(const gchar *name)
{
GtkTreeIter iter;
@@ -162,7 +162,7 @@
}
-// adds ".." to the start of the file list
+/* adds ".." to the start of the file list */
static void add_top_level_entry(void)
{
GtkTreeIter iter;
@@ -182,20 +182,20 @@
{
gtk_list_store_clear(file_store);
- // reset the directory item pointer
+ /* reset the directory item pointer */
if (last_dir_iter != NULL)
gtk_tree_iter_free(last_dir_iter);
last_dir_iter = NULL;
}
-// recreate the tree model from current_dir.
+/* recreate the tree model from current_dir. */
static void refresh(void)
{
gchar *utf8_dir;
GSList *list;
- // don't clear when the new path doesn't exist
+ /* don't clear when the new path doesn't exist */
if (! g_file_test(current_dir, G_FILE_TEST_EXISTS))
return;
@@ -262,7 +262,7 @@
static void on_go_up(void)
{
- // remove the highest directory part (which becomes the basename of current_dir)
+ /* remove the highest directory part (which becomes the basename of current_dir) */
setptr(current_dir, g_path_get_dirname(current_dir));
refresh();
}
@@ -412,7 +412,7 @@
files = g_slist_append(files, fname);
}
p_document->open_files(files, FALSE, NULL, NULL);
- g_slist_foreach(files, (GFunc) g_free, NULL); // free filenames
+ g_slist_foreach(files, (GFunc) g_free, NULL); /* free filenames */
g_slist_free(files);
}
@@ -442,7 +442,7 @@
{
if (check_single_selection(treesel))
{
- GtkTreePath *treepath = list->data; // first selected item
+ GtkTreePath *treepath = list->data; /* first selected item */
open_folder(treepath);
}
@@ -472,7 +472,7 @@
if (is_dir)
{
- GtkTreePath *treepath = list->data; // first selected item
+ GtkTreePath *treepath = list->data; /* first selected item */
dir = get_tree_path_filename(treepath);
}
@@ -573,7 +573,7 @@
}
-// delay updating popup menu until the selection has been set
+/* delay updating popup menu until the selection has been set */
static gboolean on_button_release(GtkWidget *widget, GdkEventButton *event, gpointer user_data)
{
if (event->button == 3)
@@ -602,7 +602,7 @@
if ((event->keyval == GDK_Up ||
event->keyval == GDK_KP_Up) &&
- (event->state & GDK_MOD1_MASK)) // FIXME: Alt-Up doesn't seem to work!
+ (event->state & GDK_MOD1_MASK)) /* FIXME: Alt-Up doesn't seem to work! */
on_go_up();
return FALSE;
}
@@ -657,7 +657,7 @@
gtk_widget_modify_font(file_view, pfd);
pango_font_description_free(pfd);
- // selection handling
+ /* selection handling */
select = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view));
gtk_tree_selection_set_mode(select, GTK_SELECTION_MULTIPLE);
@@ -721,8 +721,8 @@
if (str != NULL && icon != NULL && p_utils->str_equal(icon, GTK_STOCK_DIRECTORY) &&
! g_str_has_suffix(key, G_DIR_SEPARATOR_S))
{
- // key is something like "/tmp/te" and str is a filename like "test",
- // so strip the path from key to make them comparable
+ /* key is something like "/tmp/te" and str is a filename like "test",
+ * so strip the path from key to make them comparable */
gchar *base_name = g_path_get_basename(key);
gchar *str_lowered = g_utf8_strdown(str, -1);
result = g_str_has_prefix(str_lowered, base_name);
@@ -746,7 +746,7 @@
gchar *text = g_strconcat(current_dir, G_DIR_SEPARATOR_S, str, NULL);
gtk_entry_set_text(GTK_ENTRY(path_entry), text);
gtk_editable_set_position(GTK_EDITABLE(path_entry), -1);
- // force change of directory when completion is done
+ /* force change of directory when completion is done */
on_path_entry_activate(GTK_ENTRY(path_entry), NULL);
g_free(text);
}
@@ -874,7 +874,7 @@
gtk_widget_show_all(vbox);
- // run the dialog and check for the response code
+ /* run the dialog and check for the response code */
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
{
GKeyFile *config = g_key_file_new();
@@ -899,13 +899,13 @@
}
else
{
- // write config to file
+ /* write config to file */
data = g_key_file_to_data(config, NULL, NULL);
p_utils->write_file(config_file, data);
g_free(data);
}
- // apply the changes
+ /* apply the changes */
refresh();
g_free(config_dir);
Modified: trunk/plugins/htmlchars.c
===================================================================
--- trunk/plugins/htmlchars.c 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/plugins/htmlchars.c 2008-02-27 13:17:29 UTC (rev 2287)
@@ -124,15 +124,15 @@
sc_fill_store(sc_store);
- //gtk_tree_view_expand_all(special_characters_tree);
+ /*gtk_tree_view_expand_all(special_characters_tree);*/
gtk_tree_view_set_search_column(sc_tree, COLUMN_HTML_NAME);
}
gtk_widget_show_all(sc_dialog);
}
-// fill the tree model with data
-/// TODO move this in a file and make it extendable for more data types
+/* fill the tree model with data
+ ** TODO move this in a file and make it extendable for more data types */
static void sc_fill_store(GtkTreeStore *store)
{
GtkTreeIter iter;
@@ -405,14 +405,14 @@
for (i = 0; i < G_N_ELEMENTS(chars); i++)
{
if (chars[i][1] == NULL)
- { // add a category
+ { /* add a category */
gtk_tree_store_append(store, &iter, NULL);
gtk_tree_store_set(store, &iter, COLUMN_CHARACTER, chars[i][0], -1);
if (parent_iter != NULL) gtk_tree_iter_free(parent_iter);
parent_iter = gtk_tree_iter_copy(&iter);
}
else
- { // add child to parent_iter
+ { /* add child to parent_iter */
gtk_tree_store_append(store, &iter, parent_iter);
gtk_tree_store_set(store, &iter, COLUMN_CHARACTER, chars[i][0],
COLUMN_HTML_NAME, chars[i][1], -1);
@@ -458,7 +458,7 @@
if (gtk_tree_selection_get_selected(selection, &model, &iter))
{
- // only hide dialog if selection was not a category
+ /* only hide dialog if selection was not a category */
if (sc_insert(model, &iter))
gtk_widget_hide(GTK_WIDGET(dialog));
}
@@ -476,11 +476,11 @@
if (gtk_tree_model_get_iter(model, &iter, path))
{
- // only hide dialog if selection was not a category
+ /* only hide dialog if selection was not a category */
if (sc_insert(model, &iter))
gtk_widget_hide(sc_dialog);
else
- { // double click on a category to toggle the expand or collapse it
+ { /* double click on a category to toggle the expand or collapse it */
if (gtk_tree_view_row_expanded(sc_tree, path))
gtk_tree_view_collapse_row(sc_tree, path);
else
@@ -494,7 +494,7 @@
static void
item_activate(GtkMenuItem *menuitem, gpointer gdata)
{
- // refuse opening the dialog if we don't have an active tab
+ /* refuse opening the dialog if we don't have an active tab */
gint idx = p_document->get_cur_idx();
if (idx == -1 || ! doc_list[idx].is_valid) return;
@@ -508,13 +508,13 @@
{
GtkWidget *demo_item;
- // Add an item to the Tools menu
+ /* Add an item to the Tools menu */
demo_item = gtk_menu_item_new_with_mnemonic(_("_Insert Special HTML Characters"));
gtk_widget_show(demo_item);
gtk_container_add(GTK_CONTAINER(geany_data->tools_menu), demo_item);
g_signal_connect(G_OBJECT(demo_item), "activate", G_CALLBACK(item_activate), NULL);
- // disable menu_item when there are no documents open
+ /* disable menu_item when there are no documents open */
plugin_fields->menu_item = demo_item;
plugin_fields->flags = PLUGIN_IS_DOCUMENT_SENSITIVE;
}
Modified: trunk/plugins/pluginmacros.h
===================================================================
--- trunk/plugins/pluginmacros.h 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/plugins/pluginmacros.h 2008-02-27 13:17:29 UTC (rev 2287)
@@ -69,8 +69,8 @@
/* Temporary source compatibility macros - do not use these in new code. */
#define dialogs geany_data->dialogs
-#define documents geany_data->documents // avoids conflict with document typedef
-#define encodings geany_data->encoding // avoids conflict with document::encoding
+#define documents geany_data->documents /* avoids conflict with document typedef */
+#define encodings geany_data->encoding /* avoids conflict with document::encoding */
#define highlighting geany_data->highlighting
#define keybindings geany_data->keybindings
#define msgwindow geany_data->msgwindow
@@ -78,7 +78,7 @@
#define search geany_data->search
#define support geany_data->support
#define templates geany_data->templates
-#define tagmanager geany_data->tm // avoids conflict with "struct tm *t"
+#define tagmanager geany_data->tm /* avoids conflict with "struct tm *t" */
#define ui geany_data->ui
#define utils geany_data->utils
Modified: trunk/plugins/vcdiff.c
===================================================================
--- trunk/plugins/vcdiff.c 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/plugins/vcdiff.c 2008-02-27 13:17:29 UTC (rev 2287)
@@ -91,8 +91,8 @@
void** commands;
void** envs;
const gchar *program;
- const gchar *subdir; // version control subdirectory, e.g. ".svn"
- gboolean check_parents; // check parent dirs to find subdir
+ const gchar *subdir; /* version control subdirectory, e.g. ".svn" */
+ gboolean check_parents; /* check parent dirs to find subdir */
} VC_RECORD;
@@ -270,8 +270,8 @@
filename = g_path_get_basename(name_prefix);
setptr(filename, g_strconcat(filename, ".vc.diff", NULL));
- // need to convert input text from the encoding of the original file into
- // UTF-8 because internally Geany always needs UTF-8
+ /* need to convert input text from the encoding of the original file into
+ * UTF-8 because internally Geany always needs UTF-8 */
if (force_encoding)
{
text = p_encoding->convert_to_utf8_from_charset(
@@ -514,7 +514,7 @@
menu_vcdiff_menu = gtk_menu_new ();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_vcdiff), menu_vcdiff_menu);
- // Single file
+ /* Single file */
menu_vcdiff_file = gtk_menu_item_new_with_mnemonic(_("From Current _File"));
gtk_container_add(GTK_CONTAINER (menu_vcdiff_menu), menu_vcdiff_file);
gtk_tooltips_set_tip (tooltips, menu_vcdiff_file,
@@ -523,7 +523,7 @@
g_signal_connect((gpointer) menu_vcdiff_file, "activate",
G_CALLBACK(vcfile_activated), NULL);
- // Directory
+ /* Directory */
menu_vcdiff_dir = gtk_menu_item_new_with_mnemonic(_("From Current _Directory"));
gtk_container_add(GTK_CONTAINER (menu_vcdiff_menu), menu_vcdiff_dir);
gtk_tooltips_set_tip (tooltips, menu_vcdiff_dir,
@@ -532,7 +532,7 @@
g_signal_connect((gpointer) menu_vcdiff_dir, "activate",
G_CALLBACK(vcdirectory_activated), NULL);
- // Project
+ /* Project */
menu_vcdiff_project = gtk_menu_item_new_with_mnemonic(_("From Current _Project"));
gtk_container_add(GTK_CONTAINER (menu_vcdiff_menu), menu_vcdiff_project);
gtk_tooltips_set_tip (tooltips, menu_vcdiff_project,
@@ -551,6 +551,6 @@
/* Called by Geany before unloading the plugin. */
void cleanup(void)
{
- // remove the menu item added in init()
+ /* remove the menu item added in init() */
gtk_widget_destroy(plugin_fields->menu_item);
}
Modified: trunk/scintilla/include/Accessor.h
===================================================================
--- trunk/scintilla/include/Accessor.h 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/scintilla/include/Accessor.h 2008-02-27 13:17:29 UTC (rev 2287)
@@ -1,9 +1,9 @@
-// Scintilla source code edit control
+/* Scintilla source code edit control */
/** @file Accessor.h
** Rapid easy access to contents of a Scintilla.
**/
-// Copyright 1998-2001 by Neil Hodgson <neilh at scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2001 by Neil Hodgson <neilh at scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
enum { wsSpace = 1, wsTab = 2, wsSpaceTab = 4, wsInconsistent=8};
@@ -25,7 +25,7 @@
char buf[bufferSize+1];
int startPos;
int endPos;
- int codePage;
+ int codePage;
virtual bool InternalIsLeadByte(char ch)=0;
virtual void Fill(int position)=0;
@@ -44,7 +44,7 @@
if (position < startPos || position >= endPos) {
Fill(position);
if (position < startPos || position >= endPos) {
- // Position is outside range of document
+ /* Position is outside range of document */
return chDefault;
}
}
@@ -67,7 +67,7 @@
virtual int GetPropertyInt(const char *key, int defaultValue=0)=0;
virtual char *GetProperties()=0;
- // Style setting
+ /* Style setting */
virtual void StartAt(unsigned int start, char chMask=31)=0;
virtual void SetFlags(char chFlags_, char chWhile_)=0;
virtual unsigned int GetStartSegment()=0;
Modified: trunk/scintilla/include/KeyWords.h
===================================================================
--- trunk/scintilla/include/KeyWords.h 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/scintilla/include/KeyWords.h 2008-02-27 13:17:29 UTC (rev 2287)
@@ -1,9 +1,9 @@
-// Scintilla source code edit control
+/* Scintilla source code edit control */
/** @file KeyWords.h
** Colourise for particular languages.
**/
-// Copyright 1998-2001 by Neil Hodgson <neilh at scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2001 by Neil Hodgson <neilh at scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
#ifdef SCI_NAMESPACE
namespace Scintilla {
@@ -11,7 +11,7 @@
typedef void (*LexerFunction)(unsigned int startPos, int lengthDoc, int initStyle,
WordList *keywordlists[], Accessor &styler);
-
+
/**
* A LexerModule is responsible for lexing and folding a particular language.
* The class maintains a list of LexerModules which can be searched to find a
@@ -31,9 +31,9 @@
public:
const char *languageName;
- LexerModule(int language_,
- LexerFunction fnLexer_,
- const char *languageName_=0,
+ LexerModule(int language_,
+ LexerFunction fnLexer_,
+ const char *languageName_=0,
LexerFunction fnFolder_=0,
const char * const wordListDescriptions_[] = NULL,
int styleBits_=5);
@@ -41,7 +41,7 @@
}
int GetLanguage() const { return language; }
- // -1 is returned if no WordList information is available
+ /* -1 is returned if no WordList information is available */
int GetNumWordLists() const;
const char *GetWordListDescription(int index) const;
@@ -78,7 +78,7 @@
inline bool isoperator(char ch) {
if (isascii(ch) && isalnum(ch))
return false;
- // '.' left out as it is used to make up numbers
+ /* '.' left out as it is used to make up numbers */
if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||
ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
Modified: trunk/scintilla/include/Platform.h
===================================================================
--- trunk/scintilla/include/Platform.h 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/scintilla/include/Platform.h 2008-02-27 13:17:29 UTC (rev 2287)
@@ -1,18 +1,18 @@
-// Scintilla source code edit control
+/* Scintilla source code edit control */
/** @file Platform.h
** Interface to platform facilities. Also includes some basic utilities.
** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWindows.
**/
-// Copyright 1998-2003 by Neil Hodgson <neilh at scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2003 by Neil Hodgson <neilh at scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
#ifndef PLATFORM_H
#define PLATFORM_H
-// PLAT_GTK = GTK+ on Linux or Win32
-// PLAT_GTK_WIN32 is defined additionally when running PLAT_GTK under Win32
-// PLAT_WIN = Win32 API on Win32 OS
-// PLAT_WX is wxWindows on any supported platform
+/* PLAT_GTK = GTK+ on Linux or Win32
+ * PLAT_GTK_WIN32 is defined additionally when running PLAT_GTK under Win32
+ * PLAT_WIN = Win32 API on Win32 OS
+ * PLAT_WX is wxWindows on any supported platform */
#define PLAT_GTK 0
#define PLAT_GTK_WIN32 0
@@ -52,8 +52,8 @@
namespace Scintilla {
#endif
-// Underlying the implementation of the platform classes are platform specific types.
-// Sometimes these need to be passed around by client code so they are defined here
+/* Underlying the implementation of the platform classes are platform specific types.
+ * Sometimes these need to be passed around by client code so they are defined here */
typedef void *FontID;
typedef void *SurfaceID;
@@ -75,7 +75,7 @@
explicit Point(int x_=0, int y_=0) : x(x_), y(y_) {
}
- // Other automatically defined methods (assignment, copy constructor, destructor) are fine
+ /* Other automatically defined methods (assignment, copy constructor, destructor) are fine */
static Point FromLong(long lpoint);
};
@@ -96,7 +96,7 @@
left(left_), top(top_), right(right_), bottom(bottom_) {
}
- // Other automatically defined methods (assignment, copy constructor, destructor) are fine
+ /* Other automatically defined methods (assignment, copy constructor, destructor) are fine */
bool operator==(PRectangle &rc) {
return (rc.left == left) && (rc.right == right) &&
@@ -240,7 +240,7 @@
}
};
-class Window; // Forward declaration for Palette
+class Window; /* Forward declaration for Palette */
/**
* Colour palette management.
@@ -250,10 +250,10 @@
int size;
ColourPair *entries;
#if PLAT_GTK
- void *allocatedPalette; // GdkColor *
+ void *allocatedPalette; /* GdkColor * */
int allocatedLen;
#endif
- // Private so Palette objects can not be copied
+ /* Private so Palette objects can not be copied */
Palette(const Palette &) {}
Palette &operator=(const Palette &) { return *this; }
public:
@@ -286,7 +286,7 @@
#if PLAT_WX
int ascent;
#endif
- // Private so Font objects can not be copied
+ /* Private so Font objects can not be copied */
Font(const Font &) {}
Font &operator=(const Font &) { id=0; return *this; }
public:
@@ -298,7 +298,7 @@
virtual void Release();
FontID GetID() { return id; }
- // Alias another font - caller guarantees not to Release
+ /* Alias another font - caller guarantees not to Release */
void SetID(FontID id_) { id = id_; }
friend class Surface;
friend class SurfaceImpl;
@@ -309,7 +309,7 @@
*/
class Surface {
private:
- // Private so Surface objects can not be copied
+ /* Private so Surface objects can not be copied */
Surface(const Surface &) {}
Surface &operator=(const Surface &) { return *this; }
public:
@@ -475,13 +475,13 @@
public:
virtual ~DynamicLibrary() {};
- /// @return Pointer to function "name", or NULL on failure.
+ /** @return Pointer to function "name", or NULL on failure. */
virtual Function FindFunction(const char *name) = 0;
- /// @return true if the library was loaded successfully.
+ /** @return true if the library was loaded successfully. */
virtual bool IsValid() = 0;
- /// @return An instance of a DynamicLibrary subclass with "modulePath" loaded.
+ /** @return An instance of a DynamicLibrary subclass with "modulePath" loaded. */
static DynamicLibrary *Load(const char *modulePath);
};
@@ -490,12 +490,12 @@
* and chrome colour. Not a creatable object, more of a module with several functions.
*/
class Platform {
- // Private so Platform objects can not be copied
+ /* Private so Platform objects can not be copied */
Platform(const Platform &) {}
Platform &operator=(const Platform &) { return *this; }
public:
- // Should be private because no new Platforms are ever created
- // but gcc warns about this
+ /* Should be private because no new Platforms are ever created
+ * but gcc warns about this */
Platform() {}
~Platform() {}
static ColourDesired Chrome();
@@ -514,10 +514,10 @@
static int DBCSCharLength(int codePage, const char *s);
static int DBCSCharMaxLength();
- // These are utility functions not really tied to a platform
+ /* These are utility functions not really tied to a platform */
static int Minimum(int a, int b);
static int Maximum(int a, int b);
- // Next three assume 16 bit shorts and 32 bit longs
+ /* Next three assume 16 bit shorts and 32 bit longs */
static long LongFromTwoShorts(short a,short b) {
return (a) | ((b) << 16);
}
@@ -547,7 +547,7 @@
}
#endif
-// Shut up annoying Visual C++ warnings:
+/* Shut up annoying Visual C++ warnings: */
#ifdef _MSC_VER
#pragma warning(disable: 4244 4309 4514 4710)
#endif
Modified: trunk/scintilla/include/PropSet.h
===================================================================
--- trunk/scintilla/include/PropSet.h 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/scintilla/include/PropSet.h 2008-02-27 13:17:29 UTC (rev 2287)
@@ -1,9 +1,9 @@
-// Scintilla source code edit control
+/* Scintilla source code edit control */
/** @file PropSet.h
** A Java style properties file module.
**/
-// Copyright 1998-2002 by Neil Hodgson <neilh at scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2002 by Neil Hodgson <neilh at scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
#ifndef PROPSET_H
#define PROPSET_H
@@ -56,10 +56,10 @@
SString Expand(const char *withVars, int maxExpands=100) const;
int GetInt(const char *key, int defaultValue=0) const;
void Clear();
- char *ToString() const; // Caller must delete[] the return value
+ char *ToString() const; /* Caller must delete[] the return value */
private:
- // copy-value semantics not implemented
+ /* copy-value semantics not implemented */
PropSet(const PropSet ©);
void operator=(const PropSet &assign);
};
@@ -68,11 +68,11 @@
*/
class WordList {
public:
- // Each word contains at least one character - a empty word acts as sentinel at the end.
+ /* Each word contains at least one character - a empty word acts as sentinel at the end. */
char **words;
char *list;
int len;
- bool onlyLineEnds; ///< Delimited by any white space or only line ends
+ bool onlyLineEnds; /**< Delimited by any white space or only line ends */
bool sorted;
int starts[256];
WordList(bool onlyLineEnds_ = false) :
@@ -96,8 +96,8 @@
#endif
#ifdef _MSC_VER
-// Visual C++ doesn't like the private copy idiom for disabling
-// the default copy constructor and operator=, but it's fine.
+/* Visual C++ doesn't like the private copy idiom for disabling
+ * the default copy constructor and operator=, but it's fine. */
#pragma warning(disable: 4511 4512)
#endif
Modified: trunk/scintilla/include/SString.h
===================================================================
--- trunk/scintilla/include/SString.h 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/scintilla/include/SString.h 2008-02-27 13:17:29 UTC (rev 2287)
@@ -1,15 +1,15 @@
-// SciTE - Scintilla based Text Editor
+/* SciTE - Scintilla based Text Editor */
/** @file SString.h
** A simple string class.
**/
-// Copyright 1998-2004 by Neil Hodgson <neilh at scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2004 by Neil Hodgson <neilh at scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
#ifndef SSTRING_H
#define SSTRING_H
-// These functions are implemented because each platform calls them something different.
+/* These functions are implemented because each platform calls them something different. */
int CompareCaseInsensitive(const char *a, const char *b);
int CompareNCaseInsensitive(const char *a, const char *b, size_t len);
bool EqualCaseInsensitive(const char *a, const char *b);
@@ -18,9 +18,9 @@
namespace Scintilla {
#endif
-// Define another string class.
-// While it would be 'better' to use std::string, that doubles the executable size.
-// An SString may contain embedded nul characters.
+/* Define another string class.
+ * While it would be 'better' to use std::string, that doubles the executable size.
+ * An SString may contain embedded nul characters. */
/**
* Base class from which the two other classes (SBuffer & SString)
@@ -34,12 +34,12 @@
enum { measure_length=0xffffffffU};
protected:
- char *s; ///< The C string
- lenpos_t sSize; ///< The size of the buffer, less 1: ie. the maximum size of the string
+ char *s; /**< The C string */
+ lenpos_t sSize; /**< The size of the buffer, less 1: ie. the maximum size of the string */
SContainer() : s(0), sSize(0) {}
~SContainer() {
- delete []s; // Suppose it was allocated using StringAllocate
+ delete []s; /* Suppose it was allocated using StringAllocate */
s = 0;
sSize = 0;
}
@@ -64,8 +64,8 @@
* @return the pointer to the new string
*/
static char *StringAllocate(
- const char *s, ///< The string to duplicate
- lenpos_t len=measure_length); ///< The length of memory to allocate. Optional.
+ const char *s, /**< The string to duplicate */
+ lenpos_t len=measure_length); /**< The length of memory to allocate. Optional. */
};
@@ -92,14 +92,14 @@
}
}
private:
- /// Copy constructor
- // Here only to be on the safe size, user should avoid returning SBuffer values.
+ /** Copy constructor */
+ /* Here only to be on the safe size, user should avoid returning SBuffer values. */
SBuffer(const SBuffer &source) : SContainer() {
s = StringAllocate(source.s, source.sSize);
sSize = (s) ? source.sSize : 0;
}
- /// Default assignment operator
- // Same here, shouldn't be used
+ /** Default assignment operator */
+ /* Same here, shouldn't be used */
SBuffer &operator=(const SBuffer &source) {
if (this != &source) {
delete []s;
@@ -134,8 +134,8 @@
* functions to allow reliable manipulations of these strings, other than simple appends, etc.
*/
class SString : protected SContainer {
- lenpos_t sLen; ///< The size of the string in s
- lenpos_t sizeGrowth; ///< Minimum growth size when appending strings
+ lenpos_t sLen; /**< The size of the string in s */
+ lenpos_t sizeGrowth; /**< Minimum growth size when appending strings */
enum { sizeGrowthDefault = 64 };
bool grow(lenpos_t lenNew);
@@ -154,11 +154,11 @@
SString(SBuffer &buf) : sizeGrowth(sizeGrowthDefault) {
s = buf.ptr();
sSize = sLen = buf.size();
- // Consumes the given buffer!
+ /* Consumes the given buffer! */
buf.reset();
}
SString(const char *s_, lenpos_t first, lenpos_t last) : sizeGrowth(sizeGrowthDefault) {
- // note: expects the "last" argument to point one beyond the range end (a la STL iterators)
+ /* note: expects the "last" argument to point one beyond the range end (a la STL iterators) */
s = StringAllocate(s_ + first, last - first);
sSize = sLen = (s) ? last - first : 0;
}
@@ -246,7 +246,7 @@
void remove(lenpos_t pos, lenpos_t len);
SString &change(lenpos_t pos, char ch) {
- if (pos < sLen) { // character changed must be in string bounds
+ if (pos < sLen) { /* character changed must be in string bounds */
*(s + pos) = ch;
}
return *this;
@@ -276,8 +276,8 @@
* @return the pointer to the new string
*/
inline char *StringDup(
- const char *s, ///< The string to duplicate
- SContainer::lenpos_t len=SContainer::measure_length) ///< The length of memory to allocate. Optional.
+ const char *s, /**< The string to duplicate*/
+ SContainer::lenpos_t len=SContainer::measure_length) /**< The length of memory to allocate. Optional.*/
{
return SContainer::StringAllocate(s, len);
}
Modified: trunk/scintilla/include/SciLexer.h
===================================================================
--- trunk/scintilla/include/SciLexer.h 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/scintilla/include/SciLexer.h 2008-02-27 13:17:29 UTC (rev 2287)
@@ -1,19 +1,19 @@
-// Scintilla source code edit control
+/* Scintilla source code edit control */
/** @file SciLexer.h
** Interface to the added lexer functions in the SciLexer version of the edit control.
**/
-// Copyright 1998-2002 by Neil Hodgson <neilh at scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2002 by Neil Hodgson <neilh at scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
-// Most of this file is automatically generated from the Scintilla.iface interface definition
-// file which contains any comments about the definitions. HFacer.py does the generation.
+/* Most of this file is automatically generated from the Scintilla.iface interface definition
+ * file which contains any comments about the definitions. HFacer.py does the generation. */
#ifndef SCILEXER_H
#define SCILEXER_H
-// SciLexer features - not in standard Scintilla
+/* SciLexer features - not in standard Scintilla */
-//++Autogenerated -- start of section automatically generated from Scintilla.iface
+/*++Autogenerated -- start of section automatically generated from Scintilla.iface*/
#define SCLEX_CONTAINER 0
#define SCLEX_NULL 1
#define SCLEX_PYTHON 2
@@ -1206,6 +1206,6 @@
#define SCE_R_INFIXEOL 11
#define SCLEX_ASP 29
#define SCLEX_PHP 30
-//--Autogenerated -- end of section automatically generated from Scintilla.iface
+/*--Autogenerated -- end of section automatically generated from Scintilla.iface*/
#endif
Modified: trunk/scintilla/include/Scintilla.h
===================================================================
--- trunk/scintilla/include/Scintilla.h 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/scintilla/include/Scintilla.h 2008-02-27 13:17:29 UTC (rev 2287)
@@ -1,12 +1,12 @@
-// Scintilla source code edit control
+/* Scintilla source code edit control */
/** @file Scintilla.h
** Interface to the edit control.
**/
-// Copyright 1998-2003 by Neil Hodgson <neilh at scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2003 by Neil Hodgson <neilh at scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed.
-// Most of this file is automatically generated from the Scintilla.iface interface definition
-// file which contains any comments about the definitions. HFacer.py does the generation.
+ * Most of this file is automatically generated from the Scintilla.iface interface definition
+ * file which contains any comments about the definitions. HFacer.py does the generation. */
#ifndef SCINTILLA_H
#define SCINTILLA_H
@@ -16,15 +16,15 @@
#endif
#if PLAT_WIN
-// Return false on failure:
+/* Return false on failure: */
bool Scintilla_RegisterClasses(void *hInstance);
bool Scintilla_ReleaseResources();
#endif
int Scintilla_LinkLexers();
-// Here should be placed typedefs for uptr_t, an unsigned integer type large enough to
-// hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
-// May need to be changed for 64 bit platforms.
+/* Here should be placed typedefs for uptr_t, an unsigned integer type large enough to
+ * hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
+ * May need to be changed for 64 bit platforms. */
#if _MSC_VER >= 1300
#include <BaseTsd.h>
#endif
@@ -38,7 +38,7 @@
typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
-//++Autogenerated -- start of section automatically generated from Scintilla.iface
+/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
#define INVALID_POSITION -1
#define SCI_START 2000
#define SCI_OPTIONAL_START 3000
@@ -748,11 +748,11 @@
#define SCN_AUTOCSELECTION 2022
#define SCN_INDICATORCLICK 2023
#define SCN_INDICATORRELEASE 2024
-//--Autogenerated -- end of section automatically generated from Scintilla.iface
+/*--Autogenerated -- end of section automatically generated from Scintilla.iface */
-// These structures are defined to be exactly the same shape as the Win32
-// CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
-// So older code that treats Scintilla as a RichEdit will work.
+/* These structures are defined to be exactly the same shape as the Win32
+ * CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
+ * So older code that treats Scintilla as a RichEdit will work. */
#ifdef SCI_NAMESPACE
namespace Scintilla {
@@ -776,8 +776,8 @@
#ifdef PLATFORM_H
-// This structure is used in printing and requires some of the graphics types
-// from Platform.h. Not needed by most client code.
+/* This structure is used in printing and requires some of the graphics types
+ * from Platform.h. Not needed by most client code. */
struct RangeToFormat {
SurfaceID hdc;
@@ -790,9 +790,9 @@
#endif
struct NotifyHeader {
- // Compatible with Windows NMHDR.
- // hwndFrom is really an environment specific window handle or pointer
- // but most clients of Scintilla.h do not have this type visible.
+ /* Compatible with Windows NMHDR.
+ * hwndFrom is really an environment specific window handle or pointer
+ * but most clients of Scintilla.h do not have this type visible. */
void *hwndFrom;
uptr_t idFrom;
unsigned int code;
@@ -800,32 +800,32 @@
struct SCNotification {
struct NotifyHeader nmhdr;
- int position; // SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND
- int ch; // SCN_CHARADDED, SCN_KEY
- int modifiers; // SCN_KEY
- int modificationType; // SCN_MODIFIED
- const char *text; // SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION
- int length; // SCN_MODIFIED
- int linesAdded; // SCN_MODIFIED
- int message; // SCN_MACRORECORD
- uptr_t wParam; // SCN_MACRORECORD
- sptr_t lParam; // SCN_MACRORECORD
- int line; // SCN_MODIFIED
- int foldLevelNow; // SCN_MODIFIED
- int foldLevelPrev; // SCN_MODIFIED
- int margin; // SCN_MARGINCLICK
- int listType; // SCN_USERLISTSELECTION
- int x; // SCN_DWELLSTART, SCN_DWELLEND
- int y; // SCN_DWELLSTART, SCN_DWELLEND
+ int position; /* SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND */
+ int ch; /* SCN_CHARADDED, SCN_KEY */
+ int modifiers; /* SCN_KEY */
+ int modificationType; /* SCN_MODIFIED */
+ const char *text; /* SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION */
+ int length; /* SCN_MODIFIED */
+ int linesAdded; /* SCN_MODIFIED */
+ int message; /* SCN_MACRORECORD */
+ uptr_t wParam; /* SCN_MACRORECORDv */
+ sptr_t lParam; /* SCN_MACRORECORD */
+ int line; /* SCN_MODIFIED */
+ int foldLevelNow; /* SCN_MODIFIED */
+ int foldLevelPrev; /* SCN_MODIFIED */
+ int margin; /* SCN_MARGINCLICK */
+ int listType; /* SCN_USERLISTSELECTION */
+ int x; /* SCN_DWELLSTART, SCN_DWELLEND */
+ int y; /* SCN_DWELLSTART, SCN_DWELLEND */
};
#ifdef SCI_NAMESPACE
}
#endif
-// Deprecation section listing all API features that are deprecated and will
-// will be removed completely in a future version.
-// To enable these features define INCLUDE_DEPRECATED_FEATURES
+/* Deprecation section listing all API features that are deprecated and will
+ * will be removed completely in a future version.
+ * To enable these features define INCLUDE_DEPRECATED_FEATURES */
#ifdef INCLUDE_DEPRECATED_FEATURES
Modified: trunk/scintilla/include/ScintillaWidget.h
===================================================================
--- trunk/scintilla/include/ScintillaWidget.h 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/scintilla/include/ScintillaWidget.h 2008-02-27 13:17:29 UTC (rev 2287)
@@ -1,10 +1,10 @@
-// Scintilla source code edit control
+/* Scintilla source code edit control */
/** @file ScintillaWidget.h
** Definition of Scintilla widget for GTK+.
** Only needed by GTK+ code but is harmless on other platforms.
**/
-// Copyright 1998-2001 by Neil Hodgson <neilh at scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2001 by Neil Hodgson <neilh at scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
#ifndef SCINTILLAWIDGET_H
#define SCINTILLAWIDGET_H
Modified: trunk/scintilla/include/WindowAccessor.h
===================================================================
--- trunk/scintilla/include/WindowAccessor.h 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/scintilla/include/WindowAccessor.h 2008-02-27 13:17:29 UTC (rev 2287)
@@ -1,10 +1,10 @@
-// Scintilla source code edit control
+/* Scintilla source code edit control */
/** @file WindowAccessor.h
** Implementation of BufferAccess and StylingAccess on a Scintilla
** rapid easy access to contents of a Scintilla.
**/
-// Copyright 1998-2001 by Neil Hodgson <neilh at scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2001 by Neil Hodgson <neilh at scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
#ifdef SCI_NAMESPACE
namespace Scintilla {
@@ -13,7 +13,7 @@
/**
*/
class WindowAccessor : public Accessor {
- // Private so WindowAccessor objects can not be copied
+ /* Private so WindowAccessor objects can not be copied */
WindowAccessor(const WindowAccessor &source) : Accessor(), props(source.props) {}
WindowAccessor &operator=(const WindowAccessor &) { return *this; }
protected:
@@ -30,8 +30,8 @@
bool InternalIsLeadByte(char ch);
void Fill(int position);
public:
- WindowAccessor(WindowID id_, PropSet &props_) :
- Accessor(), id(id_), props(props_),
+ WindowAccessor(WindowID id_, PropSet &props_) :
+ Accessor(), id(id_), props(props_),
lenDoc(-1), validLen(0), chFlags(0), chWhile(0) {
}
~WindowAccessor();
@@ -44,8 +44,8 @@
void Flush();
int GetLineState(int line);
int SetLineState(int line, int state);
- int GetPropertyInt(const char *key, int defaultValue=0) {
- return props.GetInt(key, defaultValue);
+ int GetPropertyInt(const char *key, int defaultValue=0) {
+ return props.GetInt(key, defaultValue);
}
char *GetProperties() {
return props.ToString();
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/src/about.c 2008-02-27 13:17:29 UTC (rev 2287)
@@ -116,7 +116,7 @@
dialog = gtk_dialog_new();
- // configure dialog
+ /* configure dialog */
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(app->window));
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER_ON_PARENT);
gtk_window_set_title(GTK_WINDOW(dialog), _("About Geany"));
@@ -126,7 +126,7 @@
gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
g_signal_connect(G_OBJECT(dialog), "key-press-event", G_CALLBACK(gb_on_key_pressed), NULL);
- // create header
+ /* create header */
header_eventbox = gtk_event_box_new();
gtk_widget_show(header_eventbox);
header_hbox = gtk_hbox_new(FALSE, 12);
@@ -137,7 +137,7 @@
gtk_box_pack_start(GTK_BOX(header_hbox), header_image, FALSE,FALSE,0);
header_label = gtk_label_new(NULL);
gtk_label_set_use_markup(GTK_LABEL(header_label), TRUE);
- // print the subversion revision generated by ./configure if it is available
+ /* print the subversion revision generated by ./configure if it is available */
g_snprintf(buffer, sizeof(buffer), HEADER,
(utils_str_equal(REVISION, "-1")) ? "" : "svn >= " REVISION);
gtk_label_set_markup(GTK_LABEL(header_label), buffer);
@@ -149,19 +149,19 @@
g_signal_connect_after(G_OBJECT(header_label), "style_set", G_CALLBACK(header_label_style_set), NULL);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), header_eventbox, FALSE, FALSE, 0);
- // set image
+ /* set image */
icon = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO, FALSE);
gtk_image_set_from_pixbuf(GTK_IMAGE(header_image), icon);
gtk_window_set_icon(GTK_WINDOW(dialog), icon);
- g_object_unref(icon); // free our reference
+ g_object_unref(icon); /* free our reference */
- // create notebook
+ /* create notebook */
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
gtk_container_set_border_width(GTK_CONTAINER(notebook), 2);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), notebook, TRUE, TRUE, 0);
- // create "Info" tab
+ /* create "Info" tab */
info_box = gtk_vbox_new(FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(info_box), 6);
gtk_widget_show(info_box);
@@ -176,7 +176,7 @@
gtk_widget_show(label_info);
gtk_box_pack_start(GTK_BOX(info_box), label_info, FALSE, FALSE, 0);
- // Codename label
+ /* Codename label */
codename_label = gtk_label_new(NULL);
gtk_label_set_justify(GTK_LABEL(codename_label), GTK_JUSTIFY_CENTER);
gtk_label_set_selectable(GTK_LABEL(codename_label), TRUE);
@@ -186,7 +186,7 @@
gtk_widget_show(codename_label);
gtk_box_pack_start(GTK_BOX(info_box), codename_label, FALSE, FALSE, 0);
- // build date label
+ /* build date label */
builddate_label = gtk_label_new(NULL);
gtk_label_set_justify(GTK_LABEL(builddate_label), GTK_JUSTIFY_CENTER);
gtk_label_set_selectable(GTK_LABEL(builddate_label), TRUE);
@@ -211,7 +211,7 @@
gtk_widget_show(box);
gtk_box_pack_start(GTK_BOX(info_box), box, FALSE, FALSE, 10);
- // copyright label
+ /* copyright label */
cop_label = gtk_label_new(NULL);
gtk_label_set_justify(GTK_LABEL(cop_label), GTK_JUSTIFY_CENTER);
gtk_label_set_selectable(GTK_LABEL(cop_label), FALSE);
@@ -220,14 +220,14 @@
gtk_misc_set_padding(GTK_MISC(cop_label), 2, 10);
gtk_widget_show(cop_label);
gtk_box_pack_start(GTK_BOX(info_box), cop_label, FALSE, FALSE, 0);
- //gtk_container_add(GTK_CONTAINER(info_box), cop_label);
+ /*gtk_container_add(GTK_CONTAINER(info_box), cop_label); */
label = gtk_label_new(_("Info"));
gtk_widget_show(label);
gtk_widget_show_all(info_box);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), info_box, label);
- // create "Credits" tab
+ /* create "Credits" tab */
credits_scrollwin = gtk_scrolled_window_new(NULL, NULL);
gtk_container_set_border_width(GTK_CONTAINER(credits_scrollwin), 10);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(credits_scrollwin),
@@ -315,7 +315,7 @@
gtk_widget_show(label);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), credits_scrollwin, label);
- // create "License" tab
+ /* create "License" tab */
license_scrollwin = gtk_scrolled_window_new(NULL, NULL);
gtk_container_set_border_width(GTK_CONTAINER(license_scrollwin), 6);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(license_scrollwin),
Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/src/build.c 2008-02-27 13:17:29 UTC (rev 2287)
@@ -168,10 +168,10 @@
executable = utils_remove_ext_from_filename(doc_list[idx].file_name);
view_file = g_strconcat(executable, (mode == LATEX_CMD_VIEW_DVI) ? ".dvi" : ".pdf", NULL);
- // try convert in locale for stat()
+ /* try convert in locale for stat() */
locale_filename = utils_get_locale_from_utf8(view_file);
- // check wether view_file exists
+ /* check wether view_file exists */
if (g_stat(locale_filename, &st) != 0)
{
ui_set_statusbar(TRUE, _("Failed to view %s (make sure it is already compiled)"), view_file);
@@ -180,27 +180,27 @@
return (GPid) 1;
}
- // replace %f and %e in the run_cmd string
+ /* replace %f and %e in the run_cmd string */
cmd_string = g_strdup((mode == LATEX_CMD_VIEW_DVI) ?
g_strdup(doc_list[idx].file_type->programs->run_cmd) :
g_strdup(doc_list[idx].file_type->programs->run_cmd2));
cmd_string = utils_str_replace(cmd_string, "%f", view_file);
cmd_string = utils_str_replace(cmd_string, "%e", executable);
- // try convert in locale
+ /* try convert in locale */
locale_cmd_string = utils_get_locale_from_utf8(cmd_string);
/* get the terminal path */
locale_term_cmd = utils_get_locale_from_utf8(prefs.tools_term_cmd);
- // split the term_cmd, so arguments will work too
+ /* split the term_cmd, so arguments will work too */
term_argv = g_strsplit(locale_term_cmd, " ", -1);
term_argv_len = g_strv_length(term_argv);
- // check that terminal exists (to prevent misleading error messages)
+ /* check that terminal exists (to prevent misleading error messages) */
if (term_argv[0] != NULL)
{
gchar *tmp = term_argv[0];
- // g_find_program_in_path checks tmp exists and is executable
+ /* g_find_program_in_path checks tmp exists and is executable */
term_argv[0] = g_find_program_in_path(tmp);
g_free(tmp);
}
@@ -216,8 +216,9 @@
return (GPid) 1;
}
- // (RUN_SCRIPT_CMD should be ok in UTF8 without converting in locale because it contains no umlauts)
- working_dir = g_path_get_dirname(locale_filename); /// TODO do we need project support here?
+ /* RUN_SCRIPT_CMD should be ok in UTF8 without converting in locale because
+ * it contains no umlauts */
+ working_dir = g_path_get_dirname(locale_filename); /** TODO do we need project support here? */
script_name = g_build_filename(working_dir, RUN_SCRIPT_CMD, NULL);
if (! build_create_shellscript(script_name, locale_cmd_string, TRUE))
{
@@ -236,7 +237,7 @@
argv[i] = g_strdup(term_argv[i]);
}
#ifdef G_OS_WIN32
- // command line arguments only for cmd.exe
+ /* command line arguments only for cmd.exe */
if (strstr(argv[0], "cmd.exe") != NULL)
{
argv[term_argv_len ] = g_strdup("/Q /C");
@@ -271,7 +272,7 @@
if (run_info.pid > 0)
{
- //setpgid(0, getppid());
+ /*setpgid(0, getppid());*/
g_child_watch_add(run_info.pid, (GChildWatchFunc) run_exit_cb, NULL);
build_menu_update(idx);
}
@@ -285,7 +286,7 @@
}
-// get curfile.o in locale encoding from document::file_name
+/* get curfile.o in locale encoding from document::file_name */
static gchar *get_object_filename(gint idx)
{
gchar *locale_filename, *short_file, *noext, *object_file;
@@ -333,14 +334,14 @@
g_string_append(cmdstr, build_info.custom_target);
dir = project_get_make_dir();
}
- else // GBO_MAKE_ALL
+ else /* GBO_MAKE_ALL */
{
build_info.type = GBO_MAKE_ALL;
g_string_append(cmdstr, "all");
dir = project_get_make_dir();
}
- pid = build_spawn_cmd(idx, cmdstr->str, dir); // if dir is NULL, idx filename is used
+ pid = build_spawn_cmd(idx, cmdstr->str, dir); /* if dir is NULL, idx filename is used */
g_free(dir);
g_string_free(cmdstr, TRUE);
return pid;
@@ -373,7 +374,7 @@
locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name);
executable = utils_remove_ext_from_filename(locale_filename);
- // check for filename extension and abort if filename doesn't have one
+ /* check for filename extension and abort if filename doesn't have one */
if (utils_str_equal(locale_filename, executable))
{
ui_set_statusbar(TRUE, _("Command stopped because the current file has no extension."));
@@ -384,15 +385,15 @@
object_file = g_strdup_printf("%s.o", executable);
- // check wether object file (file.o) exists
+ /* check wether object file (file.o) exists */
if (g_stat(object_file, &st) == 0)
- { // check wether src is newer than object file
+ { /* check wether src is newer than object file */
if (g_stat(locale_filename, &st2) == 0)
{
if (st2.st_mtime > st.st_mtime)
{
- // set object_file to NULL, so the source file will be used for linking,
- // more precisely then we compile and link instead of just linking
+ /* set object_file to NULL, so the source file will be used for linking,
+ * more precisely then we compile and link instead of just linking */
g_free(object_file);
object_file = NULL;
}
@@ -409,9 +410,9 @@
g_string_append_c(cmdstr, ' ');
if (doc_list[idx].file_type->id == GEANY_FILETYPES_D)
- { // the dmd compiler needs -of instead of -o and it accepts no whitespace after -of
+ { /* the dmd compiler needs -of instead of -o and it accepts no whitespace after -of */
gchar *tmp = g_path_get_basename(executable);
- // add double quotes around the executable file name in case of filenames with spaces
+ /* add double quotes around the executable file name in case of filenames with spaces */
g_string_append(cmdstr, "-of \"");
g_string_append(cmdstr, tmp);
g_string_append_c(cmdstr, '\"');
@@ -420,7 +421,7 @@
else
{
gchar *tmp = g_path_get_basename(executable);
- // add double quotes around the executable file name in case of filenames with spaces
+ /* add double quotes around the executable file name in case of filenames with spaces */
g_string_append(cmdstr, "-o \"");
g_string_append(cmdstr, tmp);
g_string_append_c(cmdstr, '\"');
@@ -514,7 +515,7 @@
executable = utils_remove_ext_from_filename(locale_filename);
cmd_string = g_strdup(cmd);
- // replace %f and %e in the command string
+ /* replace %f and %e in the command string */
tmp = g_path_get_basename(locale_filename);
cmd_string = utils_str_replace(cmd_string, "%f", tmp);
g_free(tmp);
@@ -524,12 +525,12 @@
g_free(executable);
#ifdef G_OS_WIN32
- // due to g_shell_parse_argv() we need to enclose the command(first element) of cmd_string with
- // "" if the command contains a full path(i.e. backslashes) otherwise the backslashes will be
- // eaten by g_shell_parse_argv().
+ /* due to g_shell_parse_argv() we need to enclose the command(first element) of cmd_string with
+ * "" if the command contains a full path(i.e. backslashes) otherwise the backslashes will be
+ * eaten by g_shell_parse_argv(). */
setptr(cmd_string, quote_executable(cmd_string));
if (! g_shell_parse_argv(cmd_string, NULL, &argv, NULL))
- // if automatic parsing failed, fall back to simple, unsafe argv creation
+ /* if automatic parsing failed, fall back to simple, unsafe argv creation */
argv = g_strsplit(cmd_string, " ", 0);
#else
argv = g_new0(gchar *, 4);
@@ -550,7 +551,7 @@
g_free(utf8_working_dir);
g_free(utf8_cmd_string);
- // set the build info for the message window
+ /* set the build info for the message window */
g_free(build_info.dir);
build_info.dir = g_strdup(working_dir);
build_info.file_type_id = FILETYPE_ID(doc_list[idx].file_type);
@@ -574,7 +575,7 @@
build_menu_update(idx);
}
- // use GIOChannels to monitor stdout and stderr
+ /* use GIOChannels to monitor stdout and stderr */
utils_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL,
TRUE, build_iofunc, GINT_TO_POINTER(0));
utils_set_up_io_channel(stderr_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL,
@@ -606,15 +607,15 @@
{
gchar *check_executable = NULL;
- // add .class extension for JAVA source files (only for stat)
+ /* add .class extension for JAVA source files (only for stat) */
if (ft_id == GEANY_FILETYPES_JAVA)
{
#ifdef G_OS_WIN32
gchar *tmp;
- // there is already the extension .exe, so first remove it and then add .class
+ /* there is already the extension .exe, so first remove it and then add .class */
tmp = utils_remove_ext_from_filename(long_executable);
check_executable = g_strconcat(tmp, ".class", NULL);
- // store the filename without "exe" extension for Java, tmp will be freed by setptr
+ /* store the filename without "exe" extension for Java, tmp will be freed by setptr */
setptr(long_executable, tmp);
#else
check_executable = g_strconcat(long_executable, ".class", NULL);
@@ -623,7 +624,7 @@
else
check_executable = g_strdup(long_executable);
- // check for filename extension and abort if filename doesn't have one
+ /* check for filename extension and abort if filename doesn't have one */
if (utils_str_equal(locale_filename, check_executable))
{
ui_set_statusbar(TRUE, _("Command stopped because the current file has no extension."));
@@ -632,7 +633,7 @@
return NULL;
}
- // check whether executable exists
+ /* check whether executable exists */
if (g_stat(check_executable, &st) != 0)
{
gchar *utf8_check_executable = utils_get_utf8_from_locale(check_executable);
@@ -646,7 +647,7 @@
g_free(check_executable);
}
- // remove path
+ /* remove path */
setptr(long_executable, g_path_get_basename(long_executable));
return long_executable;
}
@@ -679,7 +680,7 @@
project->run_cmd :
ft->programs->run_cmd;
- // only check for existing executable, if executable is required by %e
+ /* only check for existing executable, if executable is required by %e */
check_exists = (strstr(cmd, "%e") != NULL);
executable = get_build_executable(locale_filename, check_exists, FILETYPE_ID(ft));
if (executable == NULL)
@@ -697,9 +698,9 @@
else
working_dir = g_path_get_dirname(locale_filename);
- // only test whether working dir exists, don't change it or else Windows support will break
- // (gspawn-win32-helper.exe is used by GLib and must be in $PATH which means current working
- // dir where geany.exe was started from, so we can't change it)
+ /* only test whether working dir exists, don't change it or else Windows support will break
+ * (gspawn-win32-helper.exe is used by GLib and must be in $PATH which means current working
+ * dir where geany.exe was started from, so we can't change it) */
if (! g_file_test(working_dir, G_FILE_TEST_EXISTS) ||
! g_file_test(working_dir, G_FILE_TEST_IS_DIR))
{
@@ -710,7 +711,7 @@
return NULL;
}
- // replace %f and %e in the run_cmd string
+ /* replace %f and %e in the run_cmd string */
cmd = g_strdup(cmd);
tmp = g_path_get_basename(locale_filename);
cmd = utils_str_replace(cmd, "%f", tmp);
@@ -729,12 +730,13 @@
return working_dir;
}
else
- // don't wait for user input at the end of script when we are running in VTE
+ /* don't wait for user input at the end of script when we are running in VTE */
autoclose = TRUE;
}
#endif
- // (RUN_SCRIPT_CMD should be ok in UTF8 without converting in locale because it contains no umlauts)
+ /* RUN_SCRIPT_CMD should be ok in UTF8 without converting in locale because it
+ * contains no umlauts */
tmp = g_build_filename(working_dir, RUN_SCRIPT_CMD, NULL);
result = build_create_shellscript(tmp, cmd, autoclose);
if (! result)
@@ -788,11 +790,11 @@
else
vte_cmd = g_strconcat(RUN_SCRIPT_CMD, "\n", NULL);
- // change into current directory if it is not done by default or we have a project and
- // project run command(working_dir is already set accordingly)
+ /* change into current directory if it is not done by default or we have a project and
+ * project run command(working_dir is already set accordingly) */
if (! vc->follow_path || (project != NULL && NZV(project->run_cmd)))
{
- // we need to convert the working_dir back to UTF-8 because the VTE expects it
+ /* we need to convert the working_dir back to UTF-8 because the VTE expects it */
gchar *utf8_working_dir = utils_get_utf8_from_locale(working_dir);
vte_cwd(utf8_working_dir, TRUE);
g_free(utf8_working_dir);
@@ -801,7 +803,7 @@
ui_set_statusbar(FALSE,
_("Could not execute the file in the VTE because it probably contains a command."));
- // show the VTE
+ /* show the VTE */
gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_VTE);
gtk_widget_grab_focus(vc->vte);
msgwin_show_hide(TRUE);
@@ -820,15 +822,15 @@
/* get the terminal path */
locale_term_cmd = utils_get_locale_from_utf8(prefs.tools_term_cmd);
- // split the term_cmd, so arguments will work too
+ /* split the term_cmd, so arguments will work too */
term_argv = g_strsplit(locale_term_cmd, " ", -1);
term_argv_len = g_strv_length(term_argv);
- // check that terminal exists (to prevent misleading error messages)
+ /* check that terminal exists (to prevent misleading error messages) */
if (term_argv[0] != NULL)
{
gchar *tmp = term_argv[0];
- // g_find_program_in_path checks whether tmp exists and is executable
+ /* g_find_program_in_path checks whether tmp exists and is executable */
term_argv[0] = g_find_program_in_path(tmp);
g_free(tmp);
}
@@ -847,7 +849,7 @@
argv[i] = g_strdup(term_argv[i]);
}
#ifdef G_OS_WIN32
- // command line arguments only for cmd.exe
+ /* command line arguments only for cmd.exe */
if (strstr(argv[0], "cmd.exe") != NULL)
{
argv[term_argv_len ] = g_strdup("/Q /C");
@@ -895,12 +897,12 @@
{
if (cond & (G_IO_IN | G_IO_PRI))
{
- //GIOStatus s;
+ /*GIOStatus s;*/
gchar *msg;
while (g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL) && msg)
{
- //if (s != G_IO_STATUS_NORMAL && s != G_IO_STATUS_EOF) break;
+ /*if (s != G_IO_STATUS_NORMAL && s != G_IO_STATUS_EOF) break;*/
gint color;
gchar *tmp;
@@ -923,8 +925,8 @@
{
gint idx = document_find_by_filename(filename, FALSE);
- document_set_indicator(idx, line - 1); // will check valid idx
- color = COLOR_RED; // error message parsed on the line
+ document_set_indicator(idx, line - 1); /* will check valid idx */
+ color = COLOR_RED; /* error message parsed on the line */
}
g_free(filename);
}
@@ -954,7 +956,7 @@
gsize len;
gchar *input;
- // get the start of the path
+ /* get the start of the path */
pos = strstr(string, "/");
if (pos == NULL)
@@ -962,10 +964,10 @@
input = g_strdup(pos);
- // kill the ' at the end of the path
+ /* kill the ' at the end of the path */
len = strlen(input);
input[len - 1] = '\0';
- input = g_realloc(input, len); // shorten by 1
+ input = g_realloc(input, len); /* shorten by 1 */
*prefix = input;
return TRUE;
@@ -983,7 +985,7 @@
{
msg = _("Compilation failed.");
msgwin_compiler_add(COLOR_DARK_RED, msg);
- // If msgwindow is hidden, user will want to display it to see the error
+ /* If msgwindow is hidden, user will want to display it to see the error */
if (! ui_prefs.msgwindow_visible)
{
gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER);
@@ -1016,18 +1018,19 @@
}
else if (WIFSIGNALED(status))
{
- // the terminating signal: WTERMSIG (status));
+ /* the terminating signal: WTERMSIG (status)); */
failure = TRUE;
}
else
- { // any other failure occured
+ { /* any other failure occured */
failure = TRUE;
}
show_build_result_message(failure);
#else
DWORD exit_code;
GetExitCodeProcess(child_pid, &exit_code);
- // not sure whether the cast to int is necessary, no idea what DWORD really is (seems like int)
+ /* not sure whether the cast to int is necessary, no idea what DWORD really is
+ * (seems to be similar to an int) */
show_build_result_message((int) exit_code);
#endif
@@ -1035,7 +1038,7 @@
g_spawn_close_pid(child_pid);
build_info.pid = 0;
- // enable build items again
+ /* enable build items again */
build_menu_update(-1);
}
@@ -1045,13 +1048,13 @@
g_spawn_close_pid(child_pid);
run_info.pid = 0;
- // reset the stop button and menu item to the original meaning
+ /* reset the stop button and menu item to the original meaning */
build_menu_update(-1);
}
-// write a little shellscript to call the executable (similar to anjuta_launcher but "internal")
-// fname is the full file name (including path) for the script to create
+/* write a little shellscript to call the executable (similar to anjuta_launcher but "internal")
+ * fname is the full file name (including path) for the script to create */
static gboolean build_create_shellscript(const gchar *fname, const gchar *cmd, gboolean autoclose)
{
FILE *fp;
@@ -1097,7 +1100,7 @@
menu = gtk_menu_new();
- // compile the code
+ /* compile the code */
item = gtk_image_menu_item_new_with_mnemonic(_("_Compile"));
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
@@ -1109,7 +1112,7 @@
g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_compile_activate), NULL);
menu_items->item_compile = item;
- // build the code
+ /* build the code */
item = gtk_image_menu_item_new_with_mnemonic(_("_Build"));
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
@@ -1123,7 +1126,7 @@
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
- // build the code with make all
+ /* build the code with make all */
item = gtk_image_menu_item_new_with_mnemonic(_("_Make All"));
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
@@ -1134,7 +1137,7 @@
GINT_TO_POINTER(GBO_MAKE_ALL));
menu_items->item_make_all = item;
- // build the code with make custom
+ /* build the code with make custom */
item = gtk_image_menu_item_new_with_mnemonic(_("Make Custom _Target"));
gtk_widget_show(item);
GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKEOWNTARGET, item);
@@ -1145,7 +1148,7 @@
GINT_TO_POINTER(GBO_MAKE_CUSTOM));
menu_items->item_make_custom = item;
- // build the code with make object
+ /* build the code with make object */
item = gtk_image_menu_item_new_with_mnemonic(_("Make _Object"));
gtk_widget_show(item);
GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKEOBJECT, item);
@@ -1160,7 +1163,7 @@
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
- // next error
+ /* next error */
item = gtk_image_menu_item_new_with_mnemonic(_("_Next Error"));
gtk_widget_show(item);
GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_NEXTERROR, item);
@@ -1172,7 +1175,7 @@
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
- // execute the code
+ /* execute the code */
item = gtk_image_menu_item_new_from_stock("gtk-execute", accel_group);
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
@@ -1186,7 +1189,7 @@
gtk_container_add(GTK_CONTAINER(menu), separator);
gtk_widget_set_sensitive(separator, FALSE);
- // arguments
+ /* arguments */
item = gtk_image_menu_item_new_with_mnemonic(_("_Set Includes and Arguments"));
gtk_widget_show(item);
GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_OPTIONS, item);
@@ -1201,7 +1204,7 @@
menu_items->item_set_args = item;
menu_items->menu = menu;
- g_object_ref((gpointer)menu_items->menu); // to hold it after removing
+ g_object_ref((gpointer)menu_items->menu); /* to hold it after removing */
}
@@ -1213,7 +1216,7 @@
menu = gtk_menu_new();
- // DVI
+ /* DVI */
item = gtk_image_menu_item_new_with_mnemonic(_("LaTeX -> DVI"));
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
@@ -1226,7 +1229,7 @@
G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(LATEX_CMD_TO_DVI));
menu_items->item_compile = item;
- // PDF
+ /* PDF */
item = gtk_image_menu_item_new_with_mnemonic(_("LaTeX -> PDF"));
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
@@ -1243,7 +1246,7 @@
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
- // build the code with make all
+ /* build the code with make all */
item = gtk_image_menu_item_new_with_mnemonic(_("_Make All"));
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
@@ -1254,7 +1257,7 @@
GINT_TO_POINTER(GBO_MAKE_ALL));
menu_items->item_make_all = item;
- // build the code with make custom
+ /* build the code with make custom */
item = gtk_image_menu_item_new_with_mnemonic(_("Make Custom _Target"));
gtk_widget_show(item);
GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKEOWNTARGET, item);
@@ -1269,7 +1272,7 @@
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
- // next error
+ /* next error */
item = gtk_image_menu_item_new_with_mnemonic(_("_Next Error"));
gtk_widget_show(item);
GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_NEXTERROR, item);
@@ -1281,8 +1284,8 @@
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
- // DVI view
-#define LATEX_VIEW_DVI_LABEL _("View DVI File") // used later again
+ /* DVI view */
+#define LATEX_VIEW_DVI_LABEL _("View DVI File") /* used later again */
item = gtk_image_menu_item_new_with_mnemonic(LATEX_VIEW_DVI_LABEL);
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
@@ -1295,7 +1298,7 @@
G_CALLBACK(on_build_execute_activate), GINT_TO_POINTER(LATEX_CMD_VIEW_DVI));
menu_items->item_exec = item;
- // PDF view
+ /* PDF view */
item = gtk_image_menu_item_new_with_mnemonic(_("View PDF File"));
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(menu), item);
@@ -1308,13 +1311,13 @@
G_CALLBACK(on_build_execute_activate), GINT_TO_POINTER(LATEX_CMD_VIEW_PDF));
menu_items->item_exec2 = item;
- // separator
+ /* separator */
separator = gtk_separator_menu_item_new();
gtk_widget_show(separator);
gtk_container_add(GTK_CONTAINER(menu), separator);
gtk_widget_set_sensitive(separator, FALSE);
- // arguments
+ /* arguments */
item = gtk_image_menu_item_new_with_mnemonic(_("Set Arguments"));
gtk_widget_show(item);
GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_OPTIONS, item);
@@ -1331,7 +1334,7 @@
gtk_window_add_accel_group(GTK_WINDOW(app->window), accel_group);
menu_items->menu = menu;
- g_object_ref((gpointer)menu_items->menu); // to hold it after removing
+ g_object_ref((gpointer)menu_items->menu); /* to hold it after removing */
}
@@ -1409,7 +1412,7 @@
gtk_table_set_row_spacings(GTK_TABLE(table), 6);
gtk_container_add(GTK_CONTAINER(vbox), table);
- // LaTeX -> DVI args
+ /* LaTeX -> DVI args */
if (ft->programs->compiler != NULL && ft->actions->can_compile)
{
label = gtk_label_new(_("DVI creation:"));
@@ -1428,7 +1431,7 @@
gtk_widget_ref(entries[0]), (GDestroyNotify)gtk_widget_unref);
}
- // LaTeX -> PDF args
+ /* LaTeX -> PDF args */
if (ft->programs->linker != NULL && ft->actions->can_link)
{
label = gtk_label_new(_("PDF creation:"));
@@ -1447,7 +1450,7 @@
gtk_widget_ref(entries[1]), (GDestroyNotify)gtk_widget_unref);
}
- // View LaTeX -> DVI args
+ /* View LaTeX -> DVI args */
if (ft->programs->run_cmd != NULL)
{
label = gtk_label_new(_("DVI preview:"));
@@ -1466,7 +1469,7 @@
gtk_widget_ref(entries[2]), (GDestroyNotify)gtk_widget_unref);
}
- // View LaTeX -> PDF args
+ /* View LaTeX -> PDF args */
if (ft->programs->run_cmd2 != NULL)
{
label = gtk_label_new(_("PDF preview:"));
@@ -1491,9 +1494,9 @@
gtk_container_add(GTK_CONTAINER(vbox), label);
gtk_widget_show_all(dialog);
- // run modally to prevent user changing idx filetype
+ /* run modally to prevent user changing idx filetype */
response = gtk_dialog_run(GTK_DIALOG(dialog));
- // call the callback manually
+ /* call the callback manually */
on_includes_arguments_tex_dialog_response(GTK_DIALOG(dialog), response, ft);
gtk_widget_destroy(dialog);
@@ -1577,7 +1580,7 @@
if (ft->actions->can_compile || ft->actions->can_link || ft->actions->can_exec)
{
GtkWidget *align, *frame;
- // in-dialog heading for the "Set Includes and Arguments" dialog
+ /* in-dialog heading for the "Set Includes and Arguments" dialog */
gchar *frame_title = g_strdup_printf(_("%s commands"), ft->title);
frame = ui_frame_new_with_alignment(frame_title, &align);
@@ -1590,7 +1593,7 @@
row = 0;
}
- // include-args
+ /* include-args */
if (ft->actions->can_compile)
{
label = gtk_label_new(_("Compile:"));
@@ -1611,7 +1614,7 @@
gtk_widget_ref(entries[0]), (GDestroyNotify)gtk_widget_unref);
}
- // lib-args
+ /* lib-args */
if (ft->actions->can_link)
{
label = gtk_label_new(_("Build:"));
@@ -1632,7 +1635,7 @@
gtk_widget_ref(entries[1]), (GDestroyNotify)gtk_widget_unref);
}
- // program-args
+ /* program-args */
if (ft->actions->can_exec)
{
label = gtk_label_new(_("Execute:"));
@@ -1652,7 +1655,7 @@
g_object_set_data_full(G_OBJECT(dialog), "includes_entry3",
gtk_widget_ref(entries[2]), (GDestroyNotify)gtk_widget_unref);
- // disable the run command if there is a valid project run command set
+ /* disable the run command if there is a valid project run command set */
if (app->project && NZV(app->project->run_cmd))
gtk_widget_set_sensitive(entries[2], FALSE);
}
@@ -1663,9 +1666,9 @@
gtk_container_add(GTK_CONTAINER(vbox), label);
gtk_widget_show_all(dialog);
- // run modally to prevent user changing idx filetype
+ /* run modally to prevent user changing idx filetype */
response = gtk_dialog_run(GTK_DIALOG(dialog));
- // call the callback manually
+ /* call the callback manually */
on_includes_arguments_dialog_response(GTK_DIALOG(dialog), response, ft);
gtk_widget_destroy(dialog);
@@ -1691,7 +1694,7 @@
{
ext = strrchr(fname, '.');
}
- return (ext == NULL) ? FALSE : (*(ext + 1) == 'h'); // match *.h*
+ return (ext == NULL) ? FALSE : (*(ext + 1) == 'h'); /* match *.h* */
}
@@ -1731,7 +1734,7 @@
can_make = have_path && build_info.pid <= (GPid) 1;
- // disable compile and link for C/C++ header files
+ /* disable compile and link for C/C++ header files */
if (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP)
can_build = can_make && ! is_c_header(doc_list[idx].file_name);
else
@@ -1749,7 +1752,7 @@
gtk_widget_set_sensitive(menu_items->item_make_object, can_make);
if (app->project && NZV(app->project->run_cmd))
- can_run = have_path; // for now run is disabled for all untitled files
+ can_run = have_path; /* for now run is disabled for all untitled files */
else
can_run = have_path && ft->actions->can_exec;
@@ -1774,10 +1777,10 @@
gtk_widget_set_sensitive(widgets.compile_button, can_build && ft->actions->can_compile);
gtk_widget_set_sensitive(widgets.run_button, can_run || can_stop);
- // show the stop command if a program is running, otherwise show run command
+ /* show the stop command if a program is running, otherwise show run command */
set_stop_button(can_stop);
- // simply enable next error command if the compiler window has any items
+ /* simply enable next error command if the compiler window has any items */
have_errors = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(msgwindow.store_compiler),
NULL) > 0;
if (menu_items->item_next_error)
@@ -1785,7 +1788,7 @@
}
-// Call build_menu_update() instead of calling this directly.
+/* Call build_menu_update() instead of calling this directly. */
static void set_stop_button(gboolean stop)
{
GtkStockItem sitem;
@@ -1797,7 +1800,7 @@
if (! stop && utils_str_equal(
gtk_tool_button_get_stock_id(GTK_TOOL_BUTTON(widgets.run_button)), "gtk-execute")) return;
- // use the run button also as stop button
+ /* use the run button also as stop button */
if (stop)
{
gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(widgets.run_button), "gtk-stop");
@@ -1817,7 +1820,7 @@
if (menuitem != NULL)
{
- // LaTeX hacks ;-(
+ /* LaTeX hacks ;-( */
if (run_info.file_type_id == GEANY_FILETYPES_LATEX)
{
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem),
@@ -1945,7 +1948,7 @@
static void
show_make_custom(void)
{
- static GtkWidget *dialog = NULL; // keep dialog for combo history
+ static GtkWidget *dialog = NULL; /* keep dialog for combo history */
if (! dialog)
dialog = dialogs_show_input(_("Make Custom Target"),
@@ -1976,7 +1979,7 @@
}
case GBO_MAKE_OBJECT:
- // fall through
+ /* fall through */
case GBO_MAKE_ALL:
{
if (doc_list[idx].changed) document_save_file(idx, FALSE);
@@ -1992,13 +1995,13 @@
gboolean use_builtin = FALSE;
if (ft->id == GEANY_FILETYPES_HTML)
{
- // we have a project, check its run_cmd
+ /* we have a project, check its run_cmd */
if (app->project != NULL)
{
if (utils_str_equal(app->project->run_cmd, "builtin"))
use_builtin = TRUE;
}
- // no project, check for filetype run_cmd
+ /* no project, check for filetype run_cmd */
else if (ft->actions->can_exec && utils_str_equal(ft->programs->run_cmd, "builtin"))
use_builtin = TRUE;
}
@@ -2026,7 +2029,7 @@
if (! DOC_IDX_VALID(idx))
return;
- // make the process "stopable"
+ /* make the process "stopable" */
if (run_info.pid > (GPid) 1)
{
kill_process(&run_info.pid);
@@ -2036,17 +2039,17 @@
ft_id = FILETYPE_ID(doc_list[idx].file_type);
ft = filetypes[ft_id];
if (ft_id == GEANY_FILETYPES_LATEX)
- { // run LaTeX file
+ { /* run LaTeX file */
if (build_view_tex_file(idx, GPOINTER_TO_INT(user_data)) == (GPid) 0)
{
ui_set_statusbar(TRUE, _("Failed to execute the view program"));
}
}
- // use_html_builtin() checks for HTML builtin request and returns FALSE if not
+ /* use_html_builtin() checks for HTML builtin request and returns FALSE if not */
else if (! use_html_builtin(idx, ft))
- { // run everything else
+ { /* run everything else */
- // save the file only if the run command uses it
+ /* save the file only if the run command uses it */
if (doc_list[idx].changed &&
strstr(ft->programs->run_cmd, "%f") != NULL)
document_save_file(idx, FALSE);
@@ -2070,8 +2073,8 @@
#ifdef G_OS_WIN32
g_return_if_fail(*pid != NULL);
result = TerminateProcess(*pid, 0);
- // TerminateProcess() returns TRUE on success, for the check below we have to convert
- // it to FALSE (and vice versa)
+ /* TerminateProcess() returns TRUE on success, for the check below we have to convert
+ * it to FALSE (and vice versa) */
result = ! result;
#else
g_return_if_fail(*pid > 1);
Modified: trunk/src/build.h
===================================================================
--- trunk/src/build.h 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/src/build.h 2008-02-27 13:17:29 UTC (rev 2287)
@@ -25,7 +25,7 @@
#ifndef GEANY_BUILD_H
#define GEANY_BUILD_H 1
-typedef enum // Geany Build Options
+typedef enum /* Geany Build Options */
{
GBO_COMPILE,
GBO_BUILD,
@@ -36,8 +36,8 @@
typedef struct BuildInfo
{
- build_type type; // current action(one of the above enumeration)
- GPid pid; // process id of the spawned process
+ build_type type; /* current action(one of the above enumeration) */
+ GPid pid; /* process id of the spawned process */
gchar *dir;
guint file_type_id;
gchar *custom_target;
Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c 2008-02-26 17:11:49 UTC (rev 2286)
+++ trunk/src/callbacks.c 2008-02-27 13:17:29 UTC (rev 2287)
@@ -75,20 +75,20 @@
#endif
-// represents the state while closing all tabs(used to prevent notebook switch page signals)
+/* represents the state while closing all tabs(used to prevent notebook switch page signals) */
static gboolean closing_all = FALSE;
-// flag to indicate the explicit change of a toggle button of the toolbar menu and so the
-// toggled callback should ignore the change since it is not triggered by the user
+/* flag to indicate the explicit change of a toggle button of the toolbar menu and so the
+ * toggled callback should ignore the change since it is not triggered by the user */
static gboolean ignore_toolbar_toggle = FALSE;
-// flag to indicate that an insert callback was triggered from the file menu,
-// so we need to store the current cursor position in editor_info.click_pos.
+/* flag to indicate that an insert callback was triggered from the file menu,
+ * so we need to store the current cursor position in editor_info.click_pos. */
static gboolean insert_callback_from_menu = FALSE;
-// represents the state at switching a notebook page(in the left treeviews widget), to not emit
-// the selection-changed signal from tv.tree_openfiles
-//static gboolean switch_tv_notebook_page = FALSE;
+/* represents the state at switching a notebook page(in the left treeviews widget), to not emit
+ * the selection-changed signal from tv.tree_openfiles */
+/*static gboolean switch_tv_notebook_page = FALSE; */
CallbacksData callbacks_data = {-1};
@@ -104,7 +104,7 @@
return FALSE;
}
}
- return TRUE; // no unsaved edits
+ return TRUE; /* no unsaved edits */
}
@@ -126,8 +126,8 @@
}
-// set editor_info.click_pos to the current cursor position if insert_callback_from_menu is TRUE
-// to prevent invalid cursor positions which can cause segfaults
+/* set editor_info.click_pos to the current cursor position if insert_callback_from_menu is TRUE
+ * to prevent invalid cursor positions which can cause segfaults */
static void verify_click_pos(gint idx)
{
if (insert_callback_from_menu)
@@ -138,14 +138,14 @@
}
-// should only be called from on_exit_clicked
+/* should only be called from on_exit_clicked */
static void quit_app(void)
{
guint i;
configuration_save();
- // ignore changes for all tabs (already asked user in on_exit_clicked)
+ /* ignore changes for all tabs (already asked user in on_exit_clicked) */
for (i = 0; i < doc_array->len; i++)
{
if (doc_list[i].is_valid && doc_list[i].changed)
@@ -154,7 +154,7 @@
}
}
if (app->project != NULL)
- project_close(FALSE); // save project session files
+ project_close(FALSE); /* save project session files */
on_close_all1_activate(NULL, NULL);
@@ -162,7 +162,7 @@
}
-// wrapper function to abort exit process if cancel button is pressed
+/* wrapper function to abort exit process if cancel button is pressed */
gboolean
on_exit_clicked (GtkWidget *widget, gpointer gdata)
{
@@ -234,7 +234,7 @@
gint i, idx, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook));
gint cur_idx = document_get_cur_idx();
- document_delay_colourise(); // avoid recolourising all C files after each save
+ document_delay_colourise(); /* avoid recolourising all C files after each save */
for (i = 0; i < max; i++)
{
@@ -242,7 +242,7 @@
if (! doc_list[idx].changed) continue;
if (doc_list[idx].file_name == NULL)
{
- // display unnamed document
+ /* display unnamed document */
gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook),
document_get_notebook_page(idx));
dialogs_show_save_as();
@@ -274,7 +274,7 @@
}
closing_all = FALSE;
tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE);
- // if cancel is clicked, cancel the complete exit process
+ /* if cancel is clicked, cancel the complete exit process */
return ret;
}
@@ -303,15 +303,15 @@
gtk_widget_set_sensitive(ui_widgets.recent_files_menuitem,
g_queue_get_length(ui_prefs.recent_queue) > 0);
#if GTK_CHECK_VERSION(2, 10, 0)
- // hide Page setup when GTK printing is not used
- // (on GTK < 2.10 the menu item is hidden completely)
+ /* hide Page setup when GTK printing is not used
+ * (on GTK < 2.10 the menu item is hidden completely) */
ui_widget_show_hide(ui_widgets.print_page_setup,
printing_prefs.use_gtk_printing || gtk_check_version(2, 10, 0) != NULL);
#endif
}
-// edit actions, c&p & co, from menu bar and from popup menu
+/* edit actions, c&p & co, from menu bar and from popup menu */
void
on_edit1_activate (GtkMenuItem *menuitem,
gpointer user_data)
@@ -399,8 +399,9 @@
if (IS_SCINTILLA(focusw) && idx >= 0)
{
#ifdef G_OS_WIN32
- // insert the text manually for now, because the auto conversion of EOL characters by
- // by Scintilla seems to make problems
+ /* insert the text manually for now, because the auto conversion of EOL characters by
+ * by Scintilla seems to make problems */
+ /** TODO this is probably obsolete now since we fixed PLAT_GTK_WIN32 in Scintilla */
if (gtk_clipboard_wait_is_text_available(gtk_clipboard_get(GDK_NONE)))
{
gchar *content = gtk_clipboard_wait_for_text(gtk_clipboard_get(GDK_NONE));
@@ -455,7 +456,7 @@
}
-// about menu item
+/* about menu item */
void
on_info1_activate (GtkMenuItem *menuitem,
gpointer user_data)
@@ -464,7 +465,7 @@
}
-// open file
+/* open file */
void
on_open1_activate (GtkMenuItem *menuitem,
gpointer user_data)
@@ -473,7 +474,7 @@
}
-// quit toolbar button
+/* quit toolbar button */
void
on_toolbutton19_clicked (GtkToolButton *toolbutton,
gpointer user_data)
@@ -482,7 +483,7 @@
}
-// reload file
+/* reload file */
void
on_toolbutton23_clicked (GtkToolButton *toolbutton,
gpointer user_data)
@@ -491,7 +492,7 @@
}
-// also used for reloading when user_data is -1
+/* also used for reloading when user_data is -1 */
void
on_reload_as_activate (GtkMenuItem *menuitem,
gpointer user_data)
@@ -563,7 +564,7 @@
}
-// new file
+/* new file */
void
on_toolbutton8_clicked (GtkToolButton *toolbutton,
gpointer user_data)
@@ -571,7 +572,7 @@
document_new_file(NULL, NULL, NULL);
}
-// open file
+/* open file */
void
on_toolbutton9_clicked (GtkToolButton *toolbutton,
gpointer user_data)
@@ -580,7 +581,7 @@
}
-// save file
+/* save file */
void
on_toolbutton10_clicked (GtkToolButton *toolbutton,
gpointer user_data)
@@ -596,7 +597,7 @@
static gboolean old_value = TRUE;
GtkWidget *widget = lookup_widget(app->window, "entry1");
- // only update if really needed
+ /* only update if really needed */
if (search_data.search_bar && old_value != success)
{
gtk_widget_modify_base(widget, GTK_STATE_NORMAL, success ? NULL : &red);
@@ -607,7 +608,7 @@
}
-// store text, clear search flags so we can use Search->Find Next/Previous
+/* store text, clear search flags so we can use Search->Find Next/Previous */
static void setup_find_next(GtkEditable *editable)
{
g_free(search_data.text);
@@ -618,7 +619,7 @@
}
-// search text
+/* search text */
void
on_entry1_activate (GtkEntry *entry,
gpointer user_data)
@@ -632,7 +633,7 @@
}
-// search text
+/* search text */
void
on_entry1_changed (GtkEditable *editable,
gpointer user_data)
@@ -660,7 +661,7 @@
}
-// search text
+/* search text */
void
on_toolbutton18_clicked (GtkToolButton *toolbutton,
gpointer user_data)
@@ -697,7 +698,7 @@
}
-// hides toolbar from toolbar popup menu
+/* hides toolbar from toolbar popup menu */
void
on_hide_toolbar1_activate (GtkMenuItem *menuitem,
gpointer user_data)
@@ -707,7 +708,7 @@
}
-// zoom in from menu bar and popup menu
+/* zoom in from menu bar and popup menu */
void
on_zoom_in1_activate (GtkMenuItem *menuitem,
gpointer user_data)
@@ -723,7 +724,7 @@
}
}
-// zoom out from menu bar and popup menu
+/* zoom out from menu bar and popup menu */
void
on_zoom_out1_activate (GtkMenuItem *menuitem,
gpointer user_data)
@@ -751,7 +752,7 @@
}
-// close tab
+/* close tab */
void
on_toolbutton15_clicked (GtkToolButton *toolbutton,
gpointer user_data)
@@ -771,7 +772,7 @@
}
-// changes window-title on switching tabs and lots of other things
+/* changes window-title on switching tabs and lots of other things */
void
on_notebook1_switch_page_after (GtkNotebook *notebook,
GtkNotebookPage *page,
@@ -782,7 +783,7 @@
if (closing_all) return;
- // guint == -1 seems useless, but it isn't!
+ /* guint == -1 seems useless, but it isn't! */
if (page_num == (guint) -1 && page != NULL)
idx = document_find_by_sci(SCINTILLA(page));
else
@@ -791,9 +792,9 @@
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list