summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-07-18 14:24:05 (UTC)
committer mickeyl <mickeyl>2004-07-18 14:24:05 (UTC)
commitf37561246bc7d8bf4cf791ce156afdf098552dca (patch) (side-by-side diff)
tree941a9a998c20f1b69631cdd81796432f23806215
parent5dbb4003205a87445ff48ecdf110a5f476852f5d (diff)
downloadopie-f37561246bc7d8bf4cf791ce156afdf098552dca.zip
opie-f37561246bc7d8bf4cf791ce156afdf098552dca.tar.gz
opie-f37561246bc7d8bf4cf791ce156afdf098552dca.tar.bz2
qte-2.3.2 compat compile fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 5e88086..3b6a987 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1251,100 +1251,101 @@ int QPEApplication::defaultRotation()
}
else if ( d.contains( "Rot270" ) ) {
deforient = 270;
}
else {
deforient = 0;
}
}
return deforient;
}
/*!
\internal
*/
void QPEApplication::setDefaultRotation( int r )
{
if ( qApp->type() == GuiServer ) {
deforient = r;
setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 );
Config config("qpe");
config.setGroup( "Rotation" );
config.writeEntry( "Rot", r );
}
else {
#ifndef QT_NO_COP
{ QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" );
e << r;
}
#endif
}
}
#include <qgfx_qws.h>
#include <qwindowsystem_qws.h>
extern void qws_clearLoadedFonts();
void QPEApplication::setCurrentMode( int x, int y, int depth )
{
// Reset the caches
qws_clearLoadedFonts();
QPixmapCache::clear();
// Change the screen mode
qt_screen->setMode(x, y, depth);
if ( qApp->type() == GuiServer ) {
+#if QT_VERSION > 236
// Reconfigure the GuiServer
qwsServer->beginDisplayReconfigure();
qwsServer->endDisplayReconfigure();
-
+#endif
// Get all the running apps to reset
QCopEnvelope env( "QPE/System", "reset()" );
}
}
void QPEApplication::reset() {
// Reconnect to the screen
qt_screen->disconnect();
qt_screen->connect( QString::null );
// Redraw everything
applyStyle();
}
#if (QT_VERSION < 238) && defined Q_OS_MACX
bool qt_left_hand_scrollbars = false;
#else
#ifdef Q_OS_MACX
#define WEAK_SYMBOL __attribute__((weak_import))
#else
#define WEAK_SYMBOL __attribute__((weak))
#endif
extern bool qt_left_hand_scrollbars WEAK_SYMBOL;
#endif
/*!
\internal
*/
void QPEApplication::applyStyle()
{
Config config( "qpe" );
config.setGroup( "Appearance" );
#if QT_VERSION > 233
#if !defined(OPIE_NO_OVERRIDE_QT)
// don't block ourselves ...
Opie::force_appearance = 0;
static QString appname = Opie::binaryName ( );
QStringList ex = config. readListEntry ( "NoStyle", ';' );
int nostyle = 0;
for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) {
if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) {
nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 );
break;
}
}