From 3adf7752c4b2b4bb53bbf78a66e4e49bf6e3f98f Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Fri, 6 Jun 2014 06:51:11 +0000 Subject: [PATCH] Data\Db\DbQuery: rename also in monitoring module refs #6418 --- modules/monitoring/application/controllers/ListController.php | 1 - .../library/Monitoring/Backend/Ido/Query/IdoQuery.php | 2 +- modules/monitoring/library/Monitoring/Object/Host.php | 4 ++-- modules/monitoring/library/Monitoring/Object/Service.php | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index ce4ca715e..7ef920214 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -29,7 +29,6 @@ // {{{ICINGA_LICENSE_HEADER}}} use Icinga\Application\Benchmark; -use Icinga\Data\Db\Query; use Icinga\Module\Monitoring\Controller; use Icinga\Web\Hook; use Icinga\Web\Widget\Tabextension\DashboardAction; diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php index bec90c6b7..6071bb3a0 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php @@ -30,7 +30,7 @@ namespace Icinga\Module\Monitoring\Backend\Ido\Query; use Icinga\Logger\Logger; -use Icinga\Data\Db\Query; +use Icinga\Data\Db\DbQuery; use Icinga\Exception\ProgrammingError; use Icinga\Application\Icinga; use Icinga\Web\Session; diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php index 7c89bc838..70bd67bda 100644 --- a/modules/monitoring/library/Monitoring/Object/Host.php +++ b/modules/monitoring/library/Monitoring/Object/Host.php @@ -3,14 +3,14 @@ namespace Icinga\Module\Monitoring\Object; use Icinga\Module\Monitoring\DataView\HostStatus; -use Icinga\Data\Db\Query; +use Icinga\Data\Db\DbQuery; class Host extends AbstractObject { public $type = 'host'; public $prefix = 'host_'; - protected function applyObjectFilter(Query $query) + protected function applyObjectFilter(DbQuery $query) { return $query->where('host_name', $this->host_name); } diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php index ab7209a85..62ddca771 100644 --- a/modules/monitoring/library/Monitoring/Object/Service.php +++ b/modules/monitoring/library/Monitoring/Object/Service.php @@ -3,14 +3,14 @@ namespace Icinga\Module\Monitoring\Object; use Icinga\Module\Monitoring\DataView\ServiceStatus; -use Icinga\Data\Db\Query; +use Icinga\Data\Db\DbQuery; class Service extends AbstractObject { public $type = 'service'; public $prefix = 'service_'; - protected function applyObjectFilter(Query $query) + protected function applyObjectFilter(DbQuery $query) { return $query->where('service_host_name', $this->host_name) ->where('service_description', $this->service_description);