Code style: formatting and refactoring of launcher code

launcher/jsonutils.cpp

@@ -58,12 +58,24 @@ QVariant toVariant(const JsonNode & node)
 {
 	switch(node.getType())
 	{
-		break; case JsonNode::JsonType::DATA_NULL:   return QVariant();
+		break;
-		break; case JsonNode::JsonType::DATA_BOOL:   return QVariant(node.Bool());
+	case JsonNode::JsonType::DATA_NULL:
-		break; case JsonNode::JsonType::DATA_FLOAT:  return QVariant(node.Float());
+		return QVariant();
-		break; case JsonNode::JsonType::DATA_STRING: return QVariant(QString::fromUtf8(node.String().c_str()));
+		break;
-		break; case JsonNode::JsonType::DATA_VECTOR: return JsonToList(node.Vector());
+	case JsonNode::JsonType::DATA_BOOL:
-		break; case JsonNode::JsonType::DATA_STRUCT: return JsonToMap(node.Struct());
+		return QVariant(node.Bool());
+		break;
+	case JsonNode::JsonType::DATA_FLOAT:
+		return QVariant(node.Float());
+		break;
+	case JsonNode::JsonType::DATA_STRING:
+		return QVariant(QString::fromUtf8(node.String().c_str()));
+		break;
+	case JsonNode::JsonType::DATA_VECTOR:
+		return JsonToList(node.Vector());
+		break;
+	case JsonNode::JsonType::DATA_STRUCT:
+		return JsonToMap(node.Struct());
 	}
 	return QVariant();
 }

launcher/mainwindow_moc.cpp

@@ -39,9 +39,8 @@ void MainWindow::load()
 	settings.init(true);
 }
 
-MainWindow::MainWindow(QWidget * parent) :
+MainWindow::MainWindow(QWidget * parent)
-    QMainWindow(parent),
+	: QMainWindow(parent), ui(new Ui::MainWindow)
-    ui(new Ui::MainWindow)
 {
 	load(); // load FS before UI
 
@@ -54,9 +53,7 @@ MainWindow::MainWindow(QWidget * parent) :
 	auto tab_icon_size = ui->tabSelectList->iconSize();
 	if(tab_icon_size.width() < width)
 	{
-		ui->tabSelectList->setIconSize(QSize(
+		ui->tabSelectList->setIconSize(QSize(width, width + tab_icon_size.height() - tab_icon_size.width()));
-			width,
-			width + tab_icon_size.height() - tab_icon_size.width()));
 		ui->tabSelectList->setGridSize(QSize(width, width));
 		// 4 is a dirty hack to make it look right
 		ui->tabSelectList->setMaximumWidth(width + 4);

launcher/mainwindow_moc.h

@@ -11,7 +11,8 @@
 #include <QMainWindow>
 #include <QStringList>
 
-namespace Ui {
+namespace Ui
+{
 class MainWindow;
 }
 
@@ -20,10 +21,12 @@ class QTableWidgetItem;
 class MainWindow : public QMainWindow
 {
 	Q_OBJECT
+
 private:
 	Ui::MainWindow * ui;
 	void load();
 	void startExecutable(QString name);
+
 public:
 	explicit MainWindow(QWidget * parent = 0);
 	~MainWindow();

launcher/modManager/cdownloadmanager_moc.h

@@ -41,6 +41,7 @@ class CDownloadManager: public QObject
 	QList<FileEntry> currentDownloads;
 
 	FileEntry & getEntry(QNetworkReply * reply);
+
 public:
 	CDownloadManager();
 

launcher/modManager/cmodlist.cpp

@@ -52,11 +52,8 @@ QString CModEntry::sizeToString(double size)
 	return sizes[index].arg(QString::number(size, 'f', 1));
 }
 
-CModEntry::CModEntry(QVariantMap repository, QVariantMap localData, QVariantMap modSettings, QString modname):
+CModEntry::CModEntry(QVariantMap repository, QVariantMap localData, QVariantMap modSettings, QString modname)
-    repository(repository),
+	: repository(repository), localData(localData), modSettings(modSettings), modname(modname)
-    localData(localData),
-    modSettings(modSettings),
-    modname(modname)
 {
 }
 
@@ -102,10 +99,15 @@ bool CModEntry::isInstalled() const
 
 int CModEntry::getModStatus() const
 {
-	return
+	int status = 0;
-	(isEnabled()   ? ModStatus::ENABLED    : 0) |
+	if(isEnabled())
-	(isInstalled() ? ModStatus::INSTALLED  : 0) |
+		status |= ModStatus::ENABLED;
-	(isUpdateable()? ModStatus::UPDATEABLE : 0);
+	if(isInstalled())
+		status |= ModStatus::INSTALLED;
+	if(isUpdateable())
+		status |= ModStatus::UPDATEABLE;
+
+	return status;
 }
 
 QString CModEntry::getName() const
@@ -218,7 +220,9 @@ CModEntry CModList::getMod(QString modname) const
 		if(repoVal.isValid())
 		{
 			if(repo.empty())
+			{
 				repo = repoVal.toMap();
+			}
 			else
 			{
 				if(CModEntry::compareVersions(repo["version"].toString(), repoVal.toMap()["version"].toString()))

launcher/modManager/cmodlist.h

@@ -35,6 +35,7 @@ class CModEntry
 	QVariantMap modSettings;
 
 	QString modname;
+
 public:
 	CModEntry(QVariantMap repository, QVariantMap localData, QVariantMap modSettings, QString modname);
 
@@ -70,6 +71,7 @@ class CModList
 	QVariantMap modSettings;
 
 	QVariantMap copyField(QVariantMap data, QString from, QString to);
+
 public:
 	virtual void resetRepositories();
 	virtual void addRepository(QVariantMap data);

launcher/modManager/cmodlistmodel_moc.cpp

@@ -46,8 +46,8 @@ namespace ModStatus
 static const QString iconUpdate = "icons:mod-update.png";
 }
 
-CModListModel::CModListModel(QObject *parent) :
+CModListModel::CModListModel(QObject * parent)
-	QAbstractItemModel(parent)
+	: QAbstractItemModel(parent)
 {
 }
 
@@ -121,11 +121,16 @@ QVariant CModListModel::data(const QModelIndex &index, int role) const
 
 		switch(role)
 		{
-			case Qt::DecorationRole:    return getIcon(mod, index.column());
+		case Qt::DecorationRole:
-			case Qt::DisplayRole:       return getText(mod, index.column());
+			return getIcon(mod, index.column());
-			case Qt::TextAlignmentRole: return getTextAlign(index.column());
+		case Qt::DisplayRole:
-			case ModRoles::ValueRole:   return getValue(mod, index.column());
+			return getText(mod, index.column());
-			case ModRoles::ModNameRole: return mod.getName();
+		case Qt::TextAlignmentRole:
+			return getTextAlign(index.column());
+		case ModRoles::ValueRole:
+			return getValue(mod, index.column());
+		case ModRoles::ModNameRole:
+			return mod.getName();
 		}
 	}
 	return QVariant();
@@ -262,11 +267,8 @@ bool CModFilterModel::filterAcceptsRow(int source_row, const QModelIndex &source
 	return false;
 }
 
-CModFilterModel::CModFilterModel(CModListModel * model, QObject * parent):
+CModFilterModel::CModFilterModel(CModListModel * model, QObject * parent)
-    QSortFilterProxyModel(parent),
+	: QSortFilterProxyModel(parent), base(model), filteredType(ModStatus::MASK_NONE), filterMask(ModStatus::MASK_NONE)
-    base(model),
-    filteredType(ModStatus::MASK_NONE),
-    filterMask(ModStatus::MASK_NONE)
 {
 	setSourceModel(model);
 	setSortRole(ModRoles::ValueRole);

launcher/modManager/cmodlistmodel_moc.h

@@ -55,6 +55,7 @@ class CModListModel : public QAbstractItemModel, public CModList
 	QVariant getValue(const CModEntry & mod, int field) const;
 	QVariant getText(const CModEntry & mod, int field) const;
 	QVariant getIcon(const CModEntry & mod, int field) const;
+
 public:
 	explicit CModListModel(QObject * parent = 0);
 
@@ -73,6 +74,7 @@ public:
 	QModelIndex parent(const QModelIndex & child) const override;
 
 	Qt::ItemFlags flags(const QModelIndex & index) const override;
+
 signals:
 
 public slots:
@@ -88,6 +90,7 @@ class CModFilterModel : public QSortFilterProxyModel
 	bool filterMatchesThis(const QModelIndex & source) const;
 
 	bool filterAcceptsRow(int source_row, const QModelIndex & source_parent) const override;
+
 public:
 	void setTypeFilter(int filteredType, int filterMask);
 

launcher/modManager/cmodlistview_moc.cpp

@@ -64,10 +64,8 @@ void CModListView::setupModsView()
 		this, SLOT(dataChanged(QModelIndex,QModelIndex)));
 }
 
-CModListView::CModListView(QWidget *parent) :
+CModListView::CModListView(QWidget * parent)
-	QWidget(parent),
+	: QWidget(parent), settingsListener(settings.listen["launcher"]["repositoryURL"]), ui(new Ui::CModListView)
-    settingsListener(settings.listen["launcher"]["repositoryURL"]),
-	ui(new Ui::CModListView)
 {
 	settingsListener([&](const JsonNode &){ repositoriesChanged = true; });
 	ui->setupUi(this);
@@ -347,12 +345,24 @@ void CModListView::on_comboBox_currentIndexChanged(int index)
 {
 	switch(index)
 	{
-	break; case 0: filterModel->setTypeFilter(ModStatus::MASK_NONE, ModStatus::MASK_NONE);
+	case 0:
-	break; case 1: filterModel->setTypeFilter(ModStatus::MASK_NONE, ModStatus::INSTALLED);
+		filterModel->setTypeFilter(ModStatus::MASK_NONE, ModStatus::MASK_NONE);
-	break; case 2: filterModel->setTypeFilter(ModStatus::INSTALLED, ModStatus::INSTALLED);
+		break;
-	break; case 3: filterModel->setTypeFilter(ModStatus::UPDATEABLE, ModStatus::UPDATEABLE);
+	case 1:
-	break; case 4: filterModel->setTypeFilter(ModStatus::ENABLED | ModStatus::INSTALLED, ModStatus::ENABLED | ModStatus::INSTALLED);
+		filterModel->setTypeFilter(ModStatus::MASK_NONE, ModStatus::INSTALLED);
-	break; case 5: filterModel->setTypeFilter(ModStatus::INSTALLED, ModStatus::ENABLED | ModStatus::INSTALLED);
+		break;
+	case 2:
+		filterModel->setTypeFilter(ModStatus::INSTALLED, ModStatus::INSTALLED);
+		break;
+	case 3:
+		filterModel->setTypeFilter(ModStatus::UPDATEABLE, ModStatus::UPDATEABLE);
+		break;
+	case 4:
+		filterModel->setTypeFilter(ModStatus::ENABLED | ModStatus::INSTALLED, ModStatus::ENABLED | ModStatus::INSTALLED);
+		break;
+	case 5:
+		filterModel->setTypeFilter(ModStatus::INSTALLED, ModStatus::ENABLED | ModStatus::INSTALLED);
+		break;
 	}
 }
 
@@ -380,10 +390,12 @@ QStringList CModListView::findBlockingMods(QString mod)
 		{
 			// one of enabled mods have requirement (or this mod) marked as conflict
 			for(auto conflict : mod.getValue("conflicts").toStringList())
+			{
 				if(required.contains(conflict))
 					ret.push_back(name);
 			}
 		}
+	}
 
 	return ret;
 }
@@ -398,10 +410,12 @@ QStringList CModListView::findDependentMods(QString mod, bool excludeDisabled)
 		if(!current.isInstalled())
 			continue;
 
-		if (current.getValue("depends").toStringList().contains(mod) &&
+		if(current.getValue("depends").toStringList().contains(mod))
-		    !(current.isDisabled() && excludeDisabled))
+		{
+			if(!(current.isDisabled() && excludeDisabled))
 				ret += modName;
 		}
+	}
 	return ret;
 }
 
@@ -413,8 +427,10 @@ void CModListView::on_enableButton_clicked()
 	assert(findInvalidDependencies(modName).empty());
 
 	for(auto & name : modModel->getRequirements(modName))
+	{
 		if(modModel->getMod(name).isDisabled())
 			manager->enableMod(name);
+	}
 	checkManagerErrors();
 }
 
@@ -422,8 +438,7 @@ void CModListView::on_disableButton_clicked()
 {
 	QString modName = ui->allModsView->currentIndex().data(ModRoles::ModNameRole).toString();
 
-	if (modModel->hasMod(modName) &&
+	if(modModel->hasMod(modName) && modModel->getMod(modName).isEnabled())
-	    modModel->getMod(modName).isEnabled())
 		manager->disableMod(modName);
 
 	checkManagerErrors();
@@ -449,8 +464,7 @@ void CModListView::on_uninstallButton_clicked()
 	QString modName = ui->allModsView->currentIndex().data(ModRoles::ModNameRole).toString();
 	// NOTE: perhaps add "manually installed" flag and uninstall those dependencies that don't have it?
 
-	if (modModel->hasMod(modName) &&
+	if(modModel->hasMod(modName) && modModel->getMod(modName).isInstalled())
-	    modModel->getMod(modName).isInstalled())
 	{
 		if(modModel->getMod(modName).isEnabled())
 			manager->disableMod(modName);

launcher/modManager/cmodlistview_moc.h

@@ -12,7 +12,8 @@
 #include "../StdInc.h"
 #include "../../lib/CConfigHandler.h"
 
-namespace Ui {
+namespace Ui
+{
 class CModListView;
 }
 
@@ -61,6 +62,7 @@ class CModListView : public QWidget
 
 	QString genChangelogText(CModEntry & mod);
 	QString genModInfoText(CModEntry & mod);
+
 public:
 	explicit CModListView(QWidget * parent = 0);
 	~CModListView();

launcher/modManager/cmodmanager.cpp

@@ -34,13 +34,15 @@ static QString detectModArchive(QString path, QString modName)
 				modDirName = filename.section('/', 0, 0);
 		}
 		else // all files must be in <modname> directory
+		{
 			return "";
 		}
+	}
 	return modDirName;
 }
 
-CModManager::CModManager(CModList * modList):
+CModManager::CModManager(CModList * modList)
-    modList(modList)
+	: modList(modList)
 {
 	loadMods();
 	loadModSettings();
@@ -178,8 +180,8 @@ bool CModManager::canEnableMod(QString modname)
 
 	for(auto modEntry : mod.getValue("conflicts").toStringList())
 	{
-		if (modList->hasMod(modEntry) &&
+		// check if conflicting mod installed and enabled
-		    modList->getMod(modEntry).isEnabled()) // conflicting mod installed and enabled
+		if(modList->hasMod(modEntry) && modList->getMod(modEntry).isEnabled())
 			return addError(modname, QString("This mod conflicts with %1").arg(modEntry));
 	}
 	return true;
@@ -199,8 +201,7 @@ bool CModManager::canDisableMod(QString modname)
 	{
 		auto current = modList->getMod(modEntry);
 
-		if (current.getValue("depends").toStringList().contains(modname) &&
+		if(current.getValue("depends").toStringList().contains(modname) && current.isEnabled())
-		    current.isEnabled())
 			return addError(modname, QString("This mod is needed to run %1").arg(modEntry));
 	}
 	return true;

launcher/modManager/cmodmanager.h

@@ -28,6 +28,7 @@ class CModManager
 	QStringList recentErrors;
 	bool addError(QString modname, QString message);
 	bool removeModDir(QString mod);
+
 public:
 	CModManager(CModList * modList);
 

launcher/modManager/imageviewer_moc.cpp

@@ -14,9 +14,8 @@
 #include "imageviewer_moc.h"
 #include "ui_imageviewer_moc.h"
 
-ImageViewer::ImageViewer(QWidget *parent) :
+ImageViewer::ImageViewer(QWidget * parent)
-    QDialog(parent),
+	: QDialog(parent), ui(new Ui::ImageViewer)
-    ui(new Ui::ImageViewer)
 {
 	ui->setupUi(this);
 }

launcher/modManager/imageviewer_moc.h

@@ -12,7 +12,8 @@
 
 #include <QDialog>
 
-namespace Ui {
+namespace Ui
+{
 class ImageViewer;
 }
 
@@ -27,12 +28,12 @@ public:
 	void setPixmap(QPixmap & pixmap);
 
 	static void showPixmap(QPixmap & pixmap, QWidget * parent = 0);
+
 protected:
 	void mousePressEvent(QMouseEvent * event) override;
 	void keyPressEvent(QKeyEvent * event) override;
 	QSize calculateWindowSize();
 
-
 private:
 	Ui::ImageViewer * ui;
 };

launcher/settingsView/csettingsview_moc.cpp

@@ -97,9 +97,8 @@ void CSettingsView::loadSettings()
 	ui->comboBoxAutoSave->setCurrentIndex(settings["general"]["saveFrequency"].Integer() > 0 ? 1 : 0);
 }
 
-CSettingsView::CSettingsView(QWidget *parent) :
+CSettingsView::CSettingsView(QWidget * parent)
-    QWidget(parent),
+	: QWidget(parent), ui(new Ui::CSettingsView)
-    ui(new Ui::CSettingsView)
 {
 	ui->setupUi(this);
 

launcher/settingsView/csettingsview_moc.h

@@ -10,13 +10,15 @@
 #pragma once
 #include "../StdInc.h"
 
-namespace Ui {
+namespace Ui
+{
 class CSettingsView;
 }
 
 class CSettingsView : public QWidget
 {
 	Q_OBJECT
+
 public:
 	explicit CSettingsView(QWidget * parent = 0);
 	~CSettingsView();