Improve code quality

src/keyloader.cpp

@@ -29,7 +29,7 @@ KeyLoader::KeyLoader(QObject *parent) :
     QObject(parent),
     iVkbRows(0),
     iVkbColumns(0),
-    iUtil(0)
+    iUtil(nullptr)
 {
 }
 

src/keyloader.h

@@ -39,7 +39,7 @@ class KeyLoader : public QObject
 {
     Q_OBJECT
 public:
-    explicit KeyLoader(QObject *parent = 0);
+    explicit KeyLoader(QObject *parent = nullptr);
     virtual ~KeyLoader();
 
     void setUtil(Util* util) { iUtil = util; }

src/main.cpp

@@ -52,10 +52,10 @@ int main(int argc, char *argv[])
 
     // fork the child process before creating QGuiApplication
     int socketM;
-    int pid = forkpty(&socketM,NULL,NULL,NULL);
+    int pid = forkpty(&socketM,nullptr,nullptr,nullptr);
     if( pid==-1 ) {
         qFatal("forkpty failed");
-        exit(1);
+        //exit(1);
     } else if( pid==0 ) {
         setenv("TERM", settings->value("terminal/envVarTERM").toByteArray(), 1);
 

src/ptyiface.cpp

@@ -42,7 +42,7 @@ static int childProcessPid = 0;
 void sighandler(int sig)
 {
     if(sig==SIGCHLD) {
-        int pid = wait(NULL);
+        int pid = wait(nullptr);
 
         if(pid > 0 && childProcessPid > 0 &&  pid==childProcessPid) {
             childProcessQuit = true;
@@ -58,8 +58,8 @@ PtyIFace::PtyIFace(int pid, int masterFd, Terminal *term, QString charset, QObje
     iPid(pid),
     iMasterFd(masterFd),
     iFailed(false),
-    iReadNotifier(0),
-    iTextCodec(0)
+    iReadNotifier(nullptr),
+    iTextCodec(nullptr)
 {
     childProcessPid = iPid;
 
@@ -116,8 +116,8 @@ void PtyIFace::resize(QSize newSize)
         return;
 
     winsize winp;
-    winp.ws_col = newSize.width();
-    winp.ws_row = newSize.height();
+    winp.ws_col = static_cast<unsigned short>(newSize.width());
+    winp.ws_row = static_cast<unsigned short>(newSize.height());
 
     ioctl(iMasterFd, TIOCSWINSZ, &winp);
 }
@@ -132,7 +132,7 @@ void PtyIFace::writeTerm(const QByteArray &chars)
     if(childProcessQuit)
         return;
 
-    int ret = write(iMasterFd, chars, chars.size());
+    int ret = write(iMasterFd, chars, static_cast<unsigned int>(chars.size()));
     if(ret != chars.size())
         qDebug() << "write error!";
 }
@@ -147,6 +147,6 @@ void PtyIFace::readTerm(QByteArray &chars)
     while(ret != -1) {
         ret = read(iMasterFd, &ch, 64);
         if(ret > 0)
-            chars.append((char*)&ch, ret);
+            chars.append(static_cast<const char*>(ch), ret);
     }
 }

src/ptyiface.h

@@ -32,7 +32,7 @@ class PtyIFace : public QObject
 {
     Q_OBJECT
 public:
-    explicit PtyIFace(int pid, int masterFd, Terminal *term, QString charset, QObject *parent = 0);
+    explicit PtyIFace(int pid, int masterFd, Terminal *term, QString charset, QObject *parent = nullptr);
     virtual ~PtyIFace();
 
     void writeTerm(const QString &chars);

src/terminal.cpp

@@ -29,7 +29,7 @@
 #include "util.h"
 
 Terminal::Terminal(QObject *parent) :
-    QObject(parent), iRenderer(0), iPtyIFace(0), iUtil(0),
+    QObject(parent), iRenderer(nullptr), iPtyIFace(nullptr), iUtil(nullptr),
     iTermSize(0,0), iEmitCursorChangeSignal(true),
     iShowCursor(true), iUseAltScreenBuffer(false), iAppCursorKeys(false)
 {
@@ -176,7 +176,7 @@ void Terminal::putString(QString str, bool unEscape)
         iPtyIFace->writeTerm(str);
 }
 
-void Terminal::keyPress(int key, int modifiers)
+void Terminal::keyPress(int key, unsigned int modifiers)
 {
     QChar c(key);
 
@@ -343,13 +343,13 @@ void Terminal::insertInBuffer(const QString& chars)
                 else if (latin==ch_ESC) {
                     escape = 0;
                 }
-                else if( escape=='[' || multiCharEscapes.contains(escape) ) {
+                else if( escape=='[' || multiCharEscapes.contains(static_cast<char>(escape)) ) {
                     escSeq += ch;
                 }
                 else if( escape==']' ) {
                     oscSeq += ch;
                 }
-                else if( multiCharEscapes.contains(escape) ) {
+                else if( multiCharEscapes.contains(static_cast<char>(escape)) ) {
                     escSeq += ch;
                 }
                 else {
@@ -362,7 +362,7 @@ void Terminal::insertInBuffer(const QString& chars)
                     escape=-1;
                     escSeq.clear();
                 }
-                if( multiCharEscapes.contains(escape) && escSeq.length()>=2 ) {
+                if( multiCharEscapes.contains(static_cast<char>(escape)) && escSeq.length()>=2 ) {
                     escControlChar(escSeq);
                     escape=-1;
                     escSeq.clear();

src/terminal.h

@@ -60,7 +60,7 @@ class Terminal : public QObject
     // See http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html
     // for a map of index -> color
 
-    explicit Terminal(QObject *parent = 0);
+    explicit Terminal(QObject *parent = nullptr);
     virtual ~Terminal() {}
     void setRenderer(TextRender* tr);
     void setPtyIFace(PtyIFace* pty);
@@ -80,7 +80,7 @@ class Terminal : public QObject
 
     QList<TermChar>& currentLine();
 
-    Q_INVOKABLE void keyPress(int key, int modifiers);
+    Q_INVOKABLE void keyPress(int key, unsigned int modifiers);
     Q_INVOKABLE const QStringList printableLinesFromCursor(int lines, bool withEmptyLines);
     Q_INVOKABLE void putString(QString str, bool unEscape=false);
 

src/textrender.cpp

@@ -28,8 +28,8 @@
 
 TextRender::TextRender(QQuickItem *parent) :
     QQuickPaintedItem(parent),
-    iTerm(0),
-    iUtil(0)
+    iTerm(nullptr),
+    iUtil(nullptr)
 {
     setFlag(ItemHasContents);
     connect(this,SIGNAL(myWidthChanged(int)),this,SLOT(updateTermSize()));
@@ -218,14 +218,14 @@ void TextRender::paintFromBuffer(QPainter* painter, QList<QList<TermChar> >& buf
     TermChar tmp = iTerm->zeroChar;
     TermChar nextAttrib = iTerm->zeroChar;
     TermChar currAttrib = iTerm->zeroChar;
-    float currentX = leftmargin;
+    int currentX = leftmargin;
     for(int i=from; i<to; i++) {
         y += iFontHeight;
 
         if(y >= cutAfter)
-            painter->setOpacity(0.3);
+            painter->setOpacity(static_cast<qreal>(0.3));
         else
-            painter->setOpacity(1.0);
+            painter->setOpacity(static_cast<qreal>(1.0));
 
         int xcount = qMin(buffer.at(i).count(), iTerm->termSize().width());
 
@@ -287,7 +287,7 @@ void TextRender::paintFromBuffer(QPainter* painter, QList<QList<TermChar> >& buf
     }
 }
 
-void TextRender::drawBgFragment(QPainter* painter, float x, float y, float width, TermChar style)
+void TextRender::drawBgFragment(QPainter* painter, int x, int y, int width, TermChar style)
 {
     int bg = style.bgColor;
     int fg = style.fgColor;
@@ -304,7 +304,7 @@ void TextRender::drawBgFragment(QPainter* painter, float x, float y, float width
     painter->drawRect(x, y, width, iFontHeight);
 }
 
-void TextRender::drawTextFragment(QPainter* painter, float x, float y, QString text, TermChar style)
+void TextRender::drawTextFragment(QPainter* painter, int x, int y, QString text, TermChar style)
 {
     int bg = style.bgColor;
     int fg = style.fgColor;

src/textrender.h

@@ -38,7 +38,7 @@ class TextRender : public QQuickPaintedItem
 
     Q_OBJECT
 public:
-    explicit TextRender(QQuickItem *parent = 0);
+    explicit TextRender(QQuickItem *parent = nullptr);
     virtual ~TextRender();
     void paint(QPainter*);
 
@@ -49,11 +49,11 @@ class TextRender : public QQuickPaintedItem
     int myHeight() { return iHeight; }
     void setMyWidth(int w) { if(iWidth!=w) { iWidth=w; emit myWidthChanged(w); } }
     void setMyHeight(int h) { if(iHeight!=h) { iHeight=h; emit myHeightChanged(h); } }
-    float fontWidth() { return iFontWidth; }
-    float fontHeight() { return iFontHeight; }
-    float fontDescent() { return iFontDescent; }
-    float fontAscent() { return iFontAscent; }
-    float fontPointSize() { return iFont.pointSize(); }
+    int fontWidth() { return iFontWidth; }
+    int fontHeight() { return iFontHeight; }
+    int fontDescent() { return iFontDescent; }
+    int fontAscent() { return iFontAscent; }
+    int fontPointSize() { return iFont.pointSize(); }
     void setFontPointSize(int psize);
     bool showBufferScrollIndicator() { return iShowBufferScrollIndicator; }
     void setShowBufferScrollIndicator(bool s) { if(iShowBufferScrollIndicator!=s) { iShowBufferScrollIndicator=s; emit showBufferScrollIndicatorChanged(); } }
@@ -81,17 +81,17 @@ public slots:
     Q_DISABLE_COPY(TextRender)
 
     void paintFromBuffer(QPainter* painter, QList<QList<TermChar> >& buffer, int from, int to, int &y);
-    void drawBgFragment(QPainter* painter, float x, float y, float width, TermChar style);
-    void drawTextFragment(QPainter* painter, float x, float y, QString text, TermChar style);
+    void drawBgFragment(QPainter* painter, int x, int y, int width, TermChar style);
+    void drawTextFragment(QPainter* painter, int x, int y, QString text, TermChar style);
     QPoint charsToPixels(QPoint pos);
 
     int iWidth;
     int iHeight;
     QFont iFont;
-    float iFontWidth;
-    float iFontHeight;
-    float iFontDescent;
-    float iFontAscent;
+    int iFontWidth;
+    int iFontHeight;
+    int iFontDescent;
+    int iFontAscent;
     bool iShowBufferScrollIndicator;
 
     Terminal *iTerm;

src/util.cpp

@@ -40,7 +40,7 @@ Util::Util(QSettings *settings, QString version, QObject *parent) :
     newSelection(true),
     iVersionString(version),
     iSettings(settings),
-    iRenderer(0)
+    iRenderer(nullptr)
 {
     swipeModeSet = false;
     swipeAllowed = true;
@@ -183,8 +183,8 @@ void Util::mouseRelease(float eventX, float eventY) {
         return;
 
     if(settingsValue("ui/dragMode")=="gestures") {
-        int xdist = qAbs(eventPos.x() - dragOrigin.x());
-        int ydist = qAbs(eventPos.y() - dragOrigin.y());
+        int xdist = static_cast<int>(qAbs(eventPos.x() - dragOrigin.x()));
+        int ydist = static_cast<int>(qAbs(eventPos.y() - dragOrigin.y()));
         if(eventPos.x() < dragOrigin.x()-reqDragLength && xdist > ydist*2)
             doGesture(PanLeft);
         else if(eventPos.x() > dragOrigin.x()+reqDragLength && xdist > ydist*2)
@@ -229,7 +229,7 @@ bool Util::scrollBackBuffer(QPointF now, QPointF last)
     if (iRenderer->fontHeight() < 1)
         return false;
 
-    int nbLines = ydist / iRenderer->fontHeight();
+    int nbLines = qFloor(ydist / iRenderer->fontHeight());
 
     if (nbLines < 1)
         return false;