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

List:       kde-commits
Subject:    KDE/kdelibs/khtml/tests
From:       Harri Porten <porten () kde ! org>
Date:       2010-02-14 16:35:24
Message-ID: 1266165324.269684.22148.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1090092 by porten:

Fixed standard Quit action.


 M  +3 -7      testkhtmlnew.cpp  


--- trunk/KDE/kdelibs/khtml/tests/testkhtmlnew.cpp #1090091:1090092
@@ -121,7 +121,8 @@
     QDomElement fileMenu = document.documentElement().firstChild().childNodes().item( 0 ).toElement();
 
     QDomElement quitElement = document.createElement("action");
-    quitElement.setAttribute("name", "quit");
+    quitElement.setAttribute("name",
+                             KStandardAction::name(KStandardAction::Quit));
     fileMenu.appendChild(quitElement);
 
     QDomElement viewMenu = document.documentElement().firstChild().childNodes().item( 2 ).toElement();
@@ -151,11 +152,6 @@
     element.setAttribute("name", "print");
     toolBar.insertBefore(element, toolBar.firstChild());
 
-
-    KAction *quitAction = new KAction( i18n( "Quit" ), this );
-    m_part->actionCollection()->addAction( "quit", quitAction );
-    connect( quitAction, SIGNAL( triggered( bool ) ), kapp, SLOT( quit() ) );
-
     KAction *action = new KAction(KIcon("view-refresh"), "Reload", this );
     m_part->actionCollection()->addAction( "reload", action );
     connect(action, SIGNAL(triggered(bool)), this, SLOT(reload()));
@@ -178,7 +174,7 @@
     ta->setChecked(m_part->isEditable());
     connect(ta, SIGNAL(toggled(bool)), this, SLOT(toggleEditable(bool)));
 
-    KStandardAction::quit( this, SLOT(kpp->quit()), m_part->actionCollection() );
+    KStandardAction::quit( kapp, SLOT(quit()), m_part->actionCollection() );
 
     guiFactory()->addClient(m_part);
 }
[prev in list] [next in list] [prev in thread] [next in thread]