Ticket #5451: createdialog.patch

File createdialog.patch, 1.3 KB (added by arnonm@…, 12 years ago)

Rename CreateDialog? to CreatEDialog to solve Macro clash

  • scanwizardhelpers.h

     
    6969    ScanProgressPopup(bool lock, bool strength, bool snr);
    7070    virtual void deleteLater(void);
    7171
    72     void CreateDialog(void);
     72    void CreatEDialog(void);
    7373    virtual DialogCode exec(void);
    7474    void DeleteDialog(void);
    7575
  • scanwizardscanner.cpp

     
    634634    QMutexLocker locker(&popupLock);
    635635    StopPopup();
    636636    popupProgress = new ScanProgressPopup(lock, strength, snr);
    637     popupProgress->CreateDialog();
     637    popupProgress->CreatEDialog();
    638638    if (pthread_create(&popup_thread, NULL, spawn_popup, this) != 0)
    639639    {
    640640        VERBOSE(VB_IMPORTANT, "Failed to start MonitorProgress thread");
  • scanwizardhelpers.cpp

     
    177177    ConfigurationPopupDialog::deleteLater();
    178178}
    179179
    180 void ScanProgressPopup::CreateDialog(void)
     180void ScanProgressPopup::CreatEDialog(void)
    181181{
    182182    if (!dialog)
    183183    {