Converted from Qt4 to Qt5.

[warehouse-man-deluxe] / src / editorwindow.cpp

diff --git a/src/editorwindow.cpp b/src/editorwindow.cpp
index df7743676812ec9b3118e12502343872fc154d6d..4b32ca2f89d186f40e5bfb5207b25870fc8384e6 100644 (file)
--- a/src/editorwindow.cpp
+++ b/src/editorwindow.cpp
@@ -36,9 +36,9 @@ EditorWindow::EditorWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Window)
 //     editor->setFocus(); //DISNOWOK
 //     editor->Load();
 
-       for(unsigned int i=0; i<editor->levelStorage.size(); i++)
+       for(unsigned int i=0; i<levelStorage.size(); i++)
        {
-               list->addItem(QString(editor->levelStorage[i].name));
+               list->addItem(QString(levelStorage[i].name));
                QListWidgetItem * item = list->item(i);
                item->setFlags(item->flags() | Qt::ItemIsEditable);
        }
@@ -93,7 +93,7 @@ void EditorWindow::SetEditorLevel(int level)
 
        if (level == 0)
                up->setDisabled(true);
-       else if ((unsigned int)level == (editor->levelStorage.size() - 1))
+       else if ((unsigned int)level == (levelStorage.size() - 1))
                down->setDisabled(true);
        else
        {
@@ -106,7 +106,7 @@ void EditorWindow::SetEditorLevel(int level)
 void EditorWindow::SetNewName(QWidget * widget, QAbstractItemDelegate::EndEditHint)
 {
        QString newName = reinterpret_cast<QLineEdit *>(widget)->text();
-       editor->SetNameOnCurrentLevel(newName.toAscii().data());
+       editor->SetNameOnCurrentLevel(newName.toUtf8().data());
 }
 
 
@@ -114,7 +114,7 @@ void EditorWindow::MoveLevelUp(void)
 {
        // Swap in the vector...
        int n = editor->currentLevel;
-       std::swap(editor->levelStorage[n], editor->levelStorage[n - 1]);
+       std::swap(levelStorage[n], levelStorage[n - 1]);
 
        // Swap in the QListWidget too...
        int currentRow = list->currentRow();
@@ -127,7 +127,7 @@ void EditorWindow::MoveLevelUp(void)
 void EditorWindow::MoveLevelDown(void)
 {
        int n = editor->currentLevel;
-       std::swap(editor->levelStorage[n], editor->levelStorage[n + 1]);
+       std::swap(levelStorage[n], levelStorage[n + 1]);
 
        int currentRow = list->currentRow();
        QListWidgetItem * currentItem = list->takeItem(currentRow);
@@ -152,7 +152,7 @@ void EditorWindow::AddLevel(void)
 void EditorWindow::DeleteLevel(void)
 {
 //printf("DeleteLevel: Erasing level from levelStorage...\n");
-       editor->levelStorage.erase(editor->levelStorage.begin() + editor->currentLevel);
+       levelStorage.erase(levelStorage.begin() + editor->currentLevel);
 
 //printf("DeleteLevel: Erasing level from list...\n");
        int currentRow = list->currentRow();
@@ -172,6 +172,6 @@ void EditorWindow::DeleteLevel(void)
 
 void EditorWindow::PlayLevel(void)
 {
-       emit SetupLevel(&(editor->levelStorage[editor->currentLevel]));
+       emit SetupLevel(&(levelStorage[editor->currentLevel]));
 }