From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kwin/options.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kwin/options.cpp') diff --git a/kwin/options.cpp b/kwin/options.cpp index cab703051..e6afd4a1d 100644 --- a/kwin/options.cpp +++ b/kwin/options.cpp @@ -95,7 +95,7 @@ unsigned long Options::updateSettings() placement = Placement::policyFromString( config->readEntry("Placement"), true ); xineramaPlacementScreen = KCLAMP( config->readNumEntry( "XineramaPlacementScreen", -1 ), - -1, qApp->desktop()->numScreens() - 1 ); + -1, tqApp->desktop()->numScreens() - 1 ); animateShade = config->readBoolEntry("AnimateShade", TRUE ); animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE ); @@ -195,11 +195,11 @@ unsigned long Options::updateSettings() // window drop shadows config->setGroup("Style"); - shadow_colour = config->readColorEntry("ShadowColour", &Qt::black); + shadow_colour = config->readColorEntry("ShadowColour", &TQt::black); shadow_docks = config->readBoolEntry("ShadowDocks", false); shadow_overrides = config->readBoolEntry("ShadowOverrides", false); shadow_topMenus = config->readBoolEntry("ShadowTopMenus", false); - shadow_inactive_colour = config->readColorEntry("InactiveShadowColour", &Qt::black); + shadow_inactive_colour = config->readColorEntry("InactiveShadowColour", &TQt::black); shadow_inactive_enabled = config->readBoolEntry("InactiveShadowEnabled", false); shadow_inactive_opacity = config->readDoubleNumEntry("InactiveShadowOpacity", 0.70); shadow_inactive_thickness = config->readNumEntry("InactiveShadowThickness", 5); @@ -379,7 +379,7 @@ int Options::electricBorderDelay() bool Options::checkIgnoreFocusStealing( const Client* c ) { - return ignoreFocusStealingClasses.contains(TQString::fromLatin1(c->resourceClass())); + return ignoreFocusStealingClasses.tqcontains(TQString::tqfromLatin1(c->resourceClass())); } Options::MouseCommand Options::wheelToMouseCommand( MouseWheelCommand com, int delta ) -- cgit v1.2.3