Changeset b0dfe0844e in tspsg


Ignore:
Timestamp:
Sep 12, 2012, 7:56:15 PM (12 years ago)
Author:
Oleksii Serdiuk
Branches:
appveyor, imgbot, master, readme
Children:
2fcdd7bfdf
Parents:
0e473fbe88
Message:

Some Windows specific fixes to be compilable with Qt 5.

Location:
src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/mainwindow.cpp

    r0e473fbe88 rb0dfe0844e  
    779779            tl = NULL;
    780780        } else {
    781             tl->SetProgressValue(winId(), 0, n * 2);
     781            tl->SetProgressValue(HWND(winId()), 0, n * 2);
    782782        }
    783783    }
     
    804804#ifdef Q_OS_WIN32
    805805            if (tl != NULL) {
    806                 tl->SetProgressState(winId(), TBPF_ERROR);
     806                tl->SetProgressState(HWND(winId()), TBPF_ERROR);
    807807            }
    808808#endif
     
    816816#ifdef Q_OS_WIN32
    817817        if (tl != NULL)
    818             tl->SetProgressState(winId(), TBPF_INDETERMINATE);
     818            tl->SetProgressState(HWND(winId()), TBPF_INDETERMINATE);
    819819#endif
    820820        QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
     
    831831#ifdef Q_OS_WIN32
    832832        if (tl != NULL) {
    833             tl->SetProgressState(winId(), TBPF_NOPROGRESS);
     833            tl->SetProgressState(HWND(winId()), TBPF_NOPROGRESS);
    834834            tl->Release();
    835835            tl = NULL;
     
    845845#ifdef Q_OS_WIN32
    846846    if (tl != NULL)
    847         tl->SetProgressValue(winId(), spinCities->value(), spinCities->value() + solver.getTotalSteps() + 1);
     847        tl->SetProgressValue(HWND(winId()), spinCities->value(), spinCities->value() + solver.getTotalSteps() + 1);
    848848#endif
    849849
     
    915915#ifdef Q_OS_WIN32
    916916            if (tl != NULL)
    917                 tl->SetProgressState(winId(), TBPF_INDETERMINATE);
     917                tl->SetProgressState(HWND(winId()), TBPF_INDETERMINATE);
    918918#endif
    919919#ifndef QT_NO_CONCURRENT
     
    929929#ifdef Q_OS_WIN32
    930930            if (tl != NULL) {
    931                 tl->SetProgressState(winId(), TBPF_NOPROGRESS);
     931                tl->SetProgressState(HWND(winId()), TBPF_NOPROGRESS);
    932932                tl->Release();
    933933                tl = NULL;
     
    939939#ifdef Q_OS_WIN32
    940940        if (tl != NULL)
    941             tl->SetProgressValue(winId(), spinCities->value() + n, spinCities->value() + solver.getTotalSteps() + 1);
     941            tl->SetProgressValue(HWND(winId()), spinCities->value() + n, spinCities->value() + solver.getTotalSteps() + 1);
    942942#endif
    943943
     
    986986#ifdef Q_OS_WIN32
    987987    if (tl != NULL)
    988         tl->SetProgressValue(winId(), spinCities->value() + n, spinCities->value() + solver.getTotalSteps() + 1);
     988        tl->SetProgressValue(HWND(winId()), spinCities->value() + n, spinCities->value() + solver.getTotalSteps() + 1);
    989989#endif
    990990
     
    10491049#ifdef Q_OS_WIN32
    10501050    if (tl != NULL)
    1051         tl->SetProgressState(winId(), TBPF_INDETERMINATE);
     1051        tl->SetProgressState(HWND(winId()), TBPF_INDETERMINATE);
    10521052#endif
    10531053#ifndef QT_NO_CONCURRENT
     
    10631063#ifdef Q_OS_WIN32
    10641064    if (tl != NULL) {
    1065         tl->SetProgressState(winId(), TBPF_NOPROGRESS);
     1065        tl->SetProgressState(HWND(winId()), TBPF_NOPROGRESS);
    10661066        tl->Release();
    10671067        tl = NULL;
     
    11411141void MainWindow::solverRoutePartFound(int n)
    11421142{
    1143     tl->SetProgressValue(winId(), n, spinCities->value() * 2);
     1143    tl->SetProgressValue(HWND(winId()), n, spinCities->value() * 2);
    11441144}
    11451145#endif // Q_OS_WIN32
  • src/qtwin.cpp

    r0e473fbe88 rb0dfe0844e  
    255255        }
    256256    }
     257#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
    257258    return QWidget::winEvent(message, result);
    258 }
    259 #endif
     259#else
     260    return QWidget::nativeEvent("windows_generic_MSG", message, result);
     261#endif
     262}
     263#endif
Note: See TracChangeset for help on using the changeset viewer.