Mercurial > hg > easyhg-kdiff3
diff kdiff3/src/fileaccess.h @ 70:5bbfe4784324
KDiff3 0.9.89 for Qt4
| author | joachim99 |
|---|---|
| date | Tue, 18 Apr 2006 20:19:57 +0000 |
| parents | 8febbfb1148c |
| children | f7dad0aa6146 |
line wrap: on
line diff
--- a/kdiff3/src/fileaccess.h Mon Apr 10 08:40:51 2006 +0000 +++ b/kdiff3/src/fileaccess.h Tue Apr 18 20:19:57 2006 +0000 @@ -13,6 +13,9 @@ #include <qdialog.h> #include <qfileinfo.h> +//Added by qt3to4: +#include <QLabel> +#include <QTimerEvent> #include <kprogress.h> #include <kio/job.h> #include <kio/jobclasses.h> @@ -216,6 +219,7 @@ std::list<ProgressLevelData> m_progressStack; int m_progressDelayTimer; + std::list<QEventLoop*> m_eventLoopStack; KProgress* m_pProgressBar; KProgress* m_pSubProgressBar;