Diffstat (limited to 'pwmanager/pwmanager/pwminit.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | pwmanager/pwmanager/pwminit.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp index d59d4d8..15e21ee 100644 --- a/pwmanager/pwmanager/pwminit.cpp +++ b/pwmanager/pwmanager/pwminit.cpp | |||
@@ -20,6 +20,8 @@ | |||
20 | #include "pwminit.h" | 20 | #include "pwminit.h" |
21 | #include "randomizer.h" | 21 | #include "randomizer.h" |
22 | #include <qdir.h> | 22 | #include <qdir.h> |
23 | //Added by qt3to4: | ||
24 | #include <Q3ValueList> | ||
23 | 25 | ||
24 | #ifndef PWM_EMBEDDED | 26 | #ifndef PWM_EMBEDDED |
25 | #include "selftest.h" | 27 | #include "selftest.h" |
@@ -92,12 +94,12 @@ PwMInit::~PwMInit() | |||
92 | #ifndef PWM_EMBEDDED | 94 | #ifndef PWM_EMBEDDED |
93 | SelfTest::cancel(); | 95 | SelfTest::cancel(); |
94 | // close all open mainwnds | 96 | // close all open mainwnds |
95 | QValueList<PwM *>::iterator i = _mainWndList.begin(), | 97 | Q3ValueList<PwM *>::iterator i = _mainWndList.begin(), |
96 | end = _mainWndList.end(); | 98 | end = _mainWndList.end(); |
97 | 99 | ||
98 | #else | 100 | #else |
99 | // close all open mainwnds | 101 | // close all open mainwnds |
100 | QValueList<PwM *>::Iterator i = _mainWndList.begin(), | 102 | Q3ValueList<PwM *>::Iterator i = _mainWndList.begin(), |
101 | end = _mainWndList.end(); | 103 | end = _mainWndList.end(); |
102 | #endif | 104 | #endif |
103 | while (i != end) { | 105 | while (i != end) { |
@@ -426,11 +428,11 @@ again: | |||
426 | } | 428 | } |
427 | #ifndef PWM_EMBEDDED | 429 | #ifndef PWM_EMBEDDED |
428 | // find the closed window in the "mainWndList" and delete it. | 430 | // find the closed window in the "mainWndList" and delete it. |
429 | QValueList<PwM *>::iterator i = _mainWndList.begin(), | 431 | Q3ValueList<PwM *>::iterator i = _mainWndList.begin(), |
430 | end = _mainWndList.end(); | 432 | end = _mainWndList.end(); |
431 | #else | 433 | #else |
432 | // find the closed window in the "mainWndList" and delete it. | 434 | // find the closed window in the "mainWndList" and delete it. |
433 | QValueList<PwM *>::Iterator i = _mainWndList.begin(), | 435 | Q3ValueList<PwM *>::Iterator i = _mainWndList.begin(), |
434 | end = _mainWndList.end(); | 436 | end = _mainWndList.end(); |
435 | #endif | 437 | #endif |
436 | while (i != end) { | 438 | while (i != end) { |
@@ -573,12 +575,12 @@ void PwMInit::minimizeAllMainWnd(bool toTray) | |||
573 | if (!_mainWndList.count()) | 575 | if (!_mainWndList.count()) |
574 | return; | 576 | return; |
575 | #endif | 577 | #endif |
576 | const QValueList<PwM *> *ml = mainWndList(); | 578 | const Q3ValueList<PwM *> *ml = mainWndList(); |
577 | #ifndef PWM_EMBEDDED | 579 | #ifndef PWM_EMBEDDED |
578 | QValueList<PwM *>::const_iterator it = ml->begin(), | 580 | Q3ValueList<PwM *>::const_iterator it = ml->begin(), |
579 | end = ml->end(); | 581 | end = ml->end(); |
580 | #else | 582 | #else |
581 | QValueList<PwM *>::ConstIterator it = ml->begin(), | 583 | Q3ValueList<PwM *>::ConstIterator it = ml->begin(), |
582 | end = ml->end(); | 584 | end = ml->end(); |
583 | #endif | 585 | #endif |
584 | PwM *wnd; | 586 | PwM *wnd; |
@@ -624,7 +626,6 @@ PwMApplication::PwMApplication(int & argc, char ** argv) | |||
624 | : QApplication( argc, argv ) | 626 | : QApplication( argc, argv ) |
625 | , init (0) | 627 | , init (0) |
626 | { | 628 | { |
627 | setStyle( new QPlatinumStyle ()); | ||
628 | QString hdir = QDir::homeDirPath(); | 629 | QString hdir = QDir::homeDirPath(); |
629 | // there is a bug when creating dirs for WIN 98 | 630 | // there is a bug when creating dirs for WIN 98 |
630 | // it is difficult to fix, because we have no WIN 98 runnung | 631 | // it is difficult to fix, because we have no WIN 98 runnung |
@@ -656,6 +657,6 @@ PwMApplication::~PwMApplication() | |||
656 | 657 | ||
657 | 658 | ||
658 | 659 | ||
659 | #ifndef PWM_EMBEDDED | 660 | #ifndef PWM_EMBEDDED_ |
660 | #include "pwminit.moc" | 661 | #include "moc_pwminit.cpp" |
661 | #endif | 662 | #endif |