NeoTheFox/RepRaptor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactoring

Browse Source 
Converted old signals and slots to new style
Cleanup
This commit is contained in:
NeoTheFox 2015-03-21 01:11:50 +03:00
parent f38e1bf069
commit 5f1c9d68f7
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mainwindow.cpp
View File

@ -95,9 +95,8 @@ MainWindow::MainWindow(QWidget *parent) :
serialupdate(); serialupdate();
//Internal signal-slots //Internal signal-slots
connect(statusTimer, SIGNAL(timeout()), this, SLOT(checkStatus())); connect(statusTimer, &QTimer::timeout, this, &MainWindow::checkStatus);
connect(progressSDTimer, SIGNAL(timeout()), this, SLOT(checkSDStatus())); connect(progressSDTimer, &QTimer::timeout, this, &MainWindow::checkSDStatus);
connect(this, SIGNAL(eepromReady()), this, SLOT(openEEPROMeditor()));
//Register all the types //Register all the types
qRegisterMetaType<TemperatureReadings>("TemperatureReadings"); qRegisterMetaType<TemperatureReadings>("TemperatureReadings");
@ -708,7 +707,7 @@ void MainWindow::initSDprinting(QStringList sdFiles)
{ {
SDWindow sdwindow(sdFiles, this); SDWindow sdwindow(sdFiles, this);
connect(&sdwindow, SIGNAL(fileSelected(QString)), this, SLOT(selectSDfile(QString))); connect(&sdwindow, &SDWindow::fileSelected, this, &MainWindow::selectSDfile);
sdwindow.exec(); sdwindow.exec();
} }

1
mainwindow.h
View File

@ -148,7 +148,6 @@ private slots:
signals: signals:
void sdReady(); void sdReady();
void eepromReady();
void receivedData(QByteArray); void receivedData(QByteArray);
void startedReadingEEPROM(); void startedReadingEEPROM();