FakeVim: Remove a few uses of QObject::sender()

Considered bad style...

Change-Id: Idc1d39bd55fa30dfa854bbc99094f5f6ec9afc4d
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@qt.io>

1 files changed, 37 insertions, 44 deletions

diff --git a/tests/manual/fakevim/main.cpp b/tests/manual/fakevim/main.cpp
index 4250676dea2..7c364c09ad9 100644
--- a/tests/manual/fakevim/main.cpp
+++ b/tests/manual/fakevim/main.cpp
@@ -36,8 +36,6 @@
 
 using namespace FakeVim::Internal;
 
-typedef QLatin1String _;
-
 /**
  * Simple editor widget.
  * @tparam TextEdit QTextEdit or QPlainTextEdit as base class
@@ -46,9 +44,10 @@ template <typename TextEdit>
 class Editor : public TextEdit
 {
 public:
-    Editor(QWidget *parent = 0) : TextEdit(parent)
+    Editor()
     {
         TextEdit::setCursorWidth(0);
+        TextEdit::setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     }
 
     void paintEvent(QPaintEvent *e)
@@ -62,7 +61,7 @@ public:
 
             if ( TextEdit::overwriteMode() ) {
                 QFontMetrics fm(TextEdit::font());
-                rect.setWidth(fm.width(QLatin1Char('m')));
+                rect.setWidth(fm.width('m'));
                 painter.setPen(Qt::NoPen);
                 painter.setBrush(TextEdit::palette().color(QPalette::Base));
                 painter.setCompositionMode(QPainter::CompositionMode_Difference);
@@ -80,27 +79,29 @@ class Proxy : public QObject
     Q_OBJECT
 
 public:
-    Proxy(QWidget *widget, QMainWindow *mw, QObject *parent = 0)
-      : QObject(parent), m_widget(widget), m_mainWindow(mw)
+    Proxy(QMainWindow *mw)
+      : m_mainWindow(mw)
     {}
 
-    void changeSelection(const QList<QTextEdit::ExtraSelection> &s)
+    void changeSelection(FakeVimHandler *handler, const QList<QTextEdit::ExtraSelection> &s)
     {
-        if (QPlainTextEdit *ed = qobject_cast<QPlainTextEdit *>(m_widget))
+        QWidget *widget = handler->widget();
+        if (auto ed = qobject_cast<QPlainTextEdit *>(widget))
             ed->setExtraSelections(s);
-        else if (QTextEdit *ed = qobject_cast<QTextEdit *>(m_widget))
+        else if (auto ed = qobject_cast<QTextEdit *>(widget))
             ed->setExtraSelections(s);
     }
 
-    void changeStatusData(const QString &info)
+    void changeStatusData(FakeVimHandler *, const QString &info)
     {
         m_statusData = info;
         updateStatusBar();
     }
 
-    void highlightMatches(const QString &pattern)
+    void highlightMatches(FakeVimHandler *handler, const QString &pattern)
     {
-        QTextEdit *ed = qobject_cast<QTextEdit *>(m_widget);
+        QWidget *widget = handler->widget();
+        auto ed = qobject_cast<QTextEdit *>(widget);
         if (!ed)
             return;
 
@@ -136,39 +137,36 @@ public:
         }
     }
 
-    void changeStatusMessage(const QString &contents, int cursorPos)
+    void changeStatusMessage(FakeVimHandler *, const QString &contents, int cursorPos)
     {
         m_statusMessage = cursorPos == -1 ? contents
             : contents.left(cursorPos) + QChar(10073) + contents.mid(cursorPos);
         updateStatusBar();
     }
 
-    void changeExtraInformation(const QString &info)
+    void changeExtraInformation(FakeVimHandler *handler, const QString &info)
     {
-        QMessageBox::information(m_widget, tr("Information"), info);
+        QMessageBox::information(handler->widget(), tr("Information"), info);
     }
 
     void updateStatusBar()
     {
         int slack = 80 - m_statusMessage.size() - m_statusData.size();
-        QString msg = m_statusMessage + QString(slack, QLatin1Char(' ')) + m_statusData;
+        QString msg = m_statusMessage + QString(slack, ' ') + m_statusData;
         m_mainWindow->statusBar()->showMessage(msg);
     }
 
-    void handleExCommand(bool *handled, const ExCommand &cmd)
+    void handleExCommand(FakeVimHandler *, bool *handled, const ExCommand &cmd)
     {
-        if (cmd.matches(_("q"), _("quit")) || cmd.matches(_("qa"), _("qall"))) {
+        if (cmd.matches("q", "quit") || cmd.matches("qa", "qall")) {
             QApplication::quit();
+            *handled = true;
         } else {
             *handled = false;
-            return;
         }
-
-        *handled = true;
     }
 
 private:
-    QWidget *m_widget;
     QMainWindow *m_mainWindow;
     QString m_statusMessage;
     QString m_statusData;
@@ -177,16 +175,11 @@ private:
 QWidget *createEditorWidget(bool usePlainTextEdit)
 {
     QWidget *editor = 0;
-    if (usePlainTextEdit) {
-        Editor<QPlainTextEdit> *w = new Editor<QPlainTextEdit>;
-        w->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-        editor = w;
-    } else {
-        Editor<QTextEdit> *w = new Editor<QTextEdit>;
-        w->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-        editor = w;
-    }
-    editor->setObjectName(_("Editor"));
+    if (usePlainTextEdit)
+        editor = new Editor<QPlainTextEdit>;
+    else
+        editor = new Editor<QTextEdit>;
+    editor->setObjectName("Editor");
     editor->setFocus();
 
     return editor;
@@ -195,13 +188,13 @@ QWidget *createEditorWidget(bool usePlainTextEdit)
 void initHandler(FakeVimHandler &handler)
 {
     // Set some Vim options.
-    handler.handleCommand(_("set expandtab"));
-    handler.handleCommand(_("set shiftwidth=8"));
-    handler.handleCommand(_("set tabstop=16"));
-    handler.handleCommand(_("set autoindent"));
+    handler.handleCommand("set expandtab");
+    handler.handleCommand("set shiftwidth=8");
+    handler.handleCommand("set tabstop=16");
+    handler.handleCommand("set autoindent");
 
     // Try to source file "fakevimrc" from current directory.
-    handler.handleCommand(_("source fakevimrc"));
+    handler.handleCommand("source fakevimrc");
 
     handler.installEventFilter();
     handler.setupWidget();
@@ -209,7 +202,7 @@ void initHandler(FakeVimHandler &handler)
 
 void initMainWindow(QMainWindow &mainWindow, QWidget *centralWidget, const QString &title)
 {
-    mainWindow.setWindowTitle(QString(_("FakeVim (%1)")).arg(title));
+    mainWindow.setWindowTitle(QString("FakeVim (%1)").arg(title));
     mainWindow.setCentralWidget(centralWidget);
     mainWindow.resize(600, 650);
     mainWindow.move(0, 0);
@@ -217,14 +210,14 @@ void initMainWindow(QMainWindow &mainWindow, QWidget *centralWidget, const QStri
 
     // Set monospace font for editor and status bar.
     QFont font = QApplication::font();
-    font.setFamily(_("Monospace"));
+    font.setFamily("Monospace");
     centralWidget->setFont(font);
     mainWindow.statusBar()->setFont(font);
 }
 
 void readFile(FakeVimHandler &handler, const QString &editFileName)
 {
-    handler.handleCommand(QString(_("r %1")).arg(editFileName));
+    handler.handleCommand("r " + editFileName);
 }
 
 void connectSignals(FakeVimHandler &handler, Proxy &proxy)
@@ -252,20 +245,20 @@ int main(int argc, char *argv[])
     // If first argument is present use QPlainTextEdit instead on QTextEdit;
     bool usePlainTextEdit = args.size() > 1;
     // Second argument is path to file to edit.
-    const QString editFileName = args.value(2, QString(_("/usr/share/vim/vim73/tutor/tutor")));
+    const QString editFileName = args.value(2, "/usr/share/vim/vim73/tutor/tutor");
 
     // Create editor widget.
     QWidget *editor = createEditorWidget(usePlainTextEdit);
 
     // Create FakeVimHandler instance which will emulate Vim behavior in editor widget.
-    FakeVimHandler handler(editor, 0);
+    FakeVimHandler handler(editor, nullptr);
 
     // Create main window.
     QMainWindow mainWindow;
-    initMainWindow(mainWindow, editor, usePlainTextEdit ? _("QPlainTextEdit") : _("QTextEdit"));
+    initMainWindow(mainWindow, editor, usePlainTextEdit ? "QPlainTextEdit" : "QTextEdit");
 
     // Connect slots to FakeVimHandler signals.
-    Proxy proxy(editor, &mainWindow);
+    Proxy proxy(&mainWindow);
     connectSignals(handler, proxy);
 
     // Initialize FakeVimHandler.