diff options
Diffstat (limited to 'src/widgets/styles/qstylefactory.cpp')
-rw-r--r-- | src/widgets/styles/qstylefactory.cpp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/widgets/styles/qstylefactory.cpp b/src/widgets/styles/qstylefactory.cpp index 2ce88907ec..f12ea27e78 100644 --- a/src/widgets/styles/qstylefactory.cpp +++ b/src/widgets/styles/qstylefactory.cpp @@ -46,8 +46,6 @@ #include "qapplication.h" #include "qwindowsstyle.h" -#include "qmotifstyle.h" -#include "qcdestyle.h" #ifndef QT_NO_STYLE_PLASTIQUE #include "qplastiquestyle.h" #endif @@ -95,7 +93,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, plugin (see QStylePlugin). The valid keys can be retrieved using the keys() - function. Typically they include "windows", "motif", "cde", + function. Typically they include "windows", "plastique" and "cleanlooks". Depending on the platform, "windowsxp", "windowsvista" and "macintosh" may be available. Note that keys are case insensitive. @@ -143,16 +141,6 @@ QStyle *QStyleFactory::create(const QString& key) ret = new QWindowsVistaStyle; else #endif -#ifndef QT_NO_STYLE_MOTIF - if (style == QLatin1String("motif")) - ret = new QMotifStyle; - else -#endif -#ifndef QT_NO_STYLE_CDE - if (style == QLatin1String("cde")) - ret = new QCDEStyle; - else -#endif #ifndef QT_NO_STYLE_PLASTIQUE if (style == QLatin1String("plastique")) ret = new QPlastiqueStyle; @@ -226,14 +214,6 @@ QStringList QStyleFactory::keys() (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based))) list << QLatin1String("WindowsVista"); #endif -#ifndef QT_NO_STYLE_MOTIF - if (!list.contains(QLatin1String("Motif"))) - list << QLatin1String("Motif"); -#endif -#ifndef QT_NO_STYLE_CDE - if (!list.contains(QLatin1String("CDE"))) - list << QLatin1String("CDE"); -#endif #ifndef QT_NO_STYLE_PLASTIQUE if (!list.contains(QLatin1String("Plastique"))) list << QLatin1String("Plastique"); |