From 4f10c8fc39ba1eeda244fac78a073b01341581b8 Mon Sep 17 00:00:00 2001 From: Rohan Ramdas Prabhu Date: Mon, 31 May 2010 22:18:41 +0000 Subject: [PATCH] Accidentally broke tunk in my previous commit. I was supposed to commit to a branch, but instead committed to the trunk. Well, the trunk was broken because not all files were committed and hence anyone who checked out of the trunk during this time could not have built kwin. From what I can gather, the trunk has been broken for around 45 minutes now. I didn't realize all that while that the trunk was broken. I apologize for the inconvinience and I deeply regret my actions which were clearly not well-thought. Sorry, Rohan svn path=/trunk/KDE/kdebase/workspace/; revision=1133013 --- CMakeLists.txt | 5 ----- main.cpp | 19 ------------------- 2 files changed, 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5d30a031a..96259311fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,11 +110,6 @@ set(kwin_KDEINIT_SRCS tiling.cpp tilinglayout.cpp tilinglayoutfactory.cpp - - #load the scripting related functions - scripttesting.cpp - scripting/scripting.cpp - scripting/workspace.cpp # tiling layouts # spiral diff --git a/main.cpp b/main.cpp index f160f067b3..557c87fff5 100644 --- a/main.cpp +++ b/main.cpp @@ -40,11 +40,6 @@ along with this program. If not, see . #include #include -#include -#include -#include "scripttesting.h" -#include "scripting/scripting.h" - #include #include #include @@ -493,11 +488,8 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) args.add( "lock", ki18n( "Disable configuration options" )); args.add( "replace", ki18n( "Replace already-running ICCCM2.0-compliant window manager" )); args.add( "crashes ", ki18n( "Indicate that KWin has recently crashed n times" )); - args.add( "stest", ki18n( "Load the script testing dialog" )); KCmdLineArgs::addCmdLineOptions( args ); - ScriptTesting* stestWindow; - if( KDE_signal( SIGTERM, KWin::sighandler ) == SIG_IGN ) KDE_signal( SIGTERM, SIG_IGN ); if( KDE_signal( SIGINT, KWin::sighandler ) == SIG_IGN ) @@ -512,7 +504,6 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) KWin::SessionManager weAreIndeed; KWin::SessionSaveDoneHelper helper; KGlobal::locale()->insertCatalog( "kwin_effects" ); - KWin::Scripting scripting; // Announce when KWIN_DIRECT_GL is set for above HACK if( qstrcmp( qgetenv( "KWIN_DIRECT_GL" ), "1" ) == 0 ) @@ -528,16 +519,6 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) QDBusConnection::sessionBus().interface()->registerService( appname, QDBusConnectionInterface::DontQueueService ); - - KCmdLineArgs* sargs = KCmdLineArgs::parsedArgs(); - - if(sargs->isSet("stest")) { - stestWindow = new ScriptTesting(); - stestWindow->setEngine(&scripting); - stestWindow->runDefault(); - //QEvent* showSTest = new QEvent(QEvent::Type(QEvent::User + 7)); - //a.postEvent(stestWindow, showSTest, INT_MIN); - } return a.exec(); }