[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kwin
From:       Rohan Ramdas Prabhu <rohan () rohanprabhu ! com>
Date:       2010-05-31 22:18:41
Message-ID: 20100531221841.5034FAC8C6 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1133013 by rohanp:

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



 M  +0 -5      CMakeLists.txt  
 M  +0 -19     main.cpp  


--- trunk/KDE/kdebase/workspace/kwin/CMakeLists.txt #1133012:1133013
@@ -111,11 +111,6 @@
    tilinglayout.cpp
    tilinglayoutfactory.cpp
    
-   #load the scripting related functions
-   scripttesting.cpp
-   scripting/scripting.cpp
-   scripting/workspace.cpp
-
    # tiling layouts
    # spiral
    #tilinglayouts/spiral/spiralfactory.cpp
--- trunk/KDE/kdebase/workspace/kwin/main.cpp #1133012:1133013
@@ -40,11 +40,6 @@
 #include <kdefakes.h>
 #include <QtDBus/QtDBus>
 
-#include <QMessageBox>
-#include <QEvent>
-#include "scripttesting.h"
-#include "scripting/scripting.h"
-
 #include <kdialog.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
@@ -493,11 +488,8 @@
     args.add( "lock", ki18n( "Disable configuration options" ));
     args.add( "replace", ki18n( "Replace already-running ICCCM2.0-compliant window manager" ));
     args.add( "crashes <n>", 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 @@
     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 )
@@ -529,16 +520,6 @@
     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();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]