diff options
| -rw-r--r-- | application/pages/WorldListPage.cpp | 28 | ||||
| -rw-r--r-- | application/pages/WorldListPage.h | 17 | ||||
| -rw-r--r-- | logic/minecraft/World.h | 8 |
3 files changed, 33 insertions, 20 deletions
diff --git a/application/pages/WorldListPage.cpp b/application/pages/WorldListPage.cpp index 662b7452..6a50748c 100644 --- a/application/pages/WorldListPage.cpp +++ b/application/pages/WorldListPage.cpp @@ -1,6 +1,17 @@ -// -// Created by robotbrain on 8/18/15. -// +/* Copyright 2013-2015 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #include "WorldListPage.h" #include "ui_WorldListPage.h" @@ -12,21 +23,12 @@ WorldListPage::WorldListPage(BaseInstance *inst, std::shared_ptr<WorldList> worlds, QString id, QString iconName, QString displayName, QString helpPage, QWidget *parent) - : QWidget(parent), ui(new Ui::WorldListPage) + : QWidget(parent), ui(new Ui::WorldListPage), m_worlds(worlds), m_inst(inst), m_id(id), m_displayName(displayName), m_iconName(iconName), m_helpName(helpPage) { ui->setupUi(this); ui->tabWidget->tabBar()->hide(); - m_inst = inst; - m_worlds = worlds; - m_id = id; - m_displayName = displayName; - m_iconName = iconName; - m_helpName = helpPage; ui->worldTreeView->setModel(m_worlds.get()); ui->worldTreeView->installEventFilter(this); - auto smodel = ui->worldTreeView->selectionModel(); - connect(smodel, SIGNAL(currentChanged(QModelIndex, QModelIndex)), - SLOT(modCurrent(QModelIndex, QModelIndex))); } void WorldListPage::opened() diff --git a/application/pages/WorldListPage.h b/application/pages/WorldListPage.h index f55f2999..a94aabb4 100644 --- a/application/pages/WorldListPage.h +++ b/application/pages/WorldListPage.h @@ -1,6 +1,17 @@ -// -// Created by robotbrain on 8/18/15. -// +/* Copyright 2013-2015 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #pragma once diff --git a/logic/minecraft/World.h b/logic/minecraft/World.h index d00062e7..bf5eec04 100644 --- a/logic/minecraft/World.h +++ b/logic/minecraft/World.h @@ -28,14 +28,14 @@ public: { return is_valid; } - // delete all the files of this mod +// // delete all the files of this world bool destroy(); - // replace this mod with a copy of the other + // replace this world with a copy of the other bool replace(World &with); - // change the mod's filesystem path (used by mod lists for *MAGIC* purposes) + // change the world's filesystem path (used by world lists for *MAGIC* purposes) void repath(const QFileInfo &file); - // WEAK compare operator - used for replacing mods + // WEAK compare operator - used for replacing worlds bool operator==(const World &other) const; bool strongCompare(const World &other) const; |