mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-02-13 08:08:42 +00:00
change case of mainwindow to distinguish from global ptr
This commit is contained in:
@@ -110,7 +110,7 @@ RideImportWizard::init(QList<QString> files, QDir &home, MainWindow *main)
|
||||
|
||||
// save target dir
|
||||
this->home = home;
|
||||
mainwindow = main;
|
||||
mainWindow = main;
|
||||
|
||||
// Fill in the filenames and all the textItems
|
||||
for (int i=0; i < files.count(); i++) {
|
||||
@@ -649,7 +649,6 @@ RideImportWizard::abortClicked()
|
||||
if (temp.rename(fulltarget)) {
|
||||
tableWidget->item(i,5)->setText(tr("File Overwritten"));
|
||||
//no need to add since its already there!
|
||||
//mainwindow->addRide(QFileInfo(fulltarget).fileName(), true); // add to tree view
|
||||
} else
|
||||
tableWidget->item(i,5)->setText(tr("Error - overwrite failed"));
|
||||
} else {
|
||||
@@ -663,7 +662,7 @@ RideImportWizard::abortClicked()
|
||||
QFile source(filenames[i]);
|
||||
if (source.copy(fulltarget)) {
|
||||
tableWidget->item(i,5)->setText(tr("File Saved"));
|
||||
mainwindow->addRide(QFileInfo(fulltarget).fileName(), true); // add to tree view
|
||||
mainWindow->addRide(QFileInfo(fulltarget).fileName(), true); // add to tree view
|
||||
} else
|
||||
tableWidget->item(i,5)->setText(tr("Error - copy failed"));
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ private:
|
||||
QComboBox *todayButton; // set date to today when asking for dates
|
||||
QCheckBox *overFiles; // chance to set overwrite when asking for dates
|
||||
bool overwriteFiles; // flag to overwrite files from checkbox
|
||||
MainWindow *mainwindow; // caller
|
||||
MainWindow *mainWindow; // caller
|
||||
};
|
||||
|
||||
// Item Delegate for Editing Date and Time of Ride inside the
|
||||
|
||||
Reference in New Issue
Block a user