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

List:       kde-commits
Subject:    extragear/sysadmin/kiosktool
From:       Ian Reinhart Geiser <geiseri () kde ! org>
Date:       2009-03-02 2:35:55
Message-ID: 1235961355.406756.14574.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 933986 by geiseri:

dont EVER delete a KXmlGuiWindow it will punish you

 M  +2 -2      kioskgui.cpp  
 M  +1 -4      kiosktoolui.rc  
 M  +0 -2      main.cpp  


--- trunk/extragear/sysadmin/kiosktool/kioskgui.cpp #933985:933986
@@ -64,14 +64,13 @@
 #include "kiosksync.h"
 
 KioskGui::KioskGui()
-    : KXmlGuiWindow( 0 ), m_profileSelectionPage(0),
+    : KXmlGuiWindow(), m_profileSelectionPage(0),
     m_componentSelectionPage(0), m_componentPage(0), m_profileAssignPage(0),
     m_profilePropsPage(0), m_data(0),
     m_profile(0), m_componentData(0),m_page(0)
 {
     m_run = new KioskRun(this);
     m_view = new MainView(this);
-
     m_view->logoLabel->setPixmap( QPixmap( KStandardDirs::locate("data","kiosktool/logo.png") ) );
 
     setupActions();
@@ -99,6 +98,7 @@
     selectPage(PAGE_PROFILE_SELECTION, true);
 
     QTimer::singleShot(0, this, SLOT(slotCheckEtcSkel()));
+    
 }
 
 KioskGui::~KioskGui()
--- trunk/extragear/sysadmin/kiosktool/kiosktoolui.rc #933985:933986
@@ -1,13 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE gui SYSTEM "kpartgui.dtd">
-<gui name="kioskgui" version="3">
+<gui name="kioskgui" version="3.1">
 <MenuBar>
  <Menu name="file">
     <Action name="upload_all"/>
  </Menu>
- <Menu name="settings">
-    <Action name="show_background" append="show_merge"/>
- </Menu>
 </MenuBar>
 </gui>
 
--- trunk/extragear/sysadmin/kiosktool/main.cpp #933985:933986
@@ -52,7 +52,5 @@
 
    int result = a.exec();
 
-   delete w;
-
    return result;
 }
[prev in list] [next in list] [prev in thread] [next in thread]