Missed changes from "refactoring: replace obsolete Qt functions"

Co-authored-by: shun-iwasawa <shun.iwasawa@ponoc.jp>

toonz/sources/toonz/scenebrowser.cpp

@@ -90,7 +90,6 @@ namespace ba = boost::adaptors;
 
 using namespace DVGui;
 
-
 //=============================================================================
 //      Local namespace
 //=============================================================================
@@ -130,13 +129,8 @@ SceneBrowserButtonBar::SceneBrowserButtonBar(DvItemViewer *itemViewer,
 // SceneBrowser
 //-----------------------------------------------------------------------------
 
-#if QT_VERSION >= 0x050500
 SceneBrowser::SceneBrowser(QWidget *parent, Qt::WindowFlags flags,
                            bool noContextMenu, bool multiSelectionEnabled)
-#else
-SceneBrowser::SceneBrowser(QWidget *parent, Qt::WFlags flags, bool noContextMenu,
-                         bool multiSelectionEnabled)
-#endif
     : QFrame(parent), m_folderName(0), m_itemViewer(0) {
   // style sheet
   setObjectName("SceneBrowser");
@@ -491,7 +485,9 @@ void SceneBrowser::sortByDataModel(DataType dataType, bool isDiscendent) {
 
 //-----------------------------------------------------------------------------
 
-void SceneBrowser::setFilterTypes(const QStringList &types) { m_filter = types; }
+void SceneBrowser::setFilterTypes(const QStringList &types) {
+  m_filter = types;
+}
 
 //-----------------------------------------------------------------------------
 
@@ -1410,7 +1406,6 @@ void SceneBrowser::onTreeFolderChanged() {
 
   // Restore scroll position
   m_itemViewer->verticalScrollBar()->setValue(m_currentScroll);
-
 }
 
 //-----------------------------------------------------------------------------
@@ -1497,8 +1492,7 @@ bool SceneBrowser::drop(const QMimeData *mimeData) {
       TFilePath path = folderPath;
       NameBuilder *nameBuilder =
           NameBuilder::getBuilder(::to_wstring(path.getName()));
-      do
+      do levelName = nameBuilder->getNext();
-        levelName = nameBuilder->getNext();
       while (TSystem::doesExistFileOrLevel(path.withName(levelName)));
       folderPath = path.withName(levelName);
     }
@@ -1634,11 +1628,7 @@ QString getFrame(const QString &filename) {
   QString number = filename.mid(from + 1, to - from);
   for (i = 0; i < 4 - number.size(); i++) padStr[i] = '0';
   for (i = 0; i < number.size(); i++)
-#if QT_VERSION >= 0x050500
     padStr[4 - number.size() + i] = number.at(i).toLatin1();
-#else
-    padStr[4 - number.size() + i] = number.at(i).toAscii();
-#endif
   return QString(padStr);
 }
 
@@ -1745,7 +1735,7 @@ void SceneBrowser::renameAsToonzLevel() {
 
   QApplication::restoreOverrideCursor();
 
-  SceneBrowser::refreshFolder(filePaths[0].getParentDir());
+  FileBrowser::refreshFolder(filePaths[0].getParentDir());
 }
 
 #ifdef LEVO
@@ -1928,7 +1918,8 @@ void SceneBrowser::convertToPaintedTlv() {
 void SceneBrowser::onSceneSwitched() {
   ToonzScene *scene      = TApp::instance()->getCurrentScene()->getScene();
   TFilePath scenesFolder = scene->getScenePath().getParentDir();
-  //TFilePath scenesFolder = TProjectManager::instance()->getCurrentProject()->getScenesPath();
+  // TFilePath scenesFolder =
+  // TProjectManager::instance()->getCurrentProject()->getScenesPath();
   setFolder(scenesFolder, true);
 }
 
@@ -1991,7 +1982,8 @@ void SceneBrowser::onDoubleClickedItem(int index) {
 
 void SceneBrowser::refreshFolder(const TFilePath &folderPath) {
   std::set<SceneBrowser *>::iterator it;
-  for (it = activePreproductionBoards.begin(); it != activePreproductionBoards.end(); ++it) {
+  for (it = activePreproductionBoards.begin();
+       it != activePreproductionBoards.end(); ++it) {
     SceneBrowser *browser = *it;
     DvDirModel::instance()->refreshFolder(folderPath);
     if (browser->getFolder() == folderPath) {
@@ -2004,7 +1996,8 @@ void SceneBrowser::refreshFolder(const TFilePath &folderPath) {
 
 void SceneBrowser::updateItemViewerPanel() {
   std::set<SceneBrowser *>::iterator it;
-  for (it = activePreproductionBoards.begin(); it != activePreproductionBoards.end(); ++it) {
+  for (it = activePreproductionBoards.begin();
+       it != activePreproductionBoards.end(); ++it) {
     SceneBrowser *browser = *it;
     browser->m_itemViewer->getPanel()->update();
   }
@@ -2061,7 +2054,6 @@ void SceneBrowser::refresh() {
 //-----------------------------------------------------------------------------
 
 void SceneBrowser::newScene() {
-
   m_currentScroll = m_itemViewer->verticalScrollBar()->value();
 
   TFilePath parentFolder = getFolder();
@@ -2070,8 +2062,7 @@ void SceneBrowser::newScene() {
   ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene();
   if (scene->isUntitled()) {
     bool ok;
-      sceneName =
+    sceneName = QInputDialog::getText(this, tr("Save Scene"), tr("Scene name:"),
-          QInputDialog::getText(this, tr("Save Scene"), tr("Scene name:"),
                                       QLineEdit::Normal, QString(), &ok);
     if (!ok || sceneName == "") return;
   } else {
@@ -2096,8 +2087,10 @@ void SceneBrowser::newScene() {
   }
   int i = number.toInt();
   do {
-    QString number_ext = QStringLiteral("%1").arg(++i, number.length(), 10, QLatin1Char('0'));
+    QString number_ext =
-    scenePath = parentFolder + (prefix.toStdWString()+number_ext.toStdWString()+L".tnz");
+        QStringLiteral("%1").arg(++i, number.length(), 10, QLatin1Char('0'));
+    scenePath = parentFolder +
+                (prefix.toStdWString() + number_ext.toStdWString() + L".tnz");
   } while (TFileStatus(scenePath).doesExist());
 
   if (!IoCmd::saveSceneIfNeeded(QObject::tr("Change project"))) return;
@@ -2202,5 +2195,6 @@ void SceneBrowser::tryToOpenScene(const TFilePath &filePath) {
 
 //=============================================================================
 
-OpenFloatingPanel openPreproductionBoardPane(MI_OpenPreproductionBoard, "PreproductionBoard",
+OpenFloatingPanel openPreproductionBoardPane(
+    MI_OpenPreproductionBoard, "PreproductionBoard",
     QObject::tr("Preproduction Board"));

toonz/sources/toonz/scenebrowser.h

@@ -43,13 +43,8 @@ class SceneBrowser final : public QFrame, public DvItemListModel {
   Q_OBJECT
 
 public:
-#if QT_VERSION >= 0x050500
   SceneBrowser(QWidget *parent, Qt::WindowFlags flags = 0,
                bool noContextMenu = false, bool multiSelectionEnabled = false);
-#else
-  SceneBrowser(QWidget *parent, Qt::WFlags flags = 0, bool noContextMenu = false,
-              bool multiSelectionEnabled = false);
-#endif
   ~SceneBrowser();
 
   void sortByDataModel(DataType dataType, bool isDiscendent) override;