Remove unused Qt class variables
This commit is contained in:
parent
3178f20804
commit
bb33d48ea1
8 changed files with 1 additions and 12 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -8,6 +8,7 @@ porymap.app*
|
||||||
porymap
|
porymap
|
||||||
porymap.cfg
|
porymap.cfg
|
||||||
porymap.log
|
porymap.log
|
||||||
|
build/
|
||||||
|
|
||||||
# Qt generated files
|
# Qt generated files
|
||||||
ui_*.h
|
ui_*.h
|
||||||
|
|
|
@ -208,7 +208,6 @@ void KeyValueConfigBase::load() {
|
||||||
}
|
}
|
||||||
|
|
||||||
QTextStream in(&file);
|
QTextStream in(&file);
|
||||||
QList<QString> configLines;
|
|
||||||
static const QRegularExpression re("^(?<key>[^=]+)=(?<value>.*)$");
|
static const QRegularExpression re("^(?<key>[^=]+)=(?<value>.*)$");
|
||||||
while (!in.atEnd()) {
|
while (!in.atEnd()) {
|
||||||
QString line = in.readLine().trimmed();
|
QString line = in.readLine().trimmed();
|
||||||
|
@ -1060,7 +1059,6 @@ QMap<QString, QString> UserConfig::getKeyValueMap() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void UserConfig::init() {
|
void UserConfig::init() {
|
||||||
QString dirName = QDir(this->projectDir).dirName().toLower();
|
|
||||||
this->useEncounterJson = true;
|
this->useEncounterJson = true;
|
||||||
this->customScripts.clear();
|
this->customScripts.clear();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1253,7 +1253,6 @@ void MainWindow::onOpenMapListContextMenu(const QPoint &point)
|
||||||
|
|
||||||
// Build custom context menu depending on which type of item was selected (map group, map name, etc.)
|
// Build custom context menu depending on which type of item was selected (map group, map name, etc.)
|
||||||
if (itemType == "map_group") {
|
if (itemType == "map_group") {
|
||||||
QString groupName = selectedItem->data(Qt::UserRole).toString();
|
|
||||||
int groupNum = selectedItem->data(MapListUserRoles::GroupRole).toInt();
|
int groupNum = selectedItem->data(MapListUserRoles::GroupRole).toInt();
|
||||||
QMenu* menu = new QMenu(this);
|
QMenu* menu = new QMenu(this);
|
||||||
QActionGroup* actions = new QActionGroup(menu);
|
QActionGroup* actions = new QActionGroup(menu);
|
||||||
|
@ -1727,7 +1726,6 @@ void MainWindow::paste() {
|
||||||
else if (!clipboardText.isEmpty()) {
|
else if (!clipboardText.isEmpty()) {
|
||||||
// we only can paste json text
|
// we only can paste json text
|
||||||
// so, check if clipboard text is valid json
|
// so, check if clipboard text is valid json
|
||||||
QString parseError;
|
|
||||||
QJsonDocument pasteJsonDoc = QJsonDocument::fromJson(clipboardText.toUtf8());
|
QJsonDocument pasteJsonDoc = QJsonDocument::fromJson(clipboardText.toUtf8());
|
||||||
|
|
||||||
// test empty
|
// test empty
|
||||||
|
@ -2033,7 +2031,6 @@ void MainWindow::updateObjects() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::updateSelectedObjects() {
|
void MainWindow::updateSelectedObjects() {
|
||||||
QList<DraggablePixmapItem *> all_events = editor->getObjects();
|
|
||||||
QList<DraggablePixmapItem *> events;
|
QList<DraggablePixmapItem *> events;
|
||||||
|
|
||||||
if (editor->selected_events && editor->selected_events->length()) {
|
if (editor->selected_events && editor->selected_events->length()) {
|
||||||
|
|
|
@ -1933,8 +1933,6 @@ void Project::appendTilesetLabel(QString label, QString isSecondaryStr) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Project::readTilesetLabels() {
|
bool Project::readTilesetLabels() {
|
||||||
QStringList primaryTilesets;
|
|
||||||
QStringList secondaryTilesets;
|
|
||||||
this->primaryTilesetLabels.clear();
|
this->primaryTilesetLabels.clear();
|
||||||
this->secondaryTilesetLabels.clear();
|
this->secondaryTilesetLabels.clear();
|
||||||
this->tilesetLabelsOrdered.clear();
|
this->tilesetLabelsOrdered.clear();
|
||||||
|
|
|
@ -48,7 +48,6 @@ void ColorPicker::hover(int mouseX, int mouseY) {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// 15 X 15 box with 8x magnification = 120px square)
|
// 15 X 15 box with 8x magnification = 120px square)
|
||||||
QRect zoomRect(mouseX - zoom_box_dimensions / 2, mouseY - zoom_box_dimensions / 2, zoom_box_dimensions, zoom_box_dimensions);
|
|
||||||
QPixmap grab = screen->grabWindow(0, mouseX - zoom_box_dimensions / 2, mouseY - zoom_box_dimensions / 2, zoom_box_dimensions, zoom_box_dimensions);
|
QPixmap grab = screen->grabWindow(0, mouseX - zoom_box_dimensions / 2, mouseY - zoom_box_dimensions / 2, zoom_box_dimensions, zoom_box_dimensions);
|
||||||
int pixelRatio = grab.devicePixelRatio();
|
int pixelRatio = grab.devicePixelRatio();
|
||||||
|
|
||||||
|
|
|
@ -1009,7 +1009,6 @@ void RegionMapEditor::on_tabWidget_Region_Map_currentChanged(int index) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void RegionMapEditor::on_comboBox_RM_ConnectedMap_textActivated(const QString &mapsec) {
|
void RegionMapEditor::on_comboBox_RM_ConnectedMap_textActivated(const QString &mapsec) {
|
||||||
QString layer = this->region_map->getLayer();
|
|
||||||
this->region_map->setSquareMapSection(this->currIndex, mapsec);
|
this->region_map->setSquareMapSection(this->currIndex, mapsec);
|
||||||
|
|
||||||
onRegionMapLayoutSelectedTileChanged(this->currIndex);// re-draw layout image
|
onRegionMapLayoutSelectedTileChanged(this->currIndex);// re-draw layout image
|
||||||
|
|
|
@ -996,7 +996,6 @@ void TilesetEditor::on_actionImport_Secondary_Metatiles_triggered()
|
||||||
|
|
||||||
void TilesetEditor::importTilesetMetatiles(Tileset *tileset, bool primary)
|
void TilesetEditor::importTilesetMetatiles(Tileset *tileset, bool primary)
|
||||||
{
|
{
|
||||||
QString descriptor = primary ? "primary" : "secondary";
|
|
||||||
QString descriptorCaps = primary ? "Primary" : "Secondary";
|
QString descriptorCaps = primary ? "Primary" : "Secondary";
|
||||||
|
|
||||||
QString filepath = QFileDialog::getOpenFileName(
|
QString filepath = QFileDialog::getOpenFileName(
|
||||||
|
|
|
@ -294,8 +294,6 @@ void TilesetEditorTileSelector::drawUnused() {
|
||||||
QPixmap redX(16, 16);
|
QPixmap redX(16, 16);
|
||||||
redX.fill(Qt::transparent);
|
redX.fill(Qt::transparent);
|
||||||
|
|
||||||
QBitmap mask(16, 16);
|
|
||||||
|
|
||||||
QPen whitePen(Qt::white);
|
QPen whitePen(Qt::white);
|
||||||
whitePen.setWidth(1);
|
whitePen.setWidth(1);
|
||||||
QPen pinkPen(Qt::magenta);
|
QPen pinkPen(Qt::magenta);
|
||||||
|
|
Loading…
Reference in a new issue