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

List:       kde-commits
Subject:    KDE/kdebase/libkonq
From:       David Faure <faure () kde ! org>
Date:       2007-02-01 15:39:06
Message-ID: 1170344346.575455.19150.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 629142 by dfaure:

simplifications


 M  +1 -1      konq_popupmenu.cc  
 M  +3 -2      tests/konqundomanagertest.cpp  
 M  +0 -1      tests/konqundomanagertest.h  


--- trunk/KDE/kdebase/libkonq/konq_popupmenu.cc #629141:629142
@@ -676,7 +676,7 @@
             if ( cfg.hasKey( "X-KDE-ShowIfRunning" ) )
             {
                 const QString app = cfg.readEntry( "X-KDE-ShowIfRunning" );
-                if ( QDBusConnection::sessionBus().interface()->serviceOwner( app ).value().isEmpty() )
+                if ( QDBusConnection::sessionBus().interface()->isServiceRegistered( app ) )
                     continue;
             }
             if ( cfg.hasKey( "X-KDE-ShowIfDBusCall" ) )
--- trunk/KDE/kdebase/libkonq/tests/konqundomanagertest.cpp #629141:629142
@@ -172,12 +172,13 @@
 
 void KonqUndoManagerTest::doUndo()
 {
+    QEventLoop eventLoop;
     bool ok = connect( KonqUndoManager::self(), SIGNAL( undoJobFinished() ),
-                  &m_eventLoop, SLOT( quit() ) );
+                  &eventLoop, SLOT( quit() ) );
     QVERIFY( ok );
 
     KonqUndoManager::self()->undo();
-    m_eventLoop.exec(QEventLoop::ExcludeUserInputEvents); // wait for undo job to finish
+    eventLoop.exec(QEventLoop::ExcludeUserInputEvents); // wait for undo job to finish
 }
 
 void KonqUndoManagerTest::testCopyFiles()
--- trunk/KDE/kdebase/libkonq/tests/konqundomanagertest.h #629141:629142
@@ -48,7 +48,6 @@
 
 private:
     void doUndo();
-    QEventLoop m_eventLoop;
     TestUiInterface* m_uiInterface;
 };
 
[prev in list] [next in list] [prev in thread] [next in thread]