summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/kernel')
-rw-r--r--src/widgets/kernel/qapplication_p.h25
-rw-r--r--src/widgets/kernel/qwhatsthis.cpp2
-rw-r--r--src/widgets/kernel/qwidget.h15
3 files changed, 1 insertions, 41 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
index 1e5705524e..bc9060a7d5 100644
--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@@ -100,11 +100,6 @@ extern QSysInfo::WinVersion qt_winver;
#elif defined (Q_OS_MAC)
extern QSysInfo::MacVersion qt_macver;
#endif
-#if defined(Q_WS_QWS)
-class QWSManager;
-class QDirectPainter;
-struct QWSServerCleaner { ~QWSServerCleaner(); };
-#endif
typedef QHash<QByteArray, QFont> FontHash;
FontHash *qt_app_fonts_hash();
@@ -131,9 +126,6 @@ public:
static bool x11_apply_settings();
#endif
static void reset_instance_pointer();
-#elif defined(Q_WS_QWS)
- static bool qws_apply_settings();
- static QWidget *findWidget(const QObjectList&, const QPoint &, bool rec);
#endif
#ifdef Q_OS_WINCE
static int autoMaximizeThreshold;
@@ -227,19 +219,6 @@ public:
#if defined(Q_WS_X11)
static void applyX11SpecificCommandLineArguments(QWidget *main_widget);
-#elif defined(Q_WS_QWS)
- static void applyQWSSpecificCommandLineArguments(QWidget *main_widget);
-#endif
-
-#ifdef Q_WS_QWS
- QPointer<QWSManager> last_manager;
- QWSServerCleaner qwsServerCleaner;
-# ifndef QT_NO_DIRECTPAINTER
- QHash<WId, QDirectPainter *> *directPainters;
-# endif
- QRect maxWindowRect(const QScreen *screen) const { return maxWindowRects[screen]; }
- void setMaxWindowRect(const QScreen *screen, int screenNo, const QRect &rect);
- void setScreenTransformation(QScreen *screen, int screenNo, int transformation);
#endif
static QApplicationPrivate *instance() { return self; }
@@ -316,10 +295,6 @@ public:
QPixmap applyQIconStyleHelper(QIcon::Mode mode, const QPixmap& base) const;
private:
-#ifdef Q_WS_QWS
- QHash<const QScreen*, QRect> maxWindowRects;
-#endif
-
static QApplicationPrivate *self;
static void giveFocusAccordingToFocusPolicy(QWidget *w,
diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp
index 7f7d958e70..e135884cff 100644
--- a/src/widgets/kernel/qwhatsthis.cpp
+++ b/src/widgets/kernel/qwhatsthis.cpp
@@ -298,7 +298,7 @@ void QWhatsThat::paintEvent(QPaintEvent*)
SystemParametersInfo(SPI_GETDROPSHADOW, 0, &shadow, 0);
drawShadow = !shadow;
}
-#elif defined(Q_WS_MAC) || defined(Q_WS_QWS)
+#elif defined(Q_WS_MAC)
drawShadow = false; // never draw it on OS X or QWS, as we get it for free
#endif
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index 0110a3850b..af87612013 100644
--- a/src/widgets/kernel/qwidget.h
+++ b/src/widgets/kernel/qwidget.h
@@ -120,17 +120,6 @@ public:
QRect crect;
mutable QPalette pal;
QFont fnt;
-#if defined(Q_WS_QWS)
-// QRegion req_region; // Requested region
-// mutable QRegion paintable_region; // Paintable region
-// mutable bool paintable_region_dirty;// needs to be recalculated
-// mutable QRegion alloc_region; // Allocated region
-// mutable bool alloc_region_dirty; // needs to be recalculated
-// mutable int overlapping_children; // Handle overlapping children
-
- int alloc_region_index;
-// int alloc_region_revision;
-#endif
QRect wrect;
};
@@ -455,10 +444,6 @@ public:
inline bool updatesEnabled() const;
void setUpdatesEnabled(bool enable);
-#if 0 //def Q_WS_QWS
- void repaintUnclipped(const QRegion &, bool erase = true);
-#endif
-
#ifndef QT_NO_GRAPHICSVIEW
QGraphicsProxyWidget *graphicsProxyWidget() const;
#endif