summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/dom/prop-css.cpp2
-rw-r--r--src/dom/prop-css2.cpp2
-rw-r--r--src/dom/util/ziptool.cpp2
-rw-r--r--src/extension/init.cpp2
-rw-r--r--src/trace/quantize.cpp16
-rw-r--r--src/ui/dialog/align-and-distribute.cpp2
-rw-r--r--src/ui/dialog/debug.cpp8
-rw-r--r--src/ui/dialog/dialog.cpp4
-rw-r--r--src/ui/dialog/filter-effects-dialog.cpp8
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp2
-rw-r--r--src/ui/dialog/swatches.cpp7
-rw-r--r--src/ui/dialog/transformation.cpp8
-rw-r--r--src/widgets/gradient-toolbar.cpp5
-rw-r--r--src/widgets/gradient-vector.cpp2
-rw-r--r--src/widgets/paint-selector.cpp4
-rw-r--r--src/widgets/select-toolbar.cpp1
-rw-r--r--src/widgets/shrink-wrap-button.cpp2
-rw-r--r--src/widgets/spinbutton-events.cpp1
-rw-r--r--src/widgets/spw-utilities.cpp3
-rw-r--r--src/xml/node-fns.cpp1
-rw-r--r--src/xml/repr-sorting.cpp1
-rw-r--r--src/xml/repr-util.cpp2
22 files changed, 51 insertions, 34 deletions
diff --git a/src/dom/prop-css.cpp b/src/dom/prop-css.cpp
index a0d66d939..9922b4935 100644
--- a/src/dom/prop-css.cpp
+++ b/src/dom/prop-css.cpp
@@ -1137,7 +1137,7 @@ NULL
-bool printTable()
+static bool printTable()
{
for (CssProp *prop=cssProps; prop->name ; prop++)
{
diff --git a/src/dom/prop-css2.cpp b/src/dom/prop-css2.cpp
index 33548fbb9..9fe998552 100644
--- a/src/dom/prop-css2.cpp
+++ b/src/dom/prop-css2.cpp
@@ -1279,7 +1279,7 @@ bool parseProperty(char *name, char *value)
}
-bool printTable()
+static bool printTable()
{
for (CssProp *prop=cssProps; prop->name ; prop++)
{
diff --git a/src/dom/util/ziptool.cpp b/src/dom/util/ziptool.cpp
index 081bcbbc4..9d9d5685c 100644
--- a/src/dom/util/ziptool.cpp
+++ b/src/dom/util/ziptool.cpp
@@ -126,7 +126,7 @@ static unsigned long crc_table[256];
/**
* make the table for a fast CRC.
*/
-void makeCrcTable()
+static void makeCrcTable()
{
if (crc_table_ready)
return;
diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index d59c2b2e3..ac3c90421 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -102,6 +102,8 @@
#include "internal/filter/filter.h"
+#include "init.h"
+
extern gboolean inkscape_app_use_gui( Inkscape::Application const *app );
namespace Inkscape {
diff --git a/src/trace/quantize.cpp b/src/trace/quantize.cpp
index 2db1bbf34..ba9306da8 100644
--- a/src/trace/quantize.cpp
+++ b/src/trace/quantize.cpp
@@ -16,6 +16,7 @@
#include "pool.h"
#include "imagemap.h"
+#include "quantize.h"
typedef struct Ocnode_def Ocnode;
@@ -211,16 +212,19 @@ static void ocnodePrint(Ocnode *node, int indent)
ocnodePrint(node->child[i], indent+2);
}
}
+
+#if 0
void octreePrint(Ocnode *node)
{
printf("<<octree>>\n");
if (node) printf("[r:%p] ", node); ocnodePrint(node, 2);
}
+#endif
/**
* builds a single <rgb> color leaf at location <ref>
*/
-void ocnodeLeaf(pool<Ocnode> *pool, Ocnode **ref, RGB rgb)
+static void ocnodeLeaf(pool<Ocnode> *pool, Ocnode **ref, RGB rgb)
{
assert(ref);
Ocnode *node = ocnodeNew(pool);
@@ -237,7 +241,7 @@ void ocnodeLeaf(pool<Ocnode> *pool, Ocnode **ref, RGB rgb)
/**
* merge nodes <node1> and <node2> at location <ref> with parent <parent>
*/
-int octreeMerge(pool<Ocnode> *pool, Ocnode *parent, Ocnode **ref, Ocnode *node1, Ocnode *node2)
+static int octreeMerge(pool<Ocnode> *pool, Ocnode *parent, Ocnode **ref, Ocnode *node1, Ocnode *node2)
{
assert(ref);
if (!node1 && !node2) return 0;
@@ -415,7 +419,7 @@ static void ocnodeStrip(pool<Ocnode> *pool, Ocnode **ref, int *count, unsigned l
/**
* reduce the leaves of an octree to a given number
*/
-void octreePrune(pool<Ocnode> *pool, Ocnode **ref, int ncolor)
+static void octreePrune(pool<Ocnode> *pool, Ocnode **ref, int ncolor)
{
assert(ref);
assert(ncolor > 0);
@@ -435,8 +439,8 @@ void octreePrune(pool<Ocnode> *pool, Ocnode **ref, int ncolor)
* build an octree associated to the area of a color map <rgbmap>,
* included in the specified (x1,y1)--(x2,y2) rectangle.
*/
-void octreeBuildArea(pool<Ocnode> *pool, RgbMap *rgbmap, Ocnode **ref,
- int x1, int y1, int x2, int y2, int ncolor)
+static void octreeBuildArea(pool<Ocnode> *pool, RgbMap *rgbmap, Ocnode **ref,
+ int x1, int y1, int x2, int y2, int ncolor)
{
int dx = x2 - x1, dy = y2 - y1;
int xm = x1 + dx/2, ym = y1 + dy/2;
@@ -465,7 +469,7 @@ void octreeBuildArea(pool<Ocnode> *pool, RgbMap *rgbmap, Ocnode **ref,
* build an octree associated to the <rgbmap> color map,
* pruned to <ncolor> colors.
*/
-Ocnode *octreeBuild(pool<Ocnode> *pool, RgbMap *rgbmap, int ncolor)
+static Ocnode *octreeBuild(pool<Ocnode> *pool, RgbMap *rgbmap, int ncolor)
{
//create the octree
Ocnode *node = NULL;
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 7545a613e..4b0f773b5 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -755,7 +755,7 @@ struct Baselines
{}
};
-bool operator< (const Baselines &a, const Baselines &b)
+static bool operator< (const Baselines &a, const Baselines &b)
{
return (a._base[a._orientation] < b._base[b._orientation]);
}
diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp
index a026f3501..da38e2dde 100644
--- a/src/ui/dialog/debug.cpp
+++ b/src/ui/dialog/debug.cpp
@@ -171,10 +171,10 @@ void DebugDialog::showInstance()
/*##### THIS IS THE IMPORTANT PART ##### */
-void dialogLoggingFunction(const gchar */*log_domain*/,
- GLogLevelFlags /*log_level*/,
- const gchar *messageText,
- gpointer user_data)
+static void dialogLoggingFunction(const gchar */*log_domain*/,
+ GLogLevelFlags /*log_level*/,
+ const gchar *messageText,
+ gpointer user_data)
{
DebugDialogImpl *dlg = static_cast<DebugDialogImpl *>(user_data);
dlg->message(messageText);
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index f5f712103..f27d344fa 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -61,7 +61,7 @@ void sp_dialog_shutdown(GObject * /*object*/, gpointer dlgPtr)
}
-void hideCallback(GObject * /*object*/, gpointer dlgPtr)
+static void hideCallback(GObject * /*object*/, gpointer dlgPtr)
{
g_return_if_fail( dlgPtr != NULL );
@@ -69,7 +69,7 @@ void hideCallback(GObject * /*object*/, gpointer dlgPtr)
dlg->onHideF12();
}
-void unhideCallback(GObject * /*object*/, gpointer dlgPtr)
+static void unhideCallback(GObject * /*object*/, gpointer dlgPtr)
{
g_return_if_fail( dlgPtr != NULL );
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index c3c44f6c3..a755cfccd 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -83,7 +83,7 @@ using Inkscape::UI::Widget::SpinScale;
// Returns the number of inputs available for the filter primitive type
-int input_count(const SPFilterPrimitive* prim)
+static int input_count(const SPFilterPrimitive* prim)
{
if(!prim)
return 0;
@@ -1087,8 +1087,8 @@ FilterEffectsDialog::LightSourceControl* FilterEffectsDialog::Settings::add_ligh
return ls;
}
-Glib::RefPtr<Gtk::Menu> create_popup_menu(Gtk::Widget& parent, sigc::slot<void> dup,
- sigc::slot<void> rem)
+static Glib::RefPtr<Gtk::Menu> create_popup_menu(Gtk::Widget& parent, sigc::slot<void> dup,
+ sigc::slot<void> rem)
{
Glib::RefPtr<Gtk::Menu> menu(new Gtk::Menu);
@@ -2123,7 +2123,7 @@ bool FilterEffectsDialog::PrimitiveList::on_button_release_event(GdkEventButton*
}
// Checks all of prim's inputs, removes any that use result
-void check_single_connection(SPFilterPrimitive* prim, const int result)
+static void check_single_connection(SPFilterPrimitive* prim, const int result)
{
if (prim && (result >= 0)) {
if (prim->image_in == result) {
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 62f48cce0..fbaebfbec 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -200,7 +200,7 @@ void InkscapePreferences::AddDotSizeSpinbutton(DialogPage &p, Glib::ustring cons
}
-void StyleFromSelectionToTool(Glib::ustring const &prefs_path, StyleSwatch *swatch)
+static void StyleFromSelectionToTool(Glib::ustring const &prefs_path, StyleSwatch *swatch)
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (desktop == NULL)
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 68bafe549..3baba3460 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -237,6 +237,9 @@ static void removeit( GtkWidget *widget, gpointer data )
gtk_container_remove( GTK_CONTAINER(data), widget );
}
+/* extern'ed from colot-item.cpp */
+gboolean colorItemHandleButtonPress( GtkWidget* widget, GdkEventButton* event, gpointer user_data );
+
gboolean colorItemHandleButtonPress( GtkWidget* widget, GdkEventButton* event, gpointer user_data )
{
gboolean handled = FALSE;
@@ -371,13 +374,13 @@ static char* trim( char* str ) {
return ret;
}
-void skipWhitespace( char*& str ) {
+static void skipWhitespace( char*& str ) {
while ( *str == ' ' || *str == '\t' ) {
str++;
}
}
-bool parseNum( char*& str, int& val ) {
+static bool parseNum( char*& str, int& val ) {
val = 0;
while ( '0' <= *str && *str <= '9' ) {
val = val * 10 + (*str - '0');
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index bbc218b83..329450b52 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -48,10 +48,10 @@ static void on_selection_changed(Inkscape::Application */*inkscape*/, Inkscape::
daad->updateSelection((Inkscape::UI::Dialog::Transformation::PageType)page, selection);
}
-void on_selection_modified( Inkscape::Application */*inkscape*/,
- Inkscape::Selection *selection,
- guint /*flags*/,
- Transformation *daad )
+static void on_selection_modified( Inkscape::Application */*inkscape*/,
+ Inkscape::Selection *selection,
+ guint /*flags*/,
+ Transformation *daad )
{
int page = daad->getCurrentPage();
daad->updateSelection((Inkscape::UI::Dialog::Transformation::PageType)page, selection);
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index ea88b96fa..b5fc0a0f2 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -55,6 +55,7 @@
#include "svg/svg-color.h"
#include "desktop-style.h"
#include "gradient-context.h"
+#include "gradient-toolbar.h"
#include "toolbox.h"
@@ -918,7 +919,7 @@ static void gr_new_fillstroke_changed( EgeSelectOneAction *act, GObject * /*tbl*
/*
* User selected a gradient from the combobox
*/
-void gr_gradient_combo_changed(EgeSelectOneAction *act, gpointer data)
+static void gr_gradient_combo_changed(EgeSelectOneAction *act, gpointer data)
{
if (blocked) {
return;
@@ -947,7 +948,7 @@ void gr_gradient_combo_changed(EgeSelectOneAction *act, gpointer data)
}
-void gr_spread_change(EgeSelectOneAction *act, GtkWidget *widget)
+static void gr_spread_change(EgeSelectOneAction *act, GtkWidget *widget)
{
if (blocked) {
return;
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 88fe15dca..51013a2cd 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -377,7 +377,7 @@ unsigned long sp_gradient_to_hhssll(SPGradient *gr)
return ((int)(hsl[0]*100 * 10000)) + ((int)(hsl[1]*100 * 100)) + ((int)(hsl[2]*100 * 1));
}
-GSList *get_all_doc_items(GSList *list, SPObject *from, bool onlyvisible, bool onlysensitive, bool ingroups, GSList const *exclude)
+static GSList *get_all_doc_items(GSList *list, SPObject *from, bool onlyvisible, bool onlysensitive, bool ingroups, GSList const *exclude)
{
for ( SPObject *child = from->firstChild() ; child; child = child->getNext() ) {
if (SP_IS_ITEM(child)) {
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 6450abf52..5a6e774f5 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -359,7 +359,7 @@ sp_paint_selector_fillrule_toggled(GtkToggleButton *tb, SPPaintSelector *psel)
}
}
-void
+static void
sp_paint_selector_show_fillrule(SPPaintSelector *psel, bool is_fill)
{
if (psel->fillrulebox) {
@@ -791,7 +791,7 @@ static void sp_psel_pattern_change(GtkWidget * /*widget*/, SPPaintSelector *psel
* Returns a list of patterns in the defs of the given source document as a GSList object
* Returns NULL if there are no patterns in the document.
*/
-GSList *
+static GSList *
ink_pattern_list_get (SPDocument *source)
{
if (source == NULL)
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 61b04121a..3ccfa9cf9 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -52,6 +52,7 @@
#include "ink-action.h"
#include <2geom/rect.h>
#include "ui/icon-names.h"
+#include "select-toolbar.h"
using Inkscape::UnitTracker;
using Inkscape::DocumentUndo;
diff --git a/src/widgets/shrink-wrap-button.cpp b/src/widgets/shrink-wrap-button.cpp
index fc844f5ec..941a0466c 100644
--- a/src/widgets/shrink-wrap-button.cpp
+++ b/src/widgets/shrink-wrap-button.cpp
@@ -16,6 +16,8 @@
#include <gtkmm/button.h>
#include <gtk/gtk.h>
+#include "shrink-wrap-button.h"
+
namespace Inkscape {
namespace Widgets {
diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp
index 290b0bb75..444aa278e 100644
--- a/src/widgets/spinbutton-events.cpp
+++ b/src/widgets/spinbutton-events.cpp
@@ -20,6 +20,7 @@
#include "sp-widget.h"
#include "widget-sizes.h"
+#include "spinbutton-events.h"
gboolean
spinbutton_focus_in (GtkWidget *w, GdkEventKey */*event*/, gpointer /*data*/)
diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index e7db45581..8adc72cd7 100644
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -24,6 +24,7 @@
#include "selection.h"
#include "helper/unit-menu.h"
+#include "spw-utilities.h"
#include <gtk/gtk.h>
@@ -194,7 +195,7 @@ spw_unit_selector(GtkWidget * dialog, GtkWidget * table,
return sb;
}
-void
+static void
sp_set_font_size_recursive (GtkWidget *w, gpointer font)
{
guint size = GPOINTER_TO_UINT (font);
diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp
index 20e9fbc38..eb3870978 100644
--- a/src/xml/node-fns.cpp
+++ b/src/xml/node-fns.cpp
@@ -9,6 +9,7 @@
#include "xml/node-iterators.h"
#include "util/find-if-before.h"
+#include "node-fns.h"
namespace Inkscape {
namespace XML {
diff --git a/src/xml/repr-sorting.cpp b/src/xml/repr-sorting.cpp
index fd485925b..09a39acb2 100644
--- a/src/xml/repr-sorting.cpp
+++ b/src/xml/repr-sorting.cpp
@@ -2,6 +2,7 @@
#include "util/longest-common-suffix.h"
#include "xml/repr.h"
#include "xml/node-iterators.h"
+#include "repr-sorting.h"
static bool same_repr(Inkscape::XML::Node const &a, Inkscape::XML::Node const &b)
{
diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp
index 5b8ab12ae..7e9f9c484 100644
--- a/src/xml/repr-util.cpp
+++ b/src/xml/repr-util.cpp
@@ -75,7 +75,7 @@ static char *sp_xml_ns_auto_prefix(char const *uri);
/**
* Locale-independent double to string conversion
*/
-unsigned int sp_xml_dtoa(gchar *buf, double val, unsigned int tprec, unsigned int fprec, unsigned int padf)
+static unsigned int sp_xml_dtoa(gchar *buf, double val, unsigned int tprec, unsigned int fprec, unsigned int padf)
{
double dival, fval, epsilon;
int idigits, ival, i;
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 01:41:38 +0000