diff options
| author | Timothy Pearson <[email protected]> | 2012-02-27 17:54:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-02-27 17:54:38 -0600 |
| commit | 2d9396b28f89e7146f4abbf5cb3806e9eb7fd5b1 (patch) | |
| tree | aa183234019de6ff78d59059168f9db8b4ffb75d | |
| parent | 603d89d3a1dc6accf8a59382f7b374825ed04eb7 (diff) | |
| download | tdebase-2d9396b28f89e7146f4abbf5cb3806e9eb7fd5b1.tar.gz tdebase-2d9396b28f89e7146f4abbf5cb3806e9eb7fd5b1.zip | |
Rename tqt3 color functions
| -rw-r--r-- | ksmserver/shutdowndlg.cpp | 8 | ||||
| -rw-r--r-- | tqt3integration/utils/qt/in/qt.patch | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index f0f33a459..9a7e4ef04 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -156,7 +156,7 @@ void KSMShutdownFeedback::slotPaintEffect() uchar * end = m_grayImage.bits() + m_grayImage.numBytes(); while ( r != end ) { - *reinterpret_cast<TQRgb*>(r) = qRgba(0, 0, 0, 128); + *reinterpret_cast<TQRgb*>(r) = tqRgba(0, 0, 0, 128); r += 4; } @@ -234,7 +234,7 @@ void KSMShutdownFeedback::slotPaintEffect() short int opac = static_cast<short int>( 128 - cosf( M_PI*(y-y1)/heightUnit )*128.0f ); for( short int x = 0; x < imgWidth; ++x ) { - *reinterpret_cast<TQRgb*>(rd) = qRgba(0, 0, 0, ((255.0-opac)/(255.0/127.0))); + *reinterpret_cast<TQRgb*>(rd) = tqRgba(0, 0, 0, ((255.0-opac)/(255.0/127.0))); rs += 4; rd += 4; } } @@ -403,7 +403,7 @@ void KSMShutdownFeedback::slotPaintEffect() uchar * end = m_grayImage.bits() + m_grayImage.numBytes(); while ( r != end ) { - *reinterpret_cast<TQRgb*>(r) = qRgba(0, 0, 0, 107); + *reinterpret_cast<TQRgb*>(r) = tqRgba(0, 0, 0, 107); r += 4; } @@ -480,7 +480,7 @@ void KSMShutdownFeedback::slotPaintEffect() // linear gradients look bad, so use cos-function for( short int x = 0; x < imgWidth; ++x ) { - *reinterpret_cast<TQRgb*>(rd) = qRgba(0, 0, 0, 107); + *reinterpret_cast<TQRgb*>(rd) = tqRgba(0, 0, 0, 107); rs += 4; rd += 4; } } diff --git a/tqt3integration/utils/qt/in/qt.patch b/tqt3integration/utils/qt/in/qt.patch index 578388440..ea2e04194 100644 --- a/tqt3integration/utils/qt/in/qt.patch +++ b/tqt3integration/utils/qt/in/qt.patch @@ -21,7 +21,7 @@ + return QKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, + caption, selectedFilter, false ).first(); +#elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && qApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle ) + if ( qt_use_native_dialogs && tqApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle ) return winGetOpenFileName( initialSelection, filter, workingDirectory, parent, name, caption, selectedFilter ); @@ -3546,7 +3554,11 @@ QString QFileDialog::getSaveFileName( co @@ -34,7 +34,7 @@ + return QKDEIntegration::getSaveFileName( initialSelection, filter, workingDirectory, + parent, name, caption, selectedFilter ); +#elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && qApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle ) + if ( qt_use_native_dialogs && tqApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle ) return winGetSaveFileName( initialSelection, filter, workingDirectory, parent, name, caption, selectedFilter ); @@ -4433,7 +4445,17 @@ QString QFileDialog::getExistingDirector @@ -65,7 +65,7 @@ + if ( qt_use_native_dialogs && QKDEIntegration::enabled()) + return QKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter, true ); +#elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && qApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle ) + if ( qt_use_native_dialogs && tqApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle ) return winGetOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter ); #elif defined(Q_WS_MAC) --- src/dialogs/qmessagebox.cpp.sav 2003-12-22 12:24:32.000000000 +0100 |