Removed some operator keywords.

(bzr r13237)

6 files changed, 9 insertions, 9 deletions

diff --git a/src/extension/internal/filter/color.h b/src/extension/internal/filter/color.h
index 7059ad29b..19af6e969 100644
--- a/src/extension/internal/filter/color.h
+++ b/src/extension/internal/filter/color.h
@@ -941,7 +941,7 @@ Invert::get_filter_text (Inkscape::Extension::Extension * ext)
     std::ostringstream transparency;
     std::ostringstream hue;
 
-    if (ext->get_param_bool("hue") xor ext->get_param_bool("lightness")) {
+    if (ext->get_param_bool("hue") ^ ext->get_param_bool("lightness")) {
         hue << "<feColorMatrix type=\"hueRotate\" values=\"180\" result=\"color1\" />\n";
     } else {
         hue << "";
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index 7a50826ca..c244d9c16 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -99,7 +99,7 @@ SPDocument *open(Extension *key, gchar const *filename)
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         bool ask = prefs->getBool("/dialogs/import/ask");
         Glib::ustring id = Glib::ustring(imod->get_id(), 28);
-        if (!ask and id.compare( "org.inkscape.input.gdkpixbuf") == 0) {
+        if (!ask && id.compare( "org.inkscape.input.gdkpixbuf") == 0) {
             show = false;
             imod->set_gui(false);
         }
diff --git a/src/factory.h b/src/factory.h
index 7e466f95a..c76501cfd 100644
--- a/src/factory.h
+++ b/src/factory.h
@@ -65,9 +65,9 @@ public:
         if (it == this->_object_map.end()) {
             //throw FactoryExceptions::TypeNotRegistered(id);
             if (!(id.empty() // comments, usually
-                  or id == "rdf:RDF" // no SP node yet
-                  or id == "inkscape:clipboard" // SP node not necessary
-                  or id == "inkscape:_templateinfo")) {
+                  || id == "rdf:RDF" // no SP node yet
+                  || id == "inkscape:clipboard" // SP node not necessary
+                  || id == "inkscape:_templateinfo")) {
                 g_warning("unknown type: %s", id.c_str());
             }
             return NULL;
diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp
index e91677e18..581c632f5 100644
--- a/src/live_effects/lpe-knot.cpp
+++ b/src/live_effects/lpe-knot.cpp
@@ -493,7 +493,7 @@ LPEKnot::doEffect_path (std::vector<Geom::Path> const &path_in)
             }
         }
         for (unsigned comp = beg_comp; comp < end_comp; comp++){
-            assert(dom.at(comp).min() >=0 and dom.at(comp).max() <= size_nondegenerate(gpaths.at(i0)));
+            assert(dom.at(comp).min() >=0 && dom.at(comp).max() <= size_nondegenerate(gpaths.at(i0)));
             path_out.push_back(gpaths[i0].portion(dom.at(comp)));
         }
     }
diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index 6ffb913bd..455653e46 100644
--- a/src/live_effects/lpe-rough-hatches.cpp
+++ b/src/live_effects/lpe-rough-hatches.cpp
@@ -319,7 +319,7 @@ LPERoughHatches::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const &
         transformed_pwd2_in = transformed_pwd2_in * bend_mat;
         tilter = Piecewise<SBasis>(shift(Linear(-bend_amount),1));
         OptRect bbox = bounds_exact( transformed_pwd2_in );
-        if (not(bbox)) return pwd2_in;
+        if (!(bbox)) return pwd2_in;
         tilter.setDomain((*bbox)[Y]);
         transformed_pwd2_in = bend(transformed_pwd2_in, tilter);
         transformed_pwd2_in = transformed_pwd2_in * bend_mat.inverse();
@@ -381,7 +381,7 @@ LPERoughHatches::linearSnake(Piecewise<D2<SBasis> > const &f, Point const &org){
     Piecewise<SBasis> dx = derivative(x);
     OptInterval range = bounds_exact(x);
 
-    if (not range) return result;
+    if (!range) return result;
     std::vector<double> levels = generateLevels(*range, org[X]);
     std::vector<std::vector<double> > times;
     times = multi_roots(x,levels);
diff --git a/src/sp-conn-end.cpp b/src/sp-conn-end.cpp
index c136cea66..3e5398ced 100644
--- a/src/sp-conn-end.cpp
+++ b/src/sp-conn-end.cpp
@@ -298,7 +298,7 @@ sp_conn_end_href_changed(SPObject */*old_ref*/, SPObject */*ref*/,
             // This allows the connector tool to dive into a group's children
             // And connect to their children's centers.
             SPObject *parent = refobj->parent;
-            if (SP_IS_GROUP(parent) and ! SP_IS_LAYER(parent)) {
+            if (SP_IS_GROUP(parent) && ! SP_IS_LAYER(parent)) {
                 connEnd._group_connection
                     = SP_ITEM(parent)->connectTransformed(sigc::bind(sigc::ptr_fun(&sp_conn_end_shape_move),
                                                                  path));