Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:37:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

some cruft cleanup

Browse source
This commit is contained in:
ZappoMan 2014-02-25 20:45:49 -08:00
parent d765e250d5
commit d3594808d9
3 changed files with 6 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -4244,7 +4244,6 @@ void Application::cleanupScriptMenuItem(const QString& scriptMenuName) {
Menu::getInstance()->removeAction(Menu::getInstance()->getActiveScriptsMenu(), scriptMenuName);
}
void Application::loadScript(const QString& fileNameString) {
_activeScripts.append(fileNameString);
QByteArray fileNameAscii = fileNameString.toLocal8Bit();
@ -4275,7 +4274,7 @@ void Application::loadScript(const QString& fileNameString) {
ScriptEngine* scriptEngine = new ScriptEngine(script, wantMenuItems, fileName, &_controllerScriptingInterface);
// add a stop menu itm
// add a stop menu item
Menu::getInstance()->addActionToQMenuAndActionHash(Menu::getInstance()->getActiveScriptsMenu(),
scriptEngine->getScriptMenuName(), 0, scriptEngine, SLOT(stop()));

28
interface/src/Menu.cpp
View file

@ -1509,31 +1509,3 @@ void Menu::removeMenuItem(const QString& menu, const QString& menuitem) {
QMenuBar::repaint();
};
/**
void Menu::invokeAddActionToQMenuAndActionHash(QMenu* destinationMenu, const QString actionName,
const QKeySequence& shortcut, const QObject* receiver, const char* member) {
qDebug() << "about to call QMetaObject::invokeMethod(this, \"addActionToQMenuAndActionHash\"...)";
QMetaObject::invokeMethod(this, "addActionToQMenuAndActionHash",
Q_ARG(QMenu*, destinationMenu),
Q_ARG(const QString&, actionName),
Q_ARG(const QKeySequence&, shortcut),
Q_ARG(const QObject*, receiver),
Q_ARG(const char*, member)
);
}
void Menu::invokeRemoveAction(QMenu* menu, const QString& actionName) {
qDebug() << "about to call QMetaObject::invokeMethod(this, \"removeAction\"...)";
QMetaObject::invokeMethod(this, "removeAction",
Q_ARG(QMenu*, menu),
Q_ARG(const QString&, actionName)
);
}
**/

10
interface/src/Menu.h
View file

@ -56,7 +56,7 @@ class MetavoxelEditor;
class VoxelStatsDialog;
class MenuItemProperties;
class Menu : public QMenuBar /*, public AbstractMenuInterface*/ {
class Menu : public QMenuBar {
Q_OBJECT
public:
static Menu* getInstance();
@ -91,10 +91,6 @@ public:
// User Tweakable PPS from Voxel Server
int getMaxVoxelPacketsPerSecond() const { return _maxVoxelPacketsPerSecond; }
bool goToDestination(QString destination);
void goToOrientation(QString orientation);
void goToDomain(const QString newDomain);
QMenu* getActiveScriptsMenu() { return _activeScriptsMenu;}
QAction* addActionToQMenuAndActionHash(QMenu* destinationMenu,
@ -107,6 +103,10 @@ public:
void removeAction(QMenu* menu, const QString& actionName);
bool goToDestination(QString destination);
void goToOrientation(QString orientation);
void goToDomain(const QString newDomain);
public slots:
void loginForCurrentDomain();