summaryrefslogtreecommitdiffstats
path: root/src/progs/demolition
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/demolition')
-rw-r--r--src/progs/demolition/DemolitionClientInterface.cpp8
-rw-r--r--src/progs/demolition/DemolitionClientInterface.h8
-rw-r--r--src/progs/demolition/DemolitionModel.cpp14
-rw-r--r--src/progs/demolition/DemolitionModel.h8
-rw-r--r--src/progs/demolition/demolition.cpp8
5 files changed, 23 insertions, 23 deletions
diff --git a/src/progs/demolition/DemolitionClientInterface.cpp b/src/progs/demolition/DemolitionClientInterface.cpp
index e58371d4..1c3d7aa1 100644
--- a/src/progs/demolition/DemolitionClientInterface.cpp
+++ b/src/progs/demolition/DemolitionClientInterface.cpp
@@ -1,17 +1,17 @@
-/* This file is part of Om. Copyright (C) 2005 Dave Robillard.
+/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard.
*
- * Om is free software; you can redistribute it and/or modify it under the
+ * Ingen is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
- * Om is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "DemolitionClientInterface.h"
diff --git a/src/progs/demolition/DemolitionClientInterface.h b/src/progs/demolition/DemolitionClientInterface.h
index 7b114c52..16a67ce9 100644
--- a/src/progs/demolition/DemolitionClientInterface.h
+++ b/src/progs/demolition/DemolitionClientInterface.h
@@ -1,17 +1,17 @@
-/* This file is part of Om. Copyright (C) 2005 Dave Robillard.
+/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard.
*
- * Om is free software; you can redistribute it and/or modify it under the
+ * Ingen is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
- * Om is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
diff --git a/src/progs/demolition/DemolitionModel.cpp b/src/progs/demolition/DemolitionModel.cpp
index 056c18e4..b91b461a 100644
--- a/src/progs/demolition/DemolitionModel.cpp
+++ b/src/progs/demolition/DemolitionModel.cpp
@@ -1,17 +1,17 @@
-/* This file is part of Om. Copyright (C) 2005 Dave Robillard.
+/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard.
*
- * Om is free software; you can redistribute it and/or modify it under the
+ * Ingen is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
- * Om is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "DemolitionModel.h"
@@ -221,15 +221,15 @@ void
DemolitionModel::object_renamed(const Path& old_path, const Path& new_path)
{
/* FIXME: broken, does not rename children
- assert(OmPath::parent(old_path) == OmPath::parent(new_path));
+ assert(Path::parent(old_path) == Path::parent(new_path));
// Rename node
NodeModel* nm = get_node(old_path);
if (nm != NULL) {
if (nm->parent() != NULL) {
- nm->parent()->remove_node(OmPath::name(old_path));
+ nm->parent()->remove_node(Path::name(old_path));
nm->path(new_path);
- nm->parent()->add_node(OmPath::name(new_path));
+ nm->parent()->add_node(Path::name(new_path));
}
}
diff --git a/src/progs/demolition/DemolitionModel.h b/src/progs/demolition/DemolitionModel.h
index 64e0cc61..952d41cb 100644
--- a/src/progs/demolition/DemolitionModel.h
+++ b/src/progs/demolition/DemolitionModel.h
@@ -1,17 +1,17 @@
-/* This file is part of Om. Copyright (C) 2005 Dave Robillard.
+/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard.
*
- * Om is free software; you can redistribute it and/or modify it under the
+ * Ingen is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
- * Om is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef DEMOLITIONMODEL_H
diff --git a/src/progs/demolition/demolition.cpp b/src/progs/demolition/demolition.cpp
index 93a37414..47c3279c 100644
--- a/src/progs/demolition/demolition.cpp
+++ b/src/progs/demolition/demolition.cpp
@@ -1,17 +1,17 @@
-/* This file is part of Om. Copyright (C) 2005 Dave Robillard.
+/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard.
*
- * Om is free software; you can redistribute it and/or modify it under the
+ * Ingen is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
- * Om is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "OSCModelEngineInterface.h"