refactorings

3 files changed, 11 insertions, 8 deletions

diff --git a/src/executableslist.cpp b/src/executableslist.cpp
index 9f0cd315..1852b0ad 100644
--- a/src/executableslist.cpp
+++ b/src/executableslist.cpp
@@ -21,6 +21,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <gameinfo.h>

 #include <QFileInfo>

 #include <QDir>

+#include <QDebug>

 #include "utility.h"

 #include <algorithm>

 

diff --git a/src/plugincontainer.cpp b/src/plugincontainer.cpp
index 6bc9d12b..738a4cec 100644
--- a/src/plugincontainer.cpp
+++ b/src/plugincontainer.cpp
@@ -140,12 +140,12 @@ bool PluginContainer::registerPlugin(QObject *plugin, const QString &fileName)
       bf::at_key<IPluginProxy>(m_Plugins).push_back(proxy);

       QStringList pluginNames = proxy->pluginList(

             QCoreApplication::applicationDirPath() + "/" + ToQString(AppConfig::pluginPath()));

-      foreach (const QString &pluginName, pluginNames) {

+      for (const QString &pluginName : pluginNames) {

         try {

           QObject *proxiedPlugin = proxy->instantiate(pluginName);

           if (proxiedPlugin != nullptr) {

             if (registerPlugin(proxiedPlugin, pluginName)) {

-              qDebug("loaded plugin \"%s\"", qPrintable(pluginName));

+              qDebug("loaded plugin \"%s\"", qPrintable(QFileInfo(pluginName).fileName()));

             } else {

               qWarning("plugin \"%s\" failed to load. If this plugin is for an older version of MO "

                        "you have to update it or delete it if no update exists.",

@@ -273,7 +273,7 @@ void PluginContainer::loadPlugins()
                   qPrintable(pluginName), qPrintable(pluginLoader->errorString()));

       } else {

         if (registerPlugin(pluginLoader->instance(), pluginName)) {

-          qDebug("loaded plugin \"%s\"", qPrintable(pluginName));

+          qDebug("loaded plugin \"%s\"", qPrintable(QFileInfo(pluginName).fileName()));

           m_PluginLoaders.push_back(pluginLoader);

         } else {

           m_FailedPlugins.push_back(pluginName);

diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp
index 002c7721..a1e694b4 100644
--- a/src/pluginlist.cpp
+++ b/src/pluginlist.cpp
@@ -509,14 +509,16 @@ bool PluginList::saveLoadOrder(DirectoryEntry &directoryStructure)
     return true;

   }

 

-  for (std::vector<ESPInfo>::iterator iter = m_ESPs.begin(); iter != m_ESPs.end(); ++iter) {

-    std::wstring espName = ToWString(iter->m_Name);

+  qDebug("setting file times on esps");

+

+  for (ESPInfo &esp : m_ESPs) {

+    std::wstring espName = ToWString(esp.m_Name);

     const FileEntry::Ptr fileEntry = directoryStructure.findFile(espName);

     if (fileEntry.get() != nullptr) {

       QString fileName;

       bool archive = false;

       int originid = fileEntry->getOrigin(archive);

-      fileName = QString("%1\\%2").arg(QDir::toNativeSeparators(ToQString(directoryStructure.getOriginByID(originid).getPath()))).arg(iter->m_Name);

+      fileName = QString("%1\\%2").arg(QDir::toNativeSeparators(ToQString(directoryStructure.getOriginByID(originid).getPath()))).arg(esp.m_Name);

 

       HANDLE file = ::CreateFile(ToWString(fileName).c_str(), GENERIC_READ | GENERIC_WRITE,

                                  0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);

@@ -530,13 +532,13 @@ bool PluginList::saveLoadOrder(DirectoryEntry &directoryStructure)
       }

 

       ULONGLONG temp = 0;

-      temp = (145731ULL + iter->m_Priority) * 24 * 60 * 60 * 10000000ULL;

+      temp = (145731ULL + esp.m_Priority) * 24 * 60 * 60 * 10000000ULL;

 

       FILETIME newWriteTime;

 

       newWriteTime.dwLowDateTime  = (DWORD)(temp & 0xFFFFFFFF);

       newWriteTime.dwHighDateTime = (DWORD)(temp >> 32);

-      iter->m_Time = newWriteTime;

+      esp.m_Time = newWriteTime;

       fileEntry->setFileTime(newWriteTime);

       if (!::SetFileTime(file, nullptr, nullptr, &newWriteTime)) {

         throw windows_error(QObject::tr("failed to set file time %1").arg(fileName).toUtf8().constData());