mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-03-21 03:28:59 -04:00
Revert "Prepare to send 'datadir' and 'tempdir' strings to m65."
This reverts commit f8e61e05af
.
This commit is contained in:
parent
f8e61e05af
commit
c20201e7f7
@ -116,10 +116,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
|
||||
QTimer *guiTimer = new QTimer(this);
|
||||
connect(guiTimer, SIGNAL(timeout()), this, SLOT(guiUpdate()));
|
||||
|
||||
QTimer *m65Timer = new QTimer(this);
|
||||
m65Timer->setSingleShot(true);
|
||||
connect(m65Timer, SIGNAL(timeout()), this, SLOT(setup_m65()));
|
||||
guiTimer->start(100); //Don't change the 100 ms!
|
||||
|
||||
m_auto=false;
|
||||
m_waterfallAvg = 1;
|
||||
@ -296,10 +293,8 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
if(ui->actionAFMHot->isChecked()) on_actionAFMHot_triggered();
|
||||
if(ui->actionBlue->isChecked()) on_actionBlue_triggered();
|
||||
|
||||
|
||||
|
||||
m65Timer->start(200);
|
||||
guiTimer->start(100); //Don't change the 100 ms!
|
||||
m_dataDir = QStandardPaths::writableLocation (QStandardPaths::DataLocation);
|
||||
m_tempDir = QStandardPaths::writableLocation (QStandardPaths::TempLocation) + "/map65";
|
||||
|
||||
// End of MainWindow constructor
|
||||
}
|
||||
@ -324,14 +319,6 @@ MainWindow::~MainWindow()
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void MainWindow::setup_m65()
|
||||
{
|
||||
m_dataDir = QStandardPaths::writableLocation (QStandardPaths::DataLocation);
|
||||
m_tempDir = QStandardPaths::writableLocation (QStandardPaths::TempLocation) + "/map65";
|
||||
memcpy(datcom_.datadir, m_dataDir.toLatin1(),m_dataDir.length());
|
||||
memcpy(datcom_.tempdir, m_tempDir.toLatin1(),m_tempDir.length());
|
||||
}
|
||||
|
||||
//-------------------------------------------------------- writeSettings()
|
||||
void MainWindow::writeSettings()
|
||||
{
|
||||
|
@ -45,7 +45,6 @@ public slots:
|
||||
void guiUpdate();
|
||||
void doubleClickOnCall(QString hiscall, bool ctrl);
|
||||
void doubleClickOnMessages(QString hiscall, QString t2);
|
||||
void setup_m65();
|
||||
|
||||
protected:
|
||||
virtual void keyPressEvent( QKeyEvent *e );
|
||||
@ -265,6 +264,7 @@ private:
|
||||
SignalMeter *xSignalMeter;
|
||||
SignalMeter *ySignalMeter;
|
||||
|
||||
|
||||
SoundInThread soundInThread; //Instantiate the audio threads
|
||||
SoundOutThread soundOutThread;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user