From 8d77601115dafbdfa64066e40b6a243935e2a288 Mon Sep 17 00:00:00 2001 From: Niels Date: Sat, 19 Feb 2011 13:34:01 +0100 Subject: [PATCH] remove unused funktion triggerAction() from layers --- abstractlayer.cpp | 6 +----- abstractlayer.h | 3 +-- gpslayer.cpp | 13 ++++--------- gpslayer.h | 3 +-- markerlayer.cpp | 25 ++++++++++--------------- markerlayer.h | 3 +-- 6 files changed, 18 insertions(+), 35 deletions(-) diff --git a/abstractlayer.cpp b/abstractlayer.cpp index f4043b3..69f5114 100644 --- a/abstractlayer.cpp +++ b/abstractlayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Niels Kummerfeldt + * Copyright 2010-2011 Niels Kummerfeldt * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -43,10 +43,6 @@ void AbstractLayer::pan(const QPoint &move) Q_UNUSED(move) } -void AbstractLayer::triggerAction() -{ -} - void AbstractLayer::keyPressed(QKeyEvent *event) { Q_UNUSED(event) diff --git a/abstractlayer.h b/abstractlayer.h index a946384..b48706f 100644 --- a/abstractlayer.h +++ b/abstractlayer.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Niels Kummerfeldt + * Copyright 2010-2011 Niels Kummerfeldt * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,7 +35,6 @@ public: virtual void load(const QString &filename); virtual void zoom(int level); virtual void pan(const QPoint &move); - virtual void triggerAction(); virtual void keyPressed(QKeyEvent *event); void paintLayer(QPainter *painter); diff --git a/gpslayer.cpp b/gpslayer.cpp index e1b8540..7cf8b02 100644 --- a/gpslayer.cpp +++ b/gpslayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Niels Kummerfeldt + * Copyright 2010-2011 Niels Kummerfeldt * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -44,18 +44,13 @@ GpsLayer::GpsLayer(MapWidget *map) : m_gps->connectGps(); } -void GpsLayer::triggerAction() -{ - if (isVisible()) { - map()->centerOnGeoPos(m_pos.x(), m_pos.y()); - } -} - void GpsLayer::keyPressed(QKeyEvent *event) { if (event->modifiers() == Qt::NoModifier && event->key() == Qt::Key_G) { - triggerAction(); + if (isVisible()) { + map()->centerOnGeoPos(m_pos.x(), m_pos.y()); + } } } diff --git a/gpslayer.h b/gpslayer.h index f9d214b..3a67ca3 100644 --- a/gpslayer.h +++ b/gpslayer.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Niels Kummerfeldt + * Copyright 2010-2011 Niels Kummerfeldt * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,7 +32,6 @@ class GpsLayer : public AbstractLayer public: GpsLayer(MapWidget *map); - virtual void triggerAction(); virtual void keyPressed(QKeyEvent *event); protected: diff --git a/markerlayer.cpp b/markerlayer.cpp index 89e1ea3..4c082c0 100644 --- a/markerlayer.cpp +++ b/markerlayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Niels Kummerfeldt + * Copyright 2010-2011 Niels Kummerfeldt * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -60,24 +60,19 @@ void MarkerLayer::load(const QString &filename) set.endGroup(); } -void MarkerLayer::triggerAction() -{ - int n = 0; - if (!m_markerName.isEmpty()) { - n = m_markerName.last().toInt(); - } - QString newName = QString::number(n+1); - - m_markerPos << map()->geoPos(); - m_markerName << newName; - emit markerAdded(newName); -} - void MarkerLayer::keyPressed(QKeyEvent *event) { if (event->key() == Qt::Key_M) { if (event->modifiers() == Qt::NoModifier) { - triggerAction(); + int n = 0; + if (!m_markerName.isEmpty()) { + n = m_markerName.last().toInt(); + } + QString newName = QString::number(n+1); + + m_markerPos << map()->geoPos(); + m_markerName << newName; + emit markerAdded(newName); } else if (event->modifiers() == Qt::AltModifier) { toggleVisibility(); } diff --git a/markerlayer.h b/markerlayer.h index a7c7271..39d2095 100644 --- a/markerlayer.h +++ b/markerlayer.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Niels Kummerfeldt + * Copyright 2010-2011 Niels Kummerfeldt * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,7 +32,6 @@ public: ~MarkerLayer(); virtual void load(const QString &filename); - virtual void triggerAction(); virtual void keyPressed(QKeyEvent *event); protected: