renames for better readability

neundorf · Jan 20, 2017 · b7c5e73 · b7c5e73
1 parent 4c56d91
commit b7c5e73
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/datadisplay.cpp b/datadisplay.cpp
@@ -61,8 +61,7 @@ DataDisplay::DataDisplay(QWidget *parent)
     connect(m_searchPanel, &SearchPanel::findNext, this, &DataDisplay::find);
     connect(m_searchPanel, &SearchPanel::textEntered, m_highlighter, &DataHighlighter::setSearchString);
 
-    connect(&m_timer, SIGNAL(timeout()), this, SLOT(BlockReady()));
-    m_timer.start(100);
+    startTimer(100);
 }
 
 void DataDisplay::clear()
@@ -76,7 +75,7 @@ void DataDisplay::setReadOnly(bool readonly) { m_dataDisplay->setReadOnly(readon
 
 void DataDisplay::setUndoRedoEnabled(bool enable) { m_dataDisplay->setUndoRedoEnabled(enable); }
 
-void DataDisplay::BlockReady(void)
+void DataDisplay::displayDataGo(void)
 {
     if (m_data.isEmpty())
         return;
@@ -194,7 +193,7 @@ void DataDisplay::displayData(const QByteArray &data)
 
     // append the data to end of the parent's TextEdit
     // each part of the line with it's set format
-    // moved to BlockReady()
+    // moved to displayDataGo();
 }
 
 /*!

diff --git a/datadisplay.h b/datadisplay.h
@@ -24,7 +24,6 @@
 
 #include <QPlainTextEdit>
 #include <QTime>
-#include <QTimer>
 
 class TimeView;
 class SearchPanel;
@@ -55,6 +54,8 @@ class DataDisplay : public QWidget
 
     void displayData(const QByteArray &data);
 
+    void displayDataGo(void);
+
     void setDisplayTime(bool displayTime);
 
     void setDisplayHex(bool displayHex);
@@ -130,11 +131,10 @@ class DataDisplay : public QWidget
 
     QVector<QTime> *m_timestamps;
     DataHighlighter *m_highlighter;
-    QTimer m_timer;
     bool m_redisplay;
 
-private slots:
-    void BlockReady(void);
+protected:
+    void timerEvent(QTimerEvent *event) { displayDataGo(); }
 };
 
 class DataDisplayPrivate : public QPlainTextEdit