From d765e250d50736f58b6c699875e3399b3e6f3012 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 25 Feb 2014 20:42:59 -0800 Subject: [PATCH] removed AbstractMenuInterface.h --- interface/src/Menu.h | 13 ++------ libraries/script-engine/src/ScriptEngine.h | 1 - libraries/shared/src/AbstractMenuInterface.h | 31 -------------------- 3 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 libraries/shared/src/AbstractMenuInterface.h diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 0fd89476f9..ba7ab15e37 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -14,7 +14,6 @@ #include #include -#include #include #include #include @@ -98,16 +97,6 @@ public: QMenu* getActiveScriptsMenu() { return _activeScriptsMenu;} - /** - virtual void invokeAddActionToQMenuAndActionHash(QMenu* destinationMenu, - const QString actionName, - const QKeySequence& shortcut = 0, - const QObject* receiver = NULL, - const char* member = NULL); - virtual void invokeRemoveAction(QMenu* menu, const QString& actionName); - **/ - -public slots: QAction* addActionToQMenuAndActionHash(QMenu* destinationMenu, const QString& actionName, const QKeySequence& shortcut = 0, @@ -118,6 +107,8 @@ public slots: void removeAction(QMenu* menu, const QString& actionName); +public slots: + void loginForCurrentDomain(); void bandwidthDetails(); void voxelStatsDetails(); diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index 0ce5437d90..00906de7b3 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -15,7 +15,6 @@ #include #include -#include #include #include diff --git a/libraries/shared/src/AbstractMenuInterface.h b/libraries/shared/src/AbstractMenuInterface.h deleted file mode 100644 index 7d9e83827c..0000000000 --- a/libraries/shared/src/AbstractMenuInterface.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// AbstractMenuInterface.h -// hifi -// -// Created by Brad Hefta-Gaub on 12/16/13. -// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. -// -// - -#ifndef __hifi__AbstractMenuInterface__ -#define __hifi__AbstractMenuInterface__ - -#include - -class QMenu; -class QString; -class QObject; -class QKeySequence; - -class AbstractMenuInterface { -public: - virtual QMenu* getActiveScriptsMenu() = 0; - virtual void invokeAddActionToQMenuAndActionHash(QMenu* destinationMenu, - const QString actionName, - const QKeySequence& shortcut = 0, - const QObject* receiver = NULL, - const char* member = NULL) = 0; - virtual void invokeRemoveAction(QMenu* menu, const QString& actionName) = 0; -}; - -#endif /* defined(__hifi__AbstractMenuInterface__) */