diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-28 15:51:58 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-28 15:51:58 -0500 |
| commit | fe7969ef886d7287fa959929ddd33fbad8407884 (patch) | |
| tree | 589aacc109d27561a5188bb46bce27c78bad8f5b /src/tools | |
| parent | dba8a853b65e5707e48450e5085e0ff0513b4203 (diff) | |
| download | tqt3-fe7969ef886d7287fa959929ddd33fbad8407884.tar.gz tqt3-fe7969ef886d7287fa959929ddd33fbad8407884.zip | |
Automated update from Qt3
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdatetime.cpp | 2 | ||||
| -rw-r--r-- | src/tools/qsettings.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp index 6a8d45e20..3fb1e29c2 100644 --- a/src/tools/qdatetime.cpp +++ b/src/tools/qdatetime.cpp @@ -1178,7 +1178,7 @@ bool TQDate::isValid( int y, int m, int d ) bool TQDate::leapYear( int y ) { - return y % 4 == 0 && y % 100 != 0 || y % 400 == 0; + return (y % 4 == 0 && y % 100 != 0) || y % 400 == 0; } /*! diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp index d5e9f81c0..4dd056d0e 100644 --- a/src/tools/qsettings.cpp +++ b/src/tools/qsettings.cpp @@ -1051,7 +1051,7 @@ bool TQSettings::sync() if ( success ) { TQDir dir( TQFileInfo( file ).dir( TRUE ) ); - if ( dir.exists( filename ) && !dir.remove( filename ) || + if ( ( dir.exists( filename ) && !dir.remove( filename ) ) || !dir.rename( file.name(), filename, TRUE ) ) { #ifdef QT_CHECK_STATE |