Skip to content

Commit 6e28cfa

Browse files
committed
Revert plugin warnings because they don't work correctly
1 parent 734e2e9 commit 6e28cfa

File tree

1 file changed

+0
-32
lines changed

1 file changed

+0
-32
lines changed

src/pluginlist.cpp

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
4949
#include <QSortFilterProxyModel>
5050
#include <QString>
5151
#include <QtDebug>
52-
#include <questionboxmemory.h>
5352

5453
#include <algorithm>
5554
#include <ctime>
@@ -1631,13 +1630,6 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
16311630
(m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isMasterFlagged ||
16321631
m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).hasLightExtension ||
16331632
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.");
16411633
++newPriorityTemp;
16421634
}
16431635
} else {
@@ -1646,24 +1638,11 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
16461638
!m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isMasterFlagged &&
16471639
!m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).hasLightExtension &&
16481640
!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.");
16551641
--newPriorityTemp;
16561642
}
16571643
// also don't allow "regular" esms to be moved above primary plugins
16581644
while ((newPriorityTemp < static_cast<int>(m_ESPsByPriority.size() - 1)) &&
16591645
(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-
*/
16671646
++newPriorityTemp;
16681647
}
16691648
}
@@ -1676,12 +1655,6 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
16761655
if (iter != m_ESPsByName.end()) {
16771656
int masterPriority = m_ESPs[iter->second].priority;
16781657
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.");
16851658
newPriorityTemp = masterPriority + 1;
16861659
}
16871660
}
@@ -1692,11 +1665,6 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
16921665
PluginList::ESPInfo* otherInfo = &m_ESPs.at(m_ESPsByPriority[i]);
16931666
for (auto master : otherInfo->masters) {
16941667
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.");
17001668
newPriorityTemp = otherInfo->priority - 1;
17011669
break;
17021670
}

0 commit comments

Comments
 (0)