Fix manual lance test: avoid using deprecated api

...and other slight modernizations and minor fixes.

Change-Id: Ide587d9fe59ca9113ae775882c99a50debaf9000
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/tests/manual/lance/main.cpp b/tests/manual/lance/main.cpp
index 749a4b1943..7f5af2d908 100644
--- a/tests/manual/lance/main.cpp
+++ b/tests/manual/lance/main.cpp
@@ -185,7 +185,7 @@ static void displayCommands()
            "  pixmap_load filename name_in_script\n"
            "  image_load filename name_in_script\n");
 }
-static InteractiveWidget *interactive_widget = 0;
+static InteractiveWidget *interactive_widget = nullptr;
 
 static void runInteractive()
 {
@@ -350,15 +350,15 @@ int main(int argc, char **argv)
 #endif
         }
     }
-    scaledWidth = width * scalefactor;
-    scaledHeight = height * scalefactor;
+    scaledWidth = int(width * scalefactor);
+    scaledHeight = int(height * scalefactor);
 
     PaintCommands pcmd(QStringList(), 800, 800, imageFormat);
     pcmd.setVerboseMode(verboseMode);
     pcmd.setType(type);
     pcmd.setCheckersBackground(checkers_background);
 
-    QWidget *activeWidget = 0;
+    QWidget *activeWidget = nullptr;
 
     if (interactive) {
         runInteractive();
@@ -610,7 +610,7 @@ int main(int argc, char **argv)
 
                 QPrinter p(highres ? QPrinter::HighResolution : QPrinter::ScreenResolution);
                 if (printdlg) {
-                    QPrintDialog printDialog(&p, 0);
+                    QPrintDialog printDialog(&p, nullptr);
                     if (printDialog.exec() != QDialog::Accepted)
                         break;
                 } else {