# HG changeset patch
# User Markus Bröker <broeker.markus@googlemail.com>
# Date 1447423648 -3600
# Node ID b441d3c0f5726c67866af96892ba289d5bcf23cc
# Parent  8c2f3735a9bd59c048de08ee25dcc257e256658c
DataModel extends Model ohne Namenskonflikte beim initialen Erzeugen

diff --git a/classes/bfw/core/Controller.php b/classes/bfw/core/Controller.php
--- a/classes/bfw/core/Controller.php
+++ b/classes/bfw/core/Controller.php
@@ -123,6 +123,6 @@
         $modelName = str_replace('controller', 'model', get_class($this));
         $modelName = strtolower($modelName);
 
-        return str_replace('controller', '\Model', $modelName);
+        return str_replace('controller', '\DataModel', $modelName);
     }
 }
\ No newline at end of file
diff --git a/classes/bfw/mvc/model/benutzerverwaltung/Model.php b/classes/bfw/mvc/model/benutzerverwaltung/DataModel.php
rename from classes/bfw/mvc/model/benutzerverwaltung/Model.php
rename to classes/bfw/mvc/model/benutzerverwaltung/DataModel.php
--- a/classes/bfw/mvc/model/benutzerverwaltung/Model.php
+++ b/classes/bfw/mvc/model/benutzerverwaltung/DataModel.php
@@ -8,10 +8,11 @@
 namespace bfw\mvc\model\benutzerverwaltung;
 
 use bfw\core\Entity;
+use bfw\core\Model;
 use bfw\entities\TGroup;
 use bfw\entities\TUser;
 
-class Model extends \bfw\core\Model {
+class DataModel extends Model {
 
     /**
      * @var TUser
diff --git a/classes/bfw/mvc/model/dokumentation/Model.php b/classes/bfw/mvc/model/dokumentation/DataModel.php
rename from classes/bfw/mvc/model/dokumentation/Model.php
rename to classes/bfw/mvc/model/dokumentation/DataModel.php
--- a/classes/bfw/mvc/model/dokumentation/Model.php
+++ b/classes/bfw/mvc/model/dokumentation/DataModel.php
@@ -8,10 +8,11 @@
 namespace bfw\mvc\model\dokumentation;
 
 use bfw\core\Entity;
+use bfw\core\Model;
 use bfw\entities\TGroup;
 use bfw\entities\TUser;
 
-class Model extends \bfw\core\Model {
+class DataModel extends Model {
 
     private $user;
     private $group;
diff --git a/classes/bfw/mvc/model/error/Model.php b/classes/bfw/mvc/model/error/DataModel.php
rename from classes/bfw/mvc/model/error/Model.php
rename to classes/bfw/mvc/model/error/DataModel.php
--- a/classes/bfw/mvc/model/error/Model.php
+++ b/classes/bfw/mvc/model/error/DataModel.php
@@ -8,10 +8,11 @@
 namespace bfw\mvc\model\error;
 
 use bfw\core\Entity;
+use bfw\core\Model;
 use bfw\entities\TGroup;
 use bfw\entities\TUser;
 
-class Model extends \bfw\core\Model {
+class DataModel extends Model {
 
     private $user;
     private $group;
diff --git a/classes/bfw/mvc/model/home/Model.php b/classes/bfw/mvc/model/home/DataModel.php
rename from classes/bfw/mvc/model/home/Model.php
rename to classes/bfw/mvc/model/home/DataModel.php
--- a/classes/bfw/mvc/model/home/Model.php
+++ b/classes/bfw/mvc/model/home/DataModel.php
@@ -8,11 +8,11 @@
 namespace bfw\mvc\model\home;
 
 use bfw\core\Entity;
-use bfw\core\Model as MyModel;
+use bfw\core\Model;
 use bfw\entities\TGroup;
 use bfw\entities\TUser;
 
-class Model extends MyModel {
+class DataModel extends Model {
 
     private $user;
     private $group;