summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/bbcode.cpp9
-rw-r--r--src/categories.cpp3
-rw-r--r--src/directoryrefresher.cpp4
-rw-r--r--src/downloadmanager.cpp21
-rw-r--r--src/editexecutablesdialog.cpp19
-rw-r--r--src/executableslist.cpp6
-rw-r--r--src/filerenamer.cpp7
-rw-r--r--src/icondelegate.cpp4
-rw-r--r--src/installationmanager.cpp2
-rw-r--r--src/instancemanager.cpp14
-rw-r--r--src/mainwindow.cpp50
-rw-r--r--src/moapplication.cpp5
-rw-r--r--src/modflagicondelegate.cpp4
-rw-r--r--src/modinfo.cpp2
-rw-r--r--src/modinfodialogesps.cpp7
-rw-r--r--src/modlist.cpp7
-rw-r--r--src/modlistsortproxy.cpp6
-rw-r--r--src/nexusinterface.cpp27
-rw-r--r--src/nxmaccessmanager.cpp2
-rw-r--r--src/organizercore.cpp46
-rw-r--r--src/plugincontainer.cpp11
-rw-r--r--src/pluginlist.cpp4
-rw-r--r--src/problemsdialog.cpp2
-rw-r--r--src/profile.cpp21
-rw-r--r--src/profilesdialog.cpp4
-rw-r--r--src/settings.cpp5
26 files changed, 161 insertions, 131 deletions
diff --git a/src/bbcode.cpp b/src/bbcode.cpp
index 323dd128..d9b7debd 100644
--- a/src/bbcode.cpp
+++ b/src/bbcode.cpp
@@ -18,13 +18,13 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
*/
#include "bbcode.h"
-
+#include <log.h>
#include <QRegExp>
#include <map>
-
namespace BBCode {
+namespace log = MOBase::log;
class BBCodeMap {
@@ -88,7 +88,7 @@ public:
return temp.replace(tagIter->second.first, QString("<font style=\"color: #%1;\">%2</font>").arg(color, content));
}
} else {
- qWarning("don't know how to deal with tag %s", qUtf8Printable(tagName));
+ log::warn("don't know how to deal with tag {}", tagName);
}
} else {
if (tagName == "*") {
@@ -99,8 +99,7 @@ public:
} else {
// expression doesn't match. either the input string is invalid
// or the expression is
- qWarning("%s doesn't match the expression for %s",
- qUtf8Printable(temp), qUtf8Printable(tagName));
+ log::warn("{} doesn't match the expression for {}", temp, tagName);
length = 0;
return QString();
}
diff --git a/src/categories.cpp b/src/categories.cpp
index 9e5fa9f7..8f9d3ad8 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -21,6 +21,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include <utility.h>
#include <report.h>
+#include <log.h>
#include <QObject>
#include <QFile>
@@ -294,7 +295,7 @@ bool CategoryFactory::isDecendantOf(int id, int parentID) const
return isDecendantOf(m_Categories[index].m_ParentID, parentID);
}
} else {
- qWarning("%d is no valid category id", id);
+ log::warn("{} is no valid category id", id);
return false;
}
}
diff --git a/src/directoryrefresher.cpp b/src/directoryrefresher.cpp
index 3ce4691b..87305599 100644
--- a/src/directoryrefresher.cpp
+++ b/src/directoryrefresher.cpp
@@ -127,7 +127,7 @@ void DirectoryRefresher::addModFilesToStructure(DirectoryEntry *directoryStructu
FilesOrigin &origin = directoryStructure->createOrigin(ToWString(modName), directoryW, priority);
for (const QString &filename : stealFiles) {
if (filename.isEmpty()) {
- qWarning("Trying to find file with no name");
+ log::warn("Trying to find file with no name");
continue;
}
QFileInfo fileInfo(filename);
@@ -143,7 +143,7 @@ void DirectoryRefresher::addModFilesToStructure(DirectoryEntry *directoryStructu
QString warnStr = fileInfo.absolutePath();
if (warnStr.isEmpty())
warnStr = filename;
- qWarning("file not found: %s", qUtf8Printable(warnStr));
+ log::warn("file not found: {}", warnStr);
}
}
} else {
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 648b102a..e3ceb261 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -924,7 +924,7 @@ void DownloadManager::queryInfo(int index)
DownloadInfo *info = m_ActiveDownloads[index];
if (info->m_FileInfo->repository != "Nexus") {
- qWarning("re-querying file info is currently only possible with Nexus");
+ log::warn("re-querying file info is currently only possible with Nexus");
return;
}
@@ -976,7 +976,7 @@ void DownloadManager::queryInfoMd5(int index)
DownloadInfo *info = m_ActiveDownloads[index];
if (info->m_FileInfo->repository != "Nexus") {
- qWarning("re-querying file info is currently only possible with Nexus");
+ log::warn("re-querying file info is currently only possible with Nexus");
return;
}
@@ -1016,7 +1016,7 @@ void DownloadManager::visitOnNexus(int index)
DownloadInfo *info = m_ActiveDownloads[index];
if (info->m_FileInfo->repository != "Nexus") {
- qWarning("Visiting mod page is currently only possible with Nexus");
+ log::warn("Visiting mod page is currently only possible with Nexus");
return;
}
@@ -1614,8 +1614,9 @@ void DownloadManager::nxmFilesAvailable(QString, int, QVariant userData, QVarian
}
} else {
if (info->m_FileInfo->fileID == 0) {
- qWarning("could not determine file id for %s (state %d)",
- qUtf8Printable(info->m_FileName), info->m_State);
+ log::warn(
+ "could not determine file id for {} (state {})",
+ info->m_FileName, info->m_State);
}
}
@@ -1999,7 +2000,7 @@ void DownloadManager::downloadFinished(int index)
resumeDownloadInt(index);
}
} else {
- qWarning("no download index %d", index);
+ log::warn("no download index {}", index);
}
}
@@ -2008,9 +2009,9 @@ void DownloadManager::downloadError(QNetworkReply::NetworkError error)
{
if (error != QNetworkReply::OperationCanceledError) {
QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
- qWarning("%s (%d)", reply != nullptr ? qUtf8Printable(reply->errorString())
- : "Download error occured",
- error);
+ log::warn("{} ({})",
+ reply != nullptr ? reply->errorString() : "Download error occured",
+ error);
}
}
@@ -2033,7 +2034,7 @@ void DownloadManager::metaDataChanged()
}
}
} else {
- qWarning("meta data event for unknown download");
+ log::warn("meta data event for unknown download");
}
}
diff --git a/src/editexecutablesdialog.cpp b/src/editexecutablesdialog.cpp
index 8929d207..3ec3d64f 100644
--- a/src/editexecutablesdialog.cpp
+++ b/src/editexecutablesdialog.cpp
@@ -101,9 +101,7 @@ ExecutablesList EditExecutablesDialog::getExecutablesList() const
auto itor = m_executablesList.find(title);
if (itor == m_executablesList.end()) {
- qWarning().nospace()
- << "getExecutablesList(): executable '" << title << "' not found";
-
+ log::warn("getExecutablesList(): executable '{}' not found", title);
continue;
}
@@ -293,9 +291,10 @@ void EditExecutablesDialog::setEdits(const Executable& e)
modIndex = ui->mods->findText(modName->value);
if (modIndex == -1) {
- qWarning().nospace()
- << "executable '" << e.title() << "' uses mod '" << modName->value << "' "
- << "as a custom overwrite, but that mod doesn't exist";
+ log::warn(
+ "executable '{}' uses mod '{}' as a custom overwrite, but that mod "
+ "doesn't exist",
+ e.title(), modName->value);
}
}
@@ -335,7 +334,7 @@ void EditExecutablesDialog::save()
auto* e = selectedExe();
if (!e) {
- qWarning("trying to save but nothing is selected");
+ log::warn("trying to save but nothing is selected");
return;
}
@@ -475,13 +474,13 @@ void EditExecutablesDialog::on_remove_clicked()
{
auto* item = selectedItem();
if (!item) {
- qWarning("trying to remove entry but nothing is selected");
+ log::warn("trying to remove entry but nothing is selected");
return;
}
auto* exe = selectedExe();
if (!exe) {
- qWarning("trying to remove entry but nothing is selected");
+ log::warn("trying to remove entry but nothing is selected");
return;
}
@@ -646,7 +645,7 @@ void EditExecutablesDialog::on_configureLibraries_clicked()
{
auto* e = selectedExe();
if (!e) {
- qWarning("trying to configure libraries but nothing is selected");
+ log::warn("trying to configure libraries but nothing is selected");
return;
}
diff --git a/src/executableslist.cpp b/src/executableslist.cpp
index 0ca880cd..fbb96bd4 100644
--- a/src/executableslist.cpp
+++ b/src/executableslist.cpp
@@ -250,9 +250,9 @@ void ExecutablesList::setExecutable(const Executable &exe, SetFlags flags)
return;
}
- qWarning().nospace()
- << "executable '" << itor->title() << "' was in the way and was "
- << "renamed to '" << *newTitle << "'";
+ log::warn(
+ "executable '{}' was in the way and was renamed to '{}'",
+ itor->title(), *newTitle);
itor->title(*newTitle);
itor = end();
diff --git a/src/filerenamer.cpp b/src/filerenamer.cpp
index c5c6782b..b516c902 100644
--- a/src/filerenamer.cpp
+++ b/src/filerenamer.cpp
@@ -1,7 +1,10 @@
#include "filerenamer.h"
+#include <log.h>
#include <QMessageBox>
#include <QFileInfo>
+using namespace MOBase;
+
FileRenamer::FileRenamer(QWidget* parent, QFlags<RenameFlags> flags)
: m_parent(parent), m_flags(flags)
{
@@ -34,7 +37,7 @@ FileRenamer::RenameResults FileRenamer::rename(const QString& oldName, const QSt
qDebug().nospace() << "removing " << newName;
// user wants to replace the file, so remove it
if (!QFile(newName).remove()) {
- qWarning().nospace() << "failed to remove " << newName;
+ log::warn("failed to remove '{}'", newName);
// removal failed, warn the user and allow canceling
if (!removeFailed(newName)) {
qDebug().nospace() << "canceling " << oldName;
@@ -62,7 +65,7 @@ FileRenamer::RenameResults FileRenamer::rename(const QString& oldName, const QSt
// target either didn't exist or was removed correctly
if (!QFile::rename(oldName, newName)) {
- qWarning().nospace() << "failed to rename " << oldName << " to " << newName;
+ log::warn("failed to rename '{}' to '{}'", oldName, newName);
// renaming failed, warn the user and allow canceling
if (!renameFailed(oldName, newName)) {
diff --git a/src/icondelegate.cpp b/src/icondelegate.cpp
index 249dae6f..39038f3c 100644
--- a/src/icondelegate.cpp
+++ b/src/icondelegate.cpp
@@ -18,12 +18,14 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
*/
#include "icondelegate.h"
+#include <log.h>
#include <QHBoxLayout>
#include <QLabel>
#include <QPainter>
#include <QDebug>
#include <QPixmapCache>
+using namespace MOBase;
IconDelegate::IconDelegate(QObject *parent)
: QStyledItemDelegate(parent)
@@ -54,7 +56,7 @@ void IconDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
if (!QPixmapCache::find(fullIconId, &icon)) {
icon = QIcon(iconId).pixmap(iconWidth, iconWidth);
if (icon.isNull()) {
- qWarning("failed to load icon %s", qUtf8Printable(iconId));
+ log::warn("failed to load icon {}", iconId);
}
QPixmapCache::insert(fullIconId, icon);
}
diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index e443a8f2..0e50de52 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -693,7 +693,7 @@ void InstallationManager::postInstallCleanup()
QFile::setPermissions(fileInfo.absoluteFilePath(), QFile::ReadOther | QFile::WriteOther);
}
if (!QFile::remove(fileInfo.absoluteFilePath())) {
- qWarning() << "Unable to delete " << fileInfo.absoluteFilePath();
+ log::warn("Unable to delete {}", fileInfo.absoluteFilePath());
}
}
directoriesToRemove.insert(fileInfo.absolutePath());
diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp
index ddc2d067..55ef3fc8 100644
--- a/src/instancemanager.cpp
+++ b/src/instancemanager.cpp
@@ -21,6 +21,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include "instancemanager.h"
#include "selectiondialog.h"
#include <utility.h>
+#include <log.h>
#include <appconfig.h>
#include <QCoreApplication>
#include <QDir>
@@ -29,13 +30,13 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include <QMessageBox>
#include <cstdint>
+using namespace MOBase;
static const char COMPANY_NAME[] = "Tannin";
static const char APPLICATION_NAME[] = "Mod Organizer";
static const char INSTANCE_KEY[] = "CurrentInstance";
-
InstanceManager::InstanceManager()
: m_AppSettings(COMPANY_NAME, APPLICATION_NAME)
{
@@ -86,10 +87,13 @@ bool InstanceManager::deleteLocalInstance(const QString &instanceId) const
if (!MOBase::shellDelete(QStringList(instancePath),true))
{
- qWarning("Failed to shell-delete \"%s\" (errorcode %lu), trying regular delete", qUtf8Printable(instancePath), ::GetLastError());
+ log::warn(
+ "Failed to shell-delete \"{}\" (errorcode {}), trying regular delete",
+ instancePath, ::GetLastError());
+
if (!MOBase::removeDir(instancePath))
{
- qWarning("regular delete failed too");
+ log::warn("regular delete failed too");
result = false;
}
}
@@ -153,7 +157,7 @@ QString InstanceManager::queryInstanceName(const QStringList &instanceList) cons
dialogText = dialog.textValue();
instanceId = sanitizeInstanceName(dialogText);
if (instanceId != dialogText) {
- if (QMessageBox::question( nullptr,
+ if (QMessageBox::question( nullptr,
QObject::tr("Invalid instance name"),
QObject::tr("The instance name \"%1\" is invalid. Use the name \"%2\" instead?").arg(dialogText,instanceId),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) {
@@ -323,7 +327,7 @@ QString InstanceManager::sanitizeInstanceName(const QString &name) const
// Don't end in spaces and periods
new_name = new_name.remove(QRegExp("\\.*$"));
new_name = new_name.remove(QRegExp(" *$"));
-
+
// Recurse until stuff stops changing
if (new_name != name) {
return sanitizeInstanceName(new_name);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9dbada1c..70ace8f1 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -800,7 +800,7 @@ void MainWindow::setupToolbar()
ui->toolBar->insertWidget(m_linksSeparator, spacer);
} else {
- qWarning("no separator found on the toolbar, icons won't be right-aligned");
+ log::warn("no separator found on the toolbar, icons won't be right-aligned");
}
}
@@ -1646,9 +1646,7 @@ void MainWindow::startExeAction()
auto itor = list.find(title);
if (itor == list.end()) {
- qWarning().nospace()
- << "startExeAction(): executable '" << title << "' not found";
-
+ log::warn("startExeAction(): executable '{}' not found", title);
return;
}
@@ -1874,17 +1872,18 @@ void MainWindow::expandDataTreeItem(QTreeWidgetItem *item)
if ((item->childCount() == 1) && (item->child(0)->data(0, Qt::UserRole).toString() == "__loaded_on_demand__")) {
// read the data we need from the sub-item, then dispose of it
QTreeWidgetItem *onDemandDataItem = item->child(0);
- std::wstring path = ToWString(onDemandDataItem->data(0, Qt::UserRole + 1).toString());
+ const QString path = onDemandDataItem->data(0, Qt::UserRole + 1).toString();
+ std::wstring wspath = path.toStdWString();
bool conflictsOnly = onDemandDataItem->data(0, Qt::UserRole + 2).toBool();
- std::wstring virtualPath = (path + L"\\").substr(6) + ToWString(item->text(0));
+ std::wstring virtualPath = (wspath + L"\\").substr(6) + ToWString(item->text(0));
DirectoryEntry *dir = m_OrganizerCore.directoryStructure()->findSubDirectoryRecursive(virtualPath);
if (dir != nullptr) {
QIcon folderIcon = (new QFileIconProvider())->icon(QFileIconProvider::Folder);
QIcon fileIcon = (new QFileIconProvider())->icon(QFileIconProvider::File);
- updateTo(item, path, *dir, conflictsOnly, &fileIcon, &folderIcon);
+ updateTo(item, wspath, *dir, conflictsOnly, &fileIcon, &folderIcon);
} else {
- qWarning("failed to update view of %ls", path.c_str());
+ log::warn("failed to update view of {}", path);
}
m_RemoveWidget.push_back(item);
QTimer::singleShot(5, this, SLOT(delayedRemove()));
@@ -2380,10 +2379,17 @@ void MainWindow::processUpdates() {
if (currentVersion > lastVersion) {
//NOP
- } else if (currentVersion < lastVersion)
- qWarning() << tr("Notice: Your current MO version (%1) is lower than the previously used one (%2). "
- "The GUI may not downgrade gracefully, so you may experience oddities. "
- "However, there should be no serious issues.").arg(currentVersion.toString()).arg(lastVersion.toString()).toStdWString();
+ } else if (currentVersion < lastVersion) {
+ const auto text = tr(
+ "Notice: Your current MO version (%1) is lower than the previously used one (%2). "
+ "The GUI may not downgrade gracefully, so you may experience oddities. "
+ "However, there should be no serious issues.")
+ .arg(currentVersion.toString())
+ .arg(lastVersion.toString());
+
+ log::warn("{}", text);
+ }
+
//save version in all case
settings.setValue("version", currentVersion.toString());
}
@@ -2924,7 +2930,7 @@ void MainWindow::refreshFilters()
while (currentID != 0) {
categoriesUsed.insert(currentID);
if (!cycleTest.insert(currentID).second) {
- qWarning("cycle in categories: %s", qUtf8Printable(SetJoin(cycleTest, ", ")));
+ log::warn("cycle in categories: {}", SetJoin(cycleTest, ", "));
break;
}
currentID = m_CategoryFactory.getParentID(m_CategoryFactory.getCategoryIndex(currentID));
@@ -4008,7 +4014,7 @@ void MainWindow::moveOverwriteContentToExistingMod()
}
if (modAbsolutePath.isNull()) {
- qWarning("Mod %s has not been found, for some reason", qUtf8Printable(result));
+ log::warn("Mod {} has not been found, for some reason", result);
return;
}
@@ -4404,7 +4410,7 @@ void MainWindow::saveArchiveList()
qDebug("%s saved", qUtf8Printable(QDir::toNativeSeparators(m_OrganizerCore.currentProfile()->getArchivesFileName())));
}
} else {
- qWarning("archive list not initialised");
+ log::warn("archive list not initialised");
}
}
@@ -4421,7 +4427,7 @@ void MainWindow::checkModsForUpdates()
m_OrganizerCore.doAfterLogin([this] () { this->checkModsForUpdates(); });
NexusInterface::instance(&m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
} else {
- qWarning("You are not currently authenticated with Nexus. Please do so under Settings -> Nexus.");
+ log::warn("You are not currently authenticated with Nexus. Please do so under Settings -> Nexus.");
}
}
@@ -5802,7 +5808,7 @@ void MainWindow::modUpdateCheck(std::multimap<QString, int> IDs)
m_OrganizerCore.doAfterLogin([=]() { this->modUpdateCheck(IDs); });
NexusInterface::instance(&m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
} else
- qWarning("You are not currently authenticated with Nexus. Please do so under Settings -> Nexus.");
+ log::warn("You are not currently authenticated with Nexus. Please do so under Settings -> Nexus.");
}
}
@@ -5918,7 +5924,7 @@ void MainWindow::finishUpdateInfo()
}
if (!finalMods.empty() && organizedGames.empty())
- qWarning("All of your mods have been checked recently. We restrict update checks to help preserve your available API requests.");
+ log::warn("All of your mods have been checked recently. We restrict update checks to help preserve your available API requests.");
for (auto game : organizedGames)
NexusInterface::instance(&m_PluginContainer)->requestUpdates(game.second, this, QVariant(), game.first, QString());
@@ -6368,9 +6374,7 @@ void MainWindow::removeFromToolbar()
auto itor = list.find(title);
if (itor == list.end()) {
- qWarning().nospace()
- << "removeFromToolbar(): executable '" << title << "' not found";
-
+ log::warn("removeFromToolbar(): executable '{}' not found", title);
return;
}
@@ -6570,7 +6574,7 @@ void MainWindow::processLOOTOut(const std::string &lootOut, std::string &errorMe
if (progidx != std::string::npos) {
dialog.setLabelText(line.substr(progidx + 11).c_str());
} else if (erroridx != std::string::npos) {
- qWarning("%s", line.c_str());
+ log::warn("{}", line);
errorMessages.append(boost::algorithm::trim_copy(line.substr(erroridx + 8)) + "\n");
} else {
std::smatch match;
@@ -6928,7 +6932,7 @@ void MainWindow::dropLocalFile(const QUrl &url, const QString &outputDir, bool m
{
QFileInfo file(url.toLocalFile());
if (!file.exists()) {
- qWarning("invalid source file: %s", qUtf8Printable(file.absoluteFilePath()));
+ log::warn("invalid source file: {}", file.absoluteFilePath());
return;
}
QString target = outputDir + "/" + file.fileName();
diff --git a/src/moapplication.cpp b/src/moapplication.cpp
index 5652833a..3d55b28d 100644
--- a/src/moapplication.cpp
+++ b/src/moapplication.cpp
@@ -20,6 +20,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include "moapplication.h"
#include <report.h>
#include <utility.h>
+#include <log.h>
#include <appconfig.h>
#include <QFile>
#include <QStringList>
@@ -36,7 +37,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include <QDebug>
-using MOBase::reportError;
+using namespace MOBase;
class ProxyStyle : public QProxyStyle {
@@ -137,7 +138,7 @@ void MOApplication::updateStyle(const QString &fileName)
if (QFile::exists(fileName)) {
setStyleSheet(QString("file:///%1").arg(fileName));
} else {
- qWarning("invalid stylesheet: %s", qUtf8Printable(fileName));
+ log::warn("invalid stylesheet: {}", fileName);
}
}
}
diff --git a/src/modflagicondelegate.cpp b/src/modflagicondelegate.cpp
index c3142962..7110a590 100644
--- a/src/modflagicondelegate.cpp
+++ b/src/modflagicondelegate.cpp
@@ -1,6 +1,8 @@
#include "modflagicondelegate.h"
+#include <log.h>
#include <QList>
+using namespace MOBase;
ModInfo::EFlag ModFlagIconDelegate::m_ConflictFlags[4] = { ModInfo::FLAG_CONFLICT_MIXED
, ModInfo::FLAG_CONFLICT_OVERWRITE
@@ -117,7 +119,7 @@ QString ModFlagIconDelegate::getFlagIcon(ModInfo::EFlag flag) const
case ModInfo::FLAG_PLUGIN_SELECTED: return QString();
case ModInfo::FLAG_TRACKED: return QStringLiteral(":/MO/gui/tracked");
default:
- qWarning("ModInfo flag %d has no defined icon", flag);
+ log::warn("ModInfo flag {} has no defined icon", flag);
return QString();
}
}
diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index 92c7366c..ca6e8046 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -320,7 +320,7 @@ bool ModInfo::checkAllForUpdate(PluginContainer *pluginContainer, QObject *recei
}
if (organizedGames.empty()) {
- qWarning() << tr("All of your mods have been checked recently. We restrict update checks to help preserve your available API requests.");
+ log::warn("{}", tr("All of your mods have been checked recently. We restrict update checks to help preserve your available API requests."));
updatesAvailable = false;
} else {
log::info("{}", tr(
diff --git a/src/modinfodialogesps.cpp b/src/modinfodialogesps.cpp
index fba5d39a..3130b4bd 100644
--- a/src/modinfodialogesps.cpp
+++ b/src/modinfodialogesps.cpp
@@ -3,8 +3,9 @@
#include "modinfodialog.h"
#include "settings.h"
#include <report.h>
+#include <log.h>
-using MOBase::reportError;
+using namespace MOBase;
class ESPItem
{
@@ -297,7 +298,7 @@ void ESPsTab::onActivate()
}
if (esp->isActive()) {
- qWarning("ESPsTab::onActive(): item is already active");
+ log::warn("ESPsTab::onActive(): item is already active");
return;
}
@@ -348,7 +349,7 @@ void ESPsTab::onDeactivate()
}
if (!esp->isActive()) {
- qWarning("ESPsTab::onDeactivate(): item is already inactive");
+ log::warn("ESPsTab::onDeactivate(): item is already inactive");
return;
}
diff --git a/src/modlist.cpp b/src/modlist.cpp
index 7b71355c..df25df0d 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -275,7 +275,7 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const
return QString();
}
} else {
- qWarning("category %d doesn't exist (may have been removed)", category);
+ log::warn("category {} doesn't exist (may have been removed)", category);
modInfo->setCategory(category, false);
return QString();
}
@@ -618,8 +618,9 @@ bool ModList::setData(const QModelIndex &index, const QVariant &value, int role)
result = true;
} break;
default: {
- qWarning("edit on column \"%s\" not supported",
- getColumnName(index.column()).toUtf8().constData());
+ log::warn(
+ "edit on column \"{}\" not supported",
+ getColumnName(index.column()).toUtf8().constData());
result = false;
} break;
}
diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp
index 2d9ea4a5..1127c7d4 100644
--- a/src/modlistsortproxy.cpp
+++ b/src/modlistsortproxy.cpp
@@ -22,6 +22,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include "profile.h"
#include "messagedialog.h"
#include "qtgroupingproxy.h"
+#include <log.h>
#include <QMenu>
#include <QCheckBox>
#include <QWidgetAction>
@@ -30,6 +31,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include <QDebug>
#include <QTreeView>
+using namespace MOBase;
ModListSortProxy::ModListSortProxy(Profile* profile, QObject *parent)
: QSortFilterProxyModel(parent)
@@ -240,7 +242,7 @@ bool ModListSortProxy::lessThan(const QModelIndex &left,
// nop, already compared by priority
} break;
default: {
- qWarning() << "Sorting is not defined for column " << left.column();
+ log::warn("Sorting is not defined for column {}", left.column());
} break;
}
return lt;
@@ -474,7 +476,7 @@ bool ModListSortProxy::filterAcceptsRow(int row, const QModelIndex &parent) cons
}
if (row >= static_cast<int>(m_Profile->numMods())) {
- qWarning("invalid row index: %d", row);
+ log::warn("invalid row index: {}", row);
return false;
}
diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
index 2bcd72f3..008f3c0d 100644
--- a/src/nexusinterface.cpp
+++ b/src/nexusinterface.cpp
@@ -25,6 +25,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include "bbcode.h"
#include <utility.h>
#include <util.h>
+#include <log.h>
#include <QApplication>
#include <QNetworkCookieJar>
@@ -695,9 +696,13 @@ void NexusInterface::nextRequest()
QTime time = QTime::currentTime();
QTime targetTime;
targetTime.setHMS((time.hour() + 1) % 23, 5, 0);
- QString warning = tr("You've exceeded the Nexus API rate limit and requests are now being throttled. "
- "Your next batch of requests will be available in approximately %1 minutes and %2 seconds.");
- qWarning() << warning.arg(time.secsTo(targetTime) / 60).arg(time.secsTo(targetTime) % 60);
+ QString warning = tr(
+ "You've exceeded the Nexus API rate limit and requests are now being throttled. "
+ "Your next batch of requests will be available in approximately %1 minutes and %2 seconds.")
+ .arg(time.secsTo(targetTime) / 60)
+ .arg(time.secsTo(targetTime) % 60);
+
+ log::warn("{}", warning);
return;
}
@@ -747,8 +752,8 @@ void NexusInterface::nextRequest()
url = QString("%1/games/%2/mods/%3/files/%4/download_link?key=%5&expires=%6")
.arg(info.m_URL).arg(info.m_GameName).arg(info.m_ModID).arg(info.m_FileID).arg(fileInfo->nexusKey).arg(fileInfo->nexusExpires);
} else {
- qWarning() << tr("Aborting download: Either you clicked on a premium-only link and your account is not premium, "
- "or the download link was generated by a different account than the one stored in Mod Organizer.");
+ log::warn("{}", tr("Aborting download: Either you clicked on a premium-only link and your account is not premium, "
+ "or the download link was generated by a different account than the one stored in Mod Organizer."));
return;
}
} break;
@@ -828,16 +833,16 @@ void NexusInterface::requestFinished(std::list<NXMRequestInfo>::iterator iter)
m_User.limits(parseLimits(reply));
if (!m_User.exhausted()) {
- qWarning("You appear to be making requests to the Nexus API too quickly and are being throttled. Please inform the MO2 team.");
+ log::warn("You appear to be making requests to the Nexus API too quickly and are being throttled. Please inform the MO2 team.");
}
else {
- qWarning("All API requests have been consumed and are now being denied.");
+ log::warn("All API requests have been consumed and are now being denied.");
}
emit requestsChanged(getAPIStats(), m_User);
- qWarning("Error: %s", reply->errorString().toUtf8().constData());
+ log::warn("Error: {}", reply->errorString());
} else {
- qWarning("request failed: %s", reply->errorString().toUtf8().constData());
+ log::warn("request failed: {}", reply->errorString());
}
emit nxmRequestFailed(iter->m_GameName, iter->m_ModID, iter->m_FileID, iter->m_UserData, iter->m_ID, reply->error(), reply->errorString());
} else {
@@ -940,7 +945,7 @@ void NexusInterface::requestError(QNetworkReply::NetworkError)
{
QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
if (reply == nullptr) {
- qWarning("invalid sender type");
+ log::warn("invalid sender type");
return;
}
@@ -955,7 +960,7 @@ void NexusInterface::requestTimeout()
{
QTimer *timer = qobject_cast<QTimer*>(sender());
if (timer == nullptr) {
- qWarning("invalid sender type");
+ log::warn("invalid sender type");
return;
}
for (std::list<NXMRequestInfo>::iterator iter = m_ActiveRequest.begin(); iter != m_ActiveRequest.end(); ++iter) {
diff --git a/src/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp
index c413e156..9f40894e 100644
--- a/src/nxmaccessmanager.cpp
+++ b/src/nxmaccessmanager.cpp
@@ -612,7 +612,7 @@ void NXMAccessManager::clearCookies()
if (jar != nullptr) {
jar->clear();
} else {
- qWarning("failed to clear cookies, invalid cookie jar");
+ log::warn("failed to clear cookies, invalid cookie jar");
}
}
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 400f5391..dbff1a2a 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -200,26 +200,26 @@ bool checkService()
try {
serviceManagerHandle = OpenSCManager(NULL, NULL, SERVICE_QUERY_STATUS | SERVICE_QUERY_CONFIG);
if (!serviceManagerHandle) {
- qWarning("failed to open service manager (query status) (error %d)", GetLastError());
+ log::warn("failed to open service manager (query status) (error {})", GetLastError());
throw 1;
}
serviceHandle = OpenService(serviceManagerHandle, L"EventLog", SERVICE_QUERY_STATUS | SERVICE_QUERY_CONFIG);
if (!serviceHandle) {
- qWarning("failed to open EventLog service (query status) (error %d)", GetLastError());
+ log::warn("failed to open EventLog service (query status) (error {})", GetLastError());
throw 2;
}
if (QueryServiceConfig(serviceHandle, NULL, 0, &bytesNeeded)
|| (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) {
- qWarning("failed to get size of service config (error %d)", GetLastError());
+ log::warn("failed to get size of service config (error {})", GetLastError());
throw 3;
}
DWORD serviceConfigSize = bytesNeeded;
serviceConfig = (LPQUERY_SERVICE_CONFIG)LocalAlloc(LMEM_FIXED, serviceConfigSize);
if (!QueryServiceConfig(serviceHandle, serviceConfig, serviceConfigSize, &bytesNeeded)) {
- qWarning("failed to query service config (error %d)", GetLastError());
+ log::warn("failed to query service config (error {})", GetLastError());
throw 4;
}
@@ -230,14 +230,14 @@ bool checkService()
if (QueryServiceStatusEx(serviceHandle, SC_STATUS_PROCESS_INFO, NULL, 0, &bytesNeeded)
|| (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) {
- qWarning("failed to get size of service status (error %d)", GetLastError());
+ log::warn("failed to get size of service status (error {})", GetLastError());
throw 5;
}
DWORD serviceStatusSize = bytesNeeded;
serviceStatus = (LPSERVICE_STATUS_PROCESS)LocalAlloc(LMEM_FIXED, serviceStatusSize);
if (!QueryServiceStatusEx(serviceHandle, SC_STATUS_PROCESS_INFO, (LPBYTE)serviceStatus, serviceStatusSize, &bytesNeeded)) {
- qWarning("failed to query service status (error %d)", GetLastError());
+ log::warn("failed to query service status (error {})", GetLastError());
throw 6;
}
@@ -402,8 +402,9 @@ void OrganizerCore::storeSettings()
if (result == QSettings::NoError) {
QString errMsg = commitSettings(iniFile);
if (!errMsg.isEmpty()) {
- qWarning("settings file not writable, may be locked by another "
- "application, trying direct write");
+ log::warn(
+ "settings file not writable, may be locked by another "
+ "application, trying direct write");
writeTarget = iniFile;
result = storeSettings(iniFile);
}
@@ -1381,9 +1382,9 @@ bool OrganizerCore::previewFileWithAlternatives(
// sanity check, this shouldn't happen unless the caller passed an
// incorrect id
- qWarning().nospace()
- << "selected preview origin " << selectedOrigin << " not found in "
- << "list of alternatives";
+ log::warn(
+ "selected preview origin {} not found in list of alternatives",
+ selectedOrigin);
}
for (int id : origins) {
@@ -1798,8 +1799,7 @@ HANDLE OrganizerCore::startApplication(const QString &executable,
currentDirectory = exe.workingDirectory();
}
} catch (const std::runtime_error &) {
- qWarning("\"%s\" not set up as executable",
- qUtf8Printable(executable));
+ log::warn("\"{}\" not set up as executable", executable);
binary = QFileInfo(executable);
}
}
@@ -1881,7 +1881,7 @@ bool OrganizerCore::waitForProcessCompletion(HANDLE handle, LPDWORD exitCode, IL
// Wait for a an event on the handle, a key press, mouse click or timeout
res = MsgWaitForMultipleObjects(1, &handle, FALSE, 200, QS_KEY | QS_MOUSEBUTTON);
if (res == WAIT_FAILED) {
- qWarning() << "Failed waiting for process completion : MsgWaitForMultipleObjects WAIT_FAILED" << GetLastError();
+ log::warn("Failed waiting for process completion : MsgWaitForMultipleObjects WAIT_FAILED {}", GetLastError());
break;
}
@@ -1897,7 +1897,7 @@ bool OrganizerCore::waitForProcessCompletion(HANDLE handle, LPDWORD exitCode, IL
if (res == WAIT_OBJECT_0) {
// process we were waiting on has completed
if (originalHandle && exitCode && !::GetExitCodeProcess(handle, exitCode))
- qWarning() << "Failed getting exit code of complete process :" << GetLastError();
+ log::warn("Failed getting exit code of complete process: {}", GetLastError());
CloseHandle(handle);
handle = INVALID_HANDLE_VALUE;
originalHandle = false;
@@ -1962,7 +1962,7 @@ HANDLE OrganizerCore::findAndOpenAUSVFSProcess(const std::vector<QString>& hidde
DWORD pids[querySize];
size_t found = querySize;
if (!::GetVFSProcessList(&found, pids)) {
- qWarning() << "Failed seeking USVFS processes : GetVFSProcessList failed?!";
+ log::warn("Failed seeking USVFS processes : GetVFSProcessList failed?!");
return INVALID_HANDLE_VALUE;
}
@@ -1974,7 +1974,7 @@ HANDLE OrganizerCore::findAndOpenAUSVFSProcess(const std::vector<QString>& hidde
HANDLE handle = ::OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION | SYNCHRONIZE, FALSE, pids[i]);
if (handle == INVALID_HANDLE_VALUE) {
- qWarning() << "Failed openning USVFS process " << pids[i] << " : OpenProcess failed" << GetLastError();
+ log::warn("Failed opening USVFS process {}: OpenProcess failed {}", pids[i], GetLastError());
continue;
}
@@ -2118,7 +2118,7 @@ void OrganizerCore::updateModsActiveState(const QList<unsigned int> &modIndices,
dir.entryList(QStringList() << "*.esm", QDir::Files)) {
const FileEntry::Ptr file = m_DirectoryStructure->findFile(ToWString(esm));
if (file.get() == nullptr) {
- qWarning("failed to activate %s", qUtf8Printable(esm));
+ log::warn("failed to activate {}", esm);
continue;
}
@@ -2134,7 +2134,7 @@ void OrganizerCore::updateModsActiveState(const QList<unsigned int> &modIndices,
dir.entryList(QStringList() << "*.esl", QDir::Files)) {
const FileEntry::Ptr file = m_DirectoryStructure->findFile(ToWString(esl));
if (file.get() == nullptr) {
- qWarning("failed to activate %s", qUtf8Printable(esl));
+ log::warn("failed to activate {}", esl);
continue;
}
@@ -2150,7 +2150,7 @@ void OrganizerCore::updateModsActiveState(const QList<unsigned int> &modIndices,
for (const QString &esp : esps) {
const FileEntry::Ptr file = m_DirectoryStructure->findFile(ToWString(esp));
if (file.get() == nullptr) {
- qWarning("failed to activate %s", qUtf8Printable(esp));
+ log::warn("failed to activate {}", esp);
continue;
}
@@ -2558,7 +2558,7 @@ std::vector<unsigned int> OrganizerCore::activeProblems() const
// of a "log spam". But since this is a sevre error which will most likely make the
// game crash/freeze/etc. and is very hard to diagnose, this "log spam" will make it
// easier for the user to notice the warning.
- qWarning("hook.dll found in game folder: %s", qUtf8Printable(hookdll));
+ log::warn("hook.dll found in game folder: {}", hookdll);
problems.push_back(PROBLEM_MO1SCRIPTEXTENDERWORKAROUND);
}
return problems;
@@ -2604,7 +2604,7 @@ void OrganizerCore::startGuidedFix(unsigned int) const
bool OrganizerCore::saveCurrentLists()
{
if (m_DirectoryUpdate) {
- qWarning("not saving lists during directory update");
+ log::warn("not saving lists during directory update");
return false;
}
@@ -2698,7 +2698,7 @@ std::vector<Mapping> OrganizerCore::fileMapping(const QString &profileName,
result.reserve(result.size() + saveMap.size());
result.insert(result.end(), saveMap.begin(), saveMap.end());
} else {
- qWarning("local save games not supported by this game plugin");
+ log::warn("local save games not supported by this game plugin");
}
}
diff --git a/src/plugincontainer.cpp b/src/plugincontainer.cpp
index 2126c5ef..d47fa2c6 100644
--- a/src/plugincontainer.cpp
+++ b/src/plugincontainer.cpp
@@ -69,7 +69,7 @@ bool PluginContainer::verifyPlugin(IPlugin *plugin)
if (plugin == nullptr) {
return false;
} else if (!plugin->init(new OrganizerProxy(m_Organizer, this, plugin->name()))) {
- qWarning("plugin failed to initialize");
+ log::warn("plugin failed to initialize");
return false;
}
return true;
@@ -167,9 +167,10 @@ bool PluginContainer::registerPlugin(QObject *plugin, const QString &fileName)
qDebug("loaded plugin \"%s\"", qUtf8Printable(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.",
- qUtf8Printable(pluginName));
+ log::warn(
+ "plugin \"{}\" 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.",
+ pluginName);
}
}
}
@@ -298,7 +299,7 @@ void PluginContainer::loadPlugins()
m_PluginLoaders.push_back(pluginLoader.release());
} else {
m_FailedPlugins.push_back(pluginName);
- qWarning("plugin \"%s\" failed to load (may be outdated)", qUtf8Printable(pluginName));
+ log::warn("plugin \"{}\" failed to load (may be outdated)", pluginName);
}
}
}
diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp
index 2edb92f5..2fb743d0 100644
--- a/src/pluginlist.cpp
+++ b/src/pluginlist.cpp
@@ -417,7 +417,7 @@ void PluginList::addInformation(const QString &name, const QString &message)
if (iter != m_ESPsByName.end()) {
m_AdditionalInfo[name.toLower()].m_Messages.append(message);
} else {
- qWarning("failed to associate message for \"%s\"", qUtf8Printable(name));
+ log::warn("failed to associate message for \"{}\"", name);
}
}
@@ -694,7 +694,7 @@ void PluginList::setState(const QString &name, PluginStates state) {
m_ESPs[iter->second].m_Enabled = (state == IPluginList::STATE_ACTIVE) ||
m_ESPs[iter->second].m_ForceEnabled;
} else {
- qWarning("Plugin not found: %s", qUtf8Printable(name));
+ log::warn("Plugin not found: {}", name);
}
}
diff --git a/src/problemsdialog.cpp b/src/problemsdialog.cpp
index 1e8e800f..da09935b 100644
--- a/src/problemsdialog.cpp
+++ b/src/problemsdialog.cpp
@@ -96,7 +96,7 @@ void ProblemsDialog::startFix()
{
QObject *fixButton = QObject::sender();
if (fixButton == NULL) {
- qWarning("no button");
+ log::warn("no button");
return;
}
IPluginDiagnose *plugin = reinterpret_cast<IPluginDiagnose*>(fixButton ->property("fix").value<void*>());
diff --git a/src/profile.cpp b/src/profile.cpp
index 01906903..d4778305 100644
--- a/src/profile.cpp
+++ b/src/profile.cpp
@@ -125,7 +125,7 @@ Profile::Profile(const QDir &directory, IPluginGame const *gamePlugin)
findProfileSettings();
if (!QFile::exists(m_Directory.filePath("modlist.txt"))) {
- qWarning("missing modlist.txt in %s", qUtf8Printable(directory.path()));
+ log::warn("missing modlist.txt in {}", directory.path());
touchFile(m_Directory.filePath("modlist.txt"));
}
@@ -307,7 +307,7 @@ void Profile::renameModInAllProfiles(const QString& oldName, const QString& newN
if (modList.exists())
renameModInList(modList, oldName, newName);
else
- qWarning("Profile has no modlist.txt : %s", qUtf8Printable(profileIter.filePath()));
+ log::warn("Profile has no modlist.txt: {}", profileIter.filePath());
}
}
@@ -328,7 +328,7 @@ void Profile::renameModInList(QFile &modList, const QString &oldName, const QStr
if (line.length() == 0) {
// ignore empty lines
- qWarning("mod list contained invalid data: empty line");
+ log::warn("mod list contained invalid data: empty line");
continue;
}
@@ -343,7 +343,7 @@ void Profile::renameModInList(QFile &modList, const QString &oldName, const QStr
if (modName.isEmpty()) {
// file broken?
- qWarning("mod list contained invalid data: missing mod name");
+ log::warn("mod list contained invalid data: missing mod name");
continue;
}
@@ -424,8 +424,9 @@ void Profile::refreshModStatus()
m_ModStatus[modIndex].m_Priority = index++;
}
} else {
- qWarning("no mod state for \"%s\" (profile \"%s\")",
- qUtf8Printable(modName), qUtf8Printable(m_Directory.path()));
+ log::warn(
+ "no mod state for \"{}\" (profile \"{}\")",
+ modName, m_Directory.path());
// need to rewrite the modlist to fix this
modStatusModified = true;
}
@@ -495,8 +496,10 @@ void Profile::dumpModStatus() const
{
for (unsigned int i = 0; i < m_ModStatus.size(); ++i) {
ModInfo::Ptr info = ModInfo::getByIndex(i);
- qWarning("%d: %s - %d (%s)", i, info->name().toUtf8().constData(), m_ModStatus[i].m_Priority,
- m_ModStatus[i].m_Enabled ? "enabled" : "disabled");
+ log::warn(
+ "{}: {} - {} ({})",
+ i, info->name(), m_ModStatus[i].m_Priority,
+ m_ModStatus[i].m_Enabled ? "enabled" : "disabled");
}
}
@@ -803,7 +806,7 @@ bool Profile::localSettingsEnabled() const
QStringList missingFiles;
for (QString file : m_GamePlugin->iniFiles()) {
if (!QFile::exists(m_Directory.filePath(file))) {
- qWarning("missing %s in %s", qUtf8Printable(file), qUtf8Printable(m_Directory.path()));
+ log::warn("missing {} in {}", file, m_Directory.path());
missingFiles << file;
}
}
diff --git a/src/profilesdialog.cpp b/src/profilesdialog.cpp
index f9ea655f..d7863fc8 100644
--- a/src/profilesdialog.cpp
+++ b/src/profilesdialog.cpp
@@ -214,9 +214,9 @@ void ProfilesDialog::on_removeProfileButton_clicked()
delete item;
}
if (!shellDelete(QStringList(profilePath))) {
- qWarning("Failed to shell-delete \"%s\" (errorcode %lu), trying regular delete", qUtf8Printable(profilePath), ::GetLastError());
+ log::warn("Failed to shell-delete \"{}\" (errorcode {}), trying regular delete", profilePath, ::GetLastError());
if (!removeDir(profilePath)) {
- qWarning("regular delete failed too");
+ log::warn("regular delete failed too");
}
}
}
diff --git a/src/settings.cpp b/src/settings.cpp
index e622d632..92ae2251 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -165,8 +165,9 @@ void Settings::registerPlugin(IPlugin *plugin)
for (const PluginSetting &setting : plugin->settings()) {
QVariant temp = m_Settings.value("Plugins/" + plugin->name() + "/" + setting.key, setting.defaultValue);
if (!temp.convert(setting.defaultValue.type())) {
- qWarning("failed to interpret \"%s\" as correct type for \"%s\" in plugin \"%s\", using default",
- qUtf8Printable(temp.toString()), qUtf8Printable(setting.key), qUtf8Printable(plugin->name()));
+ log::warn(
+ "failed to interpret \"{}\" as correct type for \"{}\" in plugin \"{}\", using default",
+ temp.toString(), setting.key, plugin->name());
temp = setting.defaultValue;
}
m_PluginSettings[plugin->name()][setting.key] = temp;
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-22 05:27:20 +0000