aboutsummaryrefslogtreecommitdiff
path: root/src/indicator.h
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2016-03-24 16:16:53 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2016-03-24 16:16:53 +0000
commite3fa9582a01f14e6d80e00d375361a76df716895 (patch)
tree7b9521ad7cfa7a2e765be265d5ecd98cb9bcad23 /src/indicator.h
parentd2f14e07000e9a5ee418bcbcd34c5ae57bd45590 (diff)
parent194d7e85a52cbc0060a2d85b71b9ddd8b606aee4 (diff)
downloadayatana-indicator-display-e3fa9582a01f14e6d80e00d375361a76df716895.tar.gz
ayatana-indicator-display-e3fa9582a01f14e6d80e00d375361a76df716895.tar.bz2
ayatana-indicator-display-e3fa9582a01f14e6d80e00d375361a76df716895.zip
When a new device appears to ADB, prompt the user whether or not to allow the connection.
Approved by: PS Jenkins bot, Charles Kerr, Xavi Garcia
Diffstat (limited to 'src/indicator.h')
-rw-r--r--src/indicator.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/indicator.h b/src/indicator.h
index d0834fd..c55be79 100644
--- a/src/indicator.h
+++ b/src/indicator.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3, as published
@@ -17,8 +17,7 @@
* Charles Kerr <charles.kerr@canonical.com>
*/
-#ifndef INDICATOR_DISPLAY_INDICATOR_H
-#define INDICATOR_DISPLAY_INDICATOR_H
+#pragma once
#include <core/property.h>
@@ -52,10 +51,10 @@ public:
virtual std::string name() const =0;
virtual const core::Property<Header>& header() const =0;
virtual std::shared_ptr<GMenuModel> menu_model() const =0;
- virtual ~Profile() =default;
+ virtual ~Profile();
protected:
- Profile() =default;
+ Profile();
};
@@ -63,6 +62,7 @@ class SimpleProfile: public Profile
{
public:
SimpleProfile(const char* name, const std::shared_ptr<GMenuModel>& menu): m_name(name), m_menu(menu) {}
+ virtual ~SimpleProfile();
std::string name() const {return m_name;}
core::Property<Header>& header() {return m_header;}
@@ -79,11 +79,10 @@ protected:
class Indicator
{
public:
- virtual ~Indicator() =default;
+ virtual ~Indicator();
virtual const char* name() const =0;
virtual GSimpleActionGroup* action_group() const =0;
virtual std::vector<std::shared_ptr<Profile>> profiles() const =0;
};
-#endif