diff options
Diffstat (limited to 'src/dialogs/qfiledialog.cpp')
-rw-r--r-- | src/dialogs/qfiledialog.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index 019d3d56c..53b030153 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -529,8 +529,8 @@ static void resolveLibs() if ( !triedResolve ) { #ifdef QT_THREAD_SUPPORT // protect initialization - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( &triedResolve ) : 0 ); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &triedResolve ) : 0 ); // check triedResolve again, since another thread may have already // done the initialization if ( triedResolve ) { @@ -3404,8 +3404,8 @@ void TQFileDialog::rereadDir() \sa selectedFilter() */ -extern bool qt_resolve_symlinks; // defined in qapplication.cpp -bool Q_EXPORT qt_use_native_dialogs = TRUE; +extern bool tqt_resolve_symlinks; // defined in qapplication.cpp +bool Q_EXPORT tqt_use_native_dialogs = TRUE; /*! This is a convenience static function that returns an existing file @@ -3457,8 +3457,8 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith, TQString *selectedFilter, bool resolveSymlinks ) { - bool save_qt_resolve_symlinks = qt_resolve_symlinks; - qt_resolve_symlinks = resolveSymlinks; + bool save_qt_resolve_symlinks = tqt_resolve_symlinks; + tqt_resolve_symlinks = resolveSymlinks; TQStringList filters; if ( !filter.isEmpty() ) @@ -3494,15 +3494,15 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith, *workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() ); #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter, false ).first(); #elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) + if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) return winGetOpenFileName( initialSelection, filter, workingDirectory, parent, name, caption, selectedFilter ); #elif defined(Q_WS_MAC) - if (qt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) + if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) || tqApp->style().inherits("TQMacStyle"))) return qt_mac_precomposeFileName(macGetOpenFileNames(filter, startWith.isEmpty() ? 0 : workingDirectory, @@ -3534,7 +3534,7 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith, } delete dlg; - qt_resolve_symlinks = save_qt_resolve_symlinks; + tqt_resolve_symlinks = save_qt_resolve_symlinks; return result; } @@ -3588,8 +3588,8 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith, TQString *selectedFilter, bool resolveSymlinks) { - bool save_qt_resolve_symlinks = qt_resolve_symlinks; - qt_resolve_symlinks = resolveSymlinks; + bool save_qt_resolve_symlinks = tqt_resolve_symlinks; + tqt_resolve_symlinks = resolveSymlinks; TQStringList filters; if ( !filter.isEmpty() ) @@ -3619,15 +3619,15 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith, *workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() ); #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::getSaveFileName( initialSelection, filter, workingDirectory, parent, name, caption, selectedFilter ); #elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) + if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) return winGetSaveFileName( initialSelection, filter, workingDirectory, parent, name, caption, selectedFilter ); #elif defined(Q_WS_MAC) - if (qt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) + if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) || tqApp->style().inherits("TQMacStyle"))) return qt_mac_precomposeFileName(macGetSaveFileName(initialSelection, filter, startWith.isEmpty() ? 0 : workingDirectory, parent, name, @@ -3659,7 +3659,7 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith, } delete dlg; - qt_resolve_symlinks = save_qt_resolve_symlinks; + tqt_resolve_symlinks = save_qt_resolve_symlinks; return result; } @@ -4504,8 +4504,8 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, bool dirOnly, bool resolveSymlinks) { - bool save_qt_resolve_symlinks = qt_resolve_symlinks; - qt_resolve_symlinks = resolveSymlinks; + bool save_qt_resolve_symlinks = tqt_resolve_symlinks; + tqt_resolve_symlinks = resolveSymlinks; makeVariables(); TQString wd; @@ -4520,7 +4520,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, initialDir = dir; } else initialDir = TQString::null; - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::getExistingDirectory( initialDir, parent, name, caption ); #elif defined(Q_WS_WIN) TQString initialDir; @@ -4530,7 +4530,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, initialDir = dir; } else initialDir = TQString::null; - if ( qt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle && dirOnly ) + if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle && dirOnly ) return winGetExistingDirectory( initialDir, parent, name, caption ); #endif #if defined(Q_WS_MAC) @@ -4540,7 +4540,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, if (TQFileInfo(u.path()).isDir()) initialDir = (TQString *)&dir; } - if( qt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) + if( tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) || tqApp->style().inherits("TQMacStyle"))) return qt_mac_precomposeFileName(macGetOpenFileNames("", initialDir, parent, name, caption, 0, FALSE, TRUE).first()); @@ -4610,7 +4610,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, if ( !result.isEmpty() && result.right( 1 ) != "/" ) result += "/"; - qt_resolve_symlinks = save_qt_resolve_symlinks; + tqt_resolve_symlinks = save_qt_resolve_symlinks; return result; } @@ -5664,8 +5664,8 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter, TQString *selectedFilter, bool resolveSymlinks ) { - bool save_qt_resolve_symlinks = qt_resolve_symlinks; - qt_resolve_symlinks = resolveSymlinks; + bool save_qt_resolve_symlinks = tqt_resolve_symlinks; + tqt_resolve_symlinks = resolveSymlinks; TQStringList filters; if ( !filter.isEmpty() ) @@ -5687,13 +5687,13 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter, } #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter, true ); #elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) + if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) return winGetOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter ); #elif defined(Q_WS_MAC) - if (qt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) + if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) || tqApp->style().inherits("TQMacStyle"))) { TQStringList sl = macGetOpenFileNames(filter, dir.isEmpty() ? 0 : workingDirectory, parent, name, caption, selectedFilter); @@ -5730,7 +5730,7 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter, } delete dlg; - qt_resolve_symlinks = save_qt_resolve_symlinks; + tqt_resolve_symlinks = save_qt_resolve_symlinks; return lst; } |