From 2e24c28bbfa4358137f2982478ead03e19ee677e Mon Sep 17 00:00:00 2001
From: NeoTheFox <soniczerops@gmail.com>
Date: Sat, 21 Mar 2015 18:42:44 +0300
Subject: [PATCH] Got rid of compilation warnings More refactoring

---
 erroricon.cpp | 14 ++++++++------
 erroricon.h   |  4 ++--
 sdwindow.cpp  |  2 +-
 sdwindow.h    |  2 +-
 sender.h      | 10 +++++-----
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/erroricon.cpp b/erroricon.cpp
index 7bd00fc..7735a8f 100644
--- a/erroricon.cpp
+++ b/erroricon.cpp
@@ -4,16 +4,18 @@ ErrorIcon::ErrorIcon(QWidget *parent) : QWidget(parent)
 {
     framenum = 0;
     frame = ":icons/error_a.png";
-    animation.setInterval(300);
-    animation.start();
+    animation = new QTimer(this);
+    animation->setInterval(300);
+    animation->start();
 
-    connect(&animation, SIGNAL(timeout()), this, SLOT(changeFrame()));
+    connect(animation, &QTimer::timeout, this, &ErrorIcon::changeFrame);
 }
 
-void ErrorIcon::paintEvent(QPaintEvent *pe)
+void ErrorIcon::paintEvent(QPaintEvent *)
 {
     QPainter painter(this);
-    painter.drawPixmap(0,0,128,87,QPixmap(frame));
+    QPixmap pframe(frame);
+    painter.drawPixmap(0,0,pframe.width(),pframe.height(),pframe);
 }
 
 void ErrorIcon::changeFrame()
@@ -33,6 +35,6 @@ void ErrorIcon::changeFrame()
 
 ErrorIcon::~ErrorIcon()
 {
-
+    animation->stop();
 }
 
diff --git a/erroricon.h b/erroricon.h
index c338334..6693ec6 100644
--- a/erroricon.h
+++ b/erroricon.h
@@ -11,12 +11,12 @@ class ErrorIcon : public QWidget
 public:
     explicit ErrorIcon(QWidget *parent = 0);
     ~ErrorIcon();
-    QTimer animation;
+    QTimer *animation;
     QString frame;
     int framenum;
 
 protected:
-    virtual void paintEvent(QPaintEvent *pe);
+    virtual void paintEvent(QPaintEvent *);
 
 signals:
 
diff --git a/sdwindow.cpp b/sdwindow.cpp
index 5b231d9..d18b54b 100644
--- a/sdwindow.cpp
+++ b/sdwindow.cpp
@@ -20,7 +20,7 @@ void SDWindow::on_buttonBox_accepted()
     emit fileSelected(ui->fileslist->currentItem()->text());
 }
 
-void SDWindow::on_fileslist_doubleClicked(const QModelIndex &index)
+void SDWindow::on_fileslist_doubleClicked(const QModelIndex &)
 {
     emit fileSelected(ui->fileslist->currentItem()->text());
     this->close();
diff --git a/sdwindow.h b/sdwindow.h
index 7302738..8bc92de 100644
--- a/sdwindow.h
+++ b/sdwindow.h
@@ -21,7 +21,7 @@ signals:
 private slots:
     void on_buttonBox_accepted();
 
-    void on_fileslist_doubleClicked(const QModelIndex &index);
+    void on_fileslist_doubleClicked(const QModelIndex &);
 
 private:
     Ui::SDWindow *ui;
diff --git a/sender.h b/sender.h
index 20f5b11..30f2dbc 100644
--- a/sender.h
+++ b/sender.h
@@ -23,11 +23,11 @@ public:
 protected:
     QSerialPort *printer;
     QTimer *sendTimer;
-    unsigned int currentLine;
-    unsigned int totalLineNum;
-    unsigned int resendNum;
-    unsigned int baudrate;
-    int flowcontrol;
+    long int currentLine;
+    long int totalLineNum;
+    long int resendNum;
+    long int baudrate;
+    long int flowcontrol;
     bool paused;
     bool sending;
     bool dtr;