diff --git a/CMakeLists.txt b/CMakeLists.txt index ea2d982d33..d8dc6cd729 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,3 @@ - - -add_definitions (-DQT3_SUPPORT) - add_subdirectory( lib ) include_directories( @@ -65,7 +61,7 @@ qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml workspace.h KWin::Works kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS}) -target_link_libraries(kdeinit_kwin ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDEUI_LIBS} kdecorations kwineffects ${X11_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} ) +target_link_libraries(kdeinit_kwin ${KDE4_KDEUI_LIBS} kdecorations kwineffects ${X11_LIBRARIES}) if(OPENGL_FOUND) target_link_libraries(kdeinit_kwin ${OPENGL_gl_LIBRARY}) # -ldl used by OpenGL code diff --git a/client.cpp b/client.cpp index 199a4f01b6..03ef6af7dc 100644 --- a/client.cpp +++ b/client.cpp @@ -15,13 +15,13 @@ License. See the file "COPYING" for the exact licensing terms. #include #include #include -#include #include #include #include #include #include #include +#include #include "bridge.h" #include "group.h" @@ -1105,21 +1105,15 @@ void Client::killProcess( bool ask, Time timestamp ) } else { - process_killer = new K3Process( this ); - *process_killer << KStandardDirs::findExe( "kwin_killer_helper" ) - << "--pid" << QByteArray().setNum( pid ) << "--hostname" << machine + process_killer = new QProcess( this ); + connect( process_killer, SIGNAL( error( QProcess::ProcessError )), SLOT( processKillerExited())); + connect( process_killer, SIGNAL( finished( int, QProcess::ExitStatus )), SLOT( processKillerExited())); + process_killer->start( KStandardDirs::findExe( "kwin_killer_helper" ), + QStringList() << "--pid" << QByteArray().setNum( pid ) << "--hostname" << machine << "--windowname" << caption().toUtf8() << "--applicationname" << resourceClass() << "--wid" << QString::number( window() ) - << "--timestamp" << QString::number( timestamp ); - connect( process_killer, SIGNAL( processExited( K3Process* )), - SLOT( processKillerExited())); - if( !process_killer->start( K3Process::NotifyOnExit )) - { - delete process_killer; - process_killer = NULL; - return; - } + << "--timestamp" << QString::number( timestamp )); } } diff --git a/client.h b/client.h index fdb06ba538..67bc523623 100644 --- a/client.h +++ b/client.h @@ -36,8 +36,8 @@ License. See the file "COPYING" for the exact licensing terms. #include #endif +class QProcess; class QTimer; -class K3Process; class KStartupInfoData; namespace KWin @@ -475,7 +475,7 @@ class Client Window window_group; Layer in_layer; QTimer* ping_timer; - K3Process* process_killer; + QProcess* process_killer; Time ping_timestamp; Time user_time; unsigned long allowed_actions; diff --git a/clients/b2/CMakeLists.txt b/clients/b2/CMakeLists.txt index 4ec2698ce8..1fcb591055 100644 --- a/clients/b2/CMakeLists.txt +++ b/clients/b2/CMakeLists.txt @@ -1,3 +1,4 @@ +add_definitions (-DQT3_SUPPORT) add_subdirectory( config ) diff --git a/clients/kde2/kde2.cpp b/clients/kde2/kde2.cpp index e3e8bd8978..f6187a2683 100644 --- a/clients/kde2/kde2.cpp +++ b/clients/kde2/kde2.cpp @@ -1034,10 +1034,10 @@ void KDE2Client::paintEvent( QPaintEvent* ) (caption().isRightToLeft() ? Qt::AlignRight : Qt::AlignLeft) | Qt::AlignVCenter, caption() ); - bitBlt( widget(), 2, 2, titleBuffer ); - p2.end(); + p.drawPixmap( 2, 2, *titleBuffer ); + // Ensure a shaded window has no unpainted areas // Is this still needed? #if 1 diff --git a/clients/keramik/CMakeLists.txt b/clients/keramik/CMakeLists.txt index 7911797f5b..17bb4eed45 100644 --- a/clients/keramik/CMakeLists.txt +++ b/clients/keramik/CMakeLists.txt @@ -1,3 +1,4 @@ +add_definitions (-DQT3_SUPPORT) add_subdirectory( config ) diff --git a/clients/modernsystem/CMakeLists.txt b/clients/modernsystem/CMakeLists.txt index 11200c8721..bf7b6f5d9f 100644 --- a/clients/modernsystem/CMakeLists.txt +++ b/clients/modernsystem/CMakeLists.txt @@ -1,3 +1,4 @@ +add_definitions (-DQT3_SUPPORT) add_subdirectory( config ) diff --git a/clients/oxygen/CMakeLists.txt b/clients/oxygen/CMakeLists.txt index f78d96a5d8..f4f166f4c7 100644 --- a/clients/oxygen/CMakeLists.txt +++ b/clients/oxygen/CMakeLists.txt @@ -1,3 +1,5 @@ +add_definitions (-DQT3_SUPPORT) + ########### next target ############### set(kwin_oxygen_SRCS diff --git a/clients/quartz/CMakeLists.txt b/clients/quartz/CMakeLists.txt index afa7aeefdb..e3b856b56b 100644 --- a/clients/quartz/CMakeLists.txt +++ b/clients/quartz/CMakeLists.txt @@ -1,3 +1,4 @@ +add_definitions (-DQT3_SUPPORT) add_subdirectory( config ) diff --git a/clients/redmond/CMakeLists.txt b/clients/redmond/CMakeLists.txt index a46cd5bdb1..39d446ba39 100644 --- a/clients/redmond/CMakeLists.txt +++ b/clients/redmond/CMakeLists.txt @@ -1,3 +1,4 @@ +add_definitions (-DQT3_SUPPORT) ########### next target ############### diff --git a/effects/boxswitch.cpp b/effects/boxswitch.cpp index b30a4e3089..bf8e6826dd 100644 --- a/effects/boxswitch.cpp +++ b/effects/boxswitch.cpp @@ -39,11 +39,11 @@ BoxSwitchEffect::BoxSwitchEffect() #ifdef HAVE_XRENDER alphaFormat = XRenderFindStandardFormat( display(), PictStandardARGB32 ); #endif - color_frame = KColorScheme( QPalette::Active, KColorScheme::Window ).background(); + color_frame = KColorScheme( QPalette::Active, KColorScheme::Window ).background().color(); color_frame.setAlphaF( 0.9 ); - color_highlight = KColorScheme( QPalette::Active, KColorScheme::Selection ).background(); + color_highlight = KColorScheme( QPalette::Active, KColorScheme::Selection ).background().color(); color_highlight.setAlphaF( 0.9 ); - color_text = KColorScheme( QPalette::Active, KColorScheme::Window ).foreground(); + color_text = KColorScheme( QPalette::Active, KColorScheme::Window ).foreground().color(); } BoxSwitchEffect::~BoxSwitchEffect() diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index aaa38585c5..13cabb2037 100644 --- a/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kcmkwin/kwindecoration/CMakeLists.txt @@ -1,3 +1,5 @@ +add_definitions (-DQT3_SUPPORT) + ########### next target ############### set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp ) diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt index c709b8896e..5bb3f9705c 100644 --- a/kcmkwin/kwinrules/CMakeLists.txt +++ b/kcmkwin/kwinrules/CMakeLists.txt @@ -1,4 +1,4 @@ -ADD_DEFINITIONS(-DKCMRULES) +ADD_DEFINITIONS(-DKCMRULES -DQT3_SUPPORT) ########### next target ############### set(kwinrules_SRCS ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp) diff --git a/layers.cpp b/layers.cpp index c26f9646db..9f60708c06 100644 --- a/layers.cpp +++ b/layers.cpp @@ -427,7 +427,7 @@ void Workspace::restackClientUnderActive( Client* c ) if( Client::belongToSameApplication( active_client, c )) { // put it below the active window if it's the same app unconstrained_stacking_order.removeAll( c ); - unconstrained_stacking_order.insert( unconstrained_stacking_order.find( active_client ), c ); + unconstrained_stacking_order.insert( unconstrained_stacking_order.indexOf( active_client ), c ); } else { // put in the stacking order below _all_ windows belonging to the active application @@ -456,7 +456,7 @@ void Workspace::restackClientUnderActive( Client* c ) if( Client::belongToSameApplication( active_client, c )) { // put it after the active window if it's the same app focus_chain[ desktop ].removeAll( c ); - focus_chain[ desktop ].insert( focus_chain[ desktop ].find( active_client ), c ); + focus_chain[ desktop ].insert( focus_chain[ desktop ].indexOf( active_client ), c ); } else { // put it in focus_chain[currentDesktop()] after all windows belonging to the active applicationa @@ -480,7 +480,7 @@ void Workspace::restackClientUnderActive( Client* c ) if( Client::belongToSameApplication( active_client, c )) { global_focus_chain.removeAll( c ); - global_focus_chain.insert( global_focus_chain.find( active_client ), c ); + global_focus_chain.insert( global_focus_chain.indexOf( active_client ), c ); } else { diff --git a/sm.h b/sm.h index f3d643bfe1..6a3553f084 100644 --- a/sm.h +++ b/sm.h @@ -17,6 +17,7 @@ License. See the file "COPYING" for the exact licensing terms. #include #include #include +#include class QSocketNotifier;