@@ -49,7 +49,6 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
49
49
#include < QSortFilterProxyModel>
50
50
#include < QString>
51
51
#include < QtDebug>
52
- #include < questionboxmemory.h>
53
52
54
53
#include < algorithm>
55
54
#include < ctime>
@@ -1631,13 +1630,6 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
1631
1630
(m_ESPs.at (m_ESPsByPriority.at (newPriorityTemp)).isMasterFlagged ||
1632
1631
m_ESPs.at (m_ESPsByPriority.at (newPriorityTemp)).hasLightExtension ||
1633
1632
m_ESPs.at (m_ESPsByPriority.at (newPriorityTemp)).hasMasterExtension )) {
1634
-
1635
- QDialogButtonBox::StandardButton response = QuestionBoxMemory::query (
1636
- QApplication::activeModalWidget (), " dontAllowESPAboveESM" ,
1637
- tr (" Invalid plugin load order" ),
1638
- tr (" Plugins cannot be loaded among master plugins." ),
1639
- QDialogButtonBox::Ok);
1640
- qWarning (" Plugins cannot be loaded among master plugins." );
1641
1633
++newPriorityTemp;
1642
1634
}
1643
1635
} else {
@@ -1646,24 +1638,11 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
1646
1638
!m_ESPs.at (m_ESPsByPriority.at (newPriorityTemp)).isMasterFlagged &&
1647
1639
!m_ESPs.at (m_ESPsByPriority.at (newPriorityTemp)).hasLightExtension &&
1648
1640
!m_ESPs.at (m_ESPsByPriority.at (newPriorityTemp)).hasMasterExtension ) {
1649
-
1650
- QDialogButtonBox::StandardButton response = QuestionBoxMemory::query (
1651
- QApplication::activeModalWidget (), " dontAllowESMBelowESP" ,
1652
- tr (" Invalid plugin load order" ), tr (" Master plugins cannot be loaded among plugins." ),
1653
- QDialogButtonBox::Ok);
1654
- qWarning (" Master plugins cannot be loaded among plugins." );
1655
1641
--newPriorityTemp;
1656
1642
}
1657
1643
// also don't allow "regular" esms to be moved above primary plugins
1658
1644
while ((newPriorityTemp < static_cast <int >(m_ESPsByPriority.size () - 1 )) &&
1659
1645
(m_ESPs.at (m_ESPsByPriority.at (newPriorityTemp)).forceLoaded )) {
1660
- /* Doesn't work as expected
1661
- QDialogButtonBox::StandardButton response = QuestionBoxMemory::query(
1662
- QApplication::activeModalWidget(), "dontAllowESMabovePrimary",
1663
- tr("Invalid plugin load order"), tr(""),
1664
- QDialogButtonBox::Yes, QDialogButtonBox::Yes);
1665
- qWarning("");
1666
- */
1667
1646
++newPriorityTemp;
1668
1647
}
1669
1648
}
@@ -1676,12 +1655,6 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
1676
1655
if (iter != m_ESPsByName.end ()) {
1677
1656
int masterPriority = m_ESPs[iter->second ].priority ;
1678
1657
if (masterPriority >= newPriorityTemp) {
1679
-
1680
- QDialogButtonBox::StandardButton response = QuestionBoxMemory::query (
1681
- QApplication::activeModalWidget (), " dontAllowChildrenAboveMaster" ,
1682
- tr (" Invalid plugin load order" ), tr (" Plugins cannot be loaded before their masters." ),
1683
- QDialogButtonBox::Ok);
1684
- qWarning (" Plugins cannot be loaded before their masters." );
1685
1658
newPriorityTemp = masterPriority + 1 ;
1686
1659
}
1687
1660
}
@@ -1692,11 +1665,6 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
1692
1665
PluginList::ESPInfo* otherInfo = &m_ESPs.at (m_ESPsByPriority[i]);
1693
1666
for (auto master : otherInfo->masters ) {
1694
1667
if (master.compare (m_ESPs[row].name , Qt::CaseInsensitive) == 0 ) {
1695
- QDialogButtonBox::StandardButton response = QuestionBoxMemory::query (
1696
- QApplication::activeModalWidget (), " dontAllowMasterBelowChildren" ,
1697
- tr (" Invalid plugin load order" ), tr (" Masters cannot be moved below ones that require them." ),
1698
- QDialogButtonBox::Ok);
1699
- qWarning (" Masters cannot be moved below ones that require them." );
1700
1668
newPriorityTemp = otherInfo->priority - 1 ;
1701
1669
break ;
1702
1670
}
0 commit comments