Fixed a bug when opening a recent project that caused the user to be prompted... (d2ff5065) · Commits · aflab / astrogeology / ISIS3

isis/src/qisis/objs/Directory/OpenRecentProjectWorkOrder.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -145,6 +145,6 @@ namespace Isis {
		*/
		void OpenRecentProjectWorkOrder::execute() {
		project()->open(m_projectPath);
		//project()->setClean(true);
		project()->setClean(true);
		}
		}

isis/src/qisis/objs/Directory/OpenRecentProjectWorkOrder.h

+9 −5

Original line number	Diff line number	Diff line
		@@ -49,6 +49,10 @@ namespace Isis {
		* consecutively from the Recent Projects menu in the same
		* way that a user can open projects consecutively from
		* the File menu. References #4492.
		* @history 2017-11-07 Makayla Shepherd - Set the project state to clean after opening the
		* project so when the user opens a project from the recent projects
		* menu it does not ask the user to save on exit if the project has not
		* changed. Fixes # 5221.
		*/

isis/src/qisis/objs/ViewSubWindow/moc_ViewSubWindow.cpp

deleted100644 → 0

+0 −127

Original line number	Diff line number	Diff line
		/****************************************************************************
		** Meta object code from reading C++ file 'ViewSubWindow.h'
		**
		** Created by: The Qt Meta Object Compiler version 67 (Qt 5.7.1)
		**
		** WARNING! All changes made in this file will be lost!
		*****************************************************************************/

		#include "ViewSubWindow.h"
		#include <QtCore/qbytearray.h>
		#include <QtCore/qmetatype.h>
		#if !defined(Q_MOC_OUTPUT_REVISION)
		#error "The header file 'ViewSubWindow.h' doesn't include <QObject>."
		#elif Q_MOC_OUTPUT_REVISION != 67
		#error "This file was generated using the moc from 5.7.1. It"
		#error "cannot be used with the include files from this version of Qt."
		#error "(The moc has changed too much.)"
		#endif

		QT_BEGIN_MOC_NAMESPACE
		struct qt_meta_stringdata_Isis__ViewSubWindow_t {
		QByteArrayData data[3];
		char stringdata0[33];
		};
		#define QT_MOC_LITERAL(idx, ofs, len) \
		Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
		qptrdiff(offsetof(qt_meta_stringdata_Isis__ViewSubWindow_t, stringdata0) + ofs \
		- idx * sizeof(QByteArrayData)) \
		)
		static const qt_meta_stringdata_Isis__ViewSubWindow_t qt_meta_stringdata_Isis__ViewSubWindow = {
		{
		QT_MOC_LITERAL(0, 0, 19), // "Isis::ViewSubWindow"
		QT_MOC_LITERAL(1, 20, 11), // "closeWindow"
		QT_MOC_LITERAL(2, 32, 0) // ""

		},
		"Isis::ViewSubWindow\0closeWindow\0"
		};
		#undef QT_MOC_LITERAL

		static const uint qt_meta_data_Isis__ViewSubWindow[] = {

		// content:
		7, // revision
		0, // classname
		0, 0, // classinfo
		1, 14, // methods
		0, 0, // properties
		0, 0, // enums/sets
		0, 0, // constructors
		0, // flags
		1, // signalCount

		// signals: name, argc, parameters, tag, flags
		1, 0, 19, 2, 0x06 /* Public */,

		// signals: parameters
		QMetaType::Void,

		0 // eod
		};

		void Isis::ViewSubWindow::qt_static_metacall(QObject _o, QMetaObject::Call _c, int _id, void *_a)
		{
		if (_c == QMetaObject::InvokeMetaMethod) {
		ViewSubWindow _t = static_cast<ViewSubWindow >(_o);
		Q_UNUSED(_t)
		switch (_id) {
		case 0: _t->closeWindow(); break;
		default: ;
		}
		} else if (_c == QMetaObject::IndexOfMethod) {
		int result = reinterpret_cast<int >(_a[0]);
		void func = reinterpret_cast<void >(_a[1]);
		{
		typedef void (ViewSubWindow::*_t)();
		if (reinterpret_cast<_t >(func) == static_cast<_t>(&ViewSubWindow::closeWindow)) {
		*result = 0;
		return;
		}
		}
		}
		Q_UNUSED(_a);
		}

		const QMetaObject Isis::ViewSubWindow::staticMetaObject = {
		{ &QMainWindow::staticMetaObject, qt_meta_stringdata_Isis__ViewSubWindow.data,
		qt_meta_data_Isis__ViewSubWindow, qt_static_metacall, Q_NULLPTR, Q_NULLPTR}
		};


		const QMetaObject *Isis::ViewSubWindow::metaObject() const
		{
		return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
		}

		void Isis::ViewSubWindow::qt_metacast(const char _clname)
		{
		if (!_clname) return Q_NULLPTR;
		if (!strcmp(_clname, qt_meta_stringdata_Isis__ViewSubWindow.stringdata0))
		return static_cast<void>(const_cast< ViewSubWindow>(this));
		return QMainWindow::qt_metacast(_clname);
		}

		int Isis::ViewSubWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
		{
		_id = QMainWindow::qt_metacall(_c, _id, _a);
		if (_id < 0)
		return _id;
		if (_c == QMetaObject::InvokeMetaMethod) {
		if (_id < 1)
		qt_static_metacall(this, _c, _id, _a);
		_id -= 1;
		} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
		if (_id < 1)
		reinterpret_cast<int>(_a[0]) = -1;
		_id -= 1;
		}
		return _id;
		}

		// SIGNAL 0
		void Isis::ViewSubWindow::closeWindow()
		{
		QMetaObject::activate(this, &staticMetaObject, 0, Q_NULLPTR);
		}
		QT_END_MOC_NAMESPACE