Stuff can be broken if you really want it... or because only root can open /dev/console...

Anyway have a mutable QPopupMenu in the class and remove unsigned long ref
as we don't need it

2 files changed, 10 insertions, 12 deletions

diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp
index cdd3c97..881eb41 100644
--- a/core/applets/vtapplet/vt.cpp
+++ b/core/applets/vtapplet/vt.cpp
@@ -27,13 +27,13 @@
 #include <sys/ioctl.h>
 #include <linux/vt.h>
 
 #include "vt.h"
 
 VTApplet::VTApplet ( )
-	: QObject ( 0, "VTApplet" ), ref ( 0 )
+	: QObject ( 0, "VTApplet" )
 {
 }
 
 VTApplet::~VTApplet ( )
 {
 }
@@ -81,25 +81,25 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const
 
     struct vt_stat vtstat;
     int fd = ::open( "/dev/tty0", O_RDWR );
     if ( fd == -1 ) return 0;
     if ( ioctl( fd, VT_GETSTATE, &vtstat ) == -1 ) return 0;
 
-    submenu = new QPopupMenu( parent );
-    submenu->setCheckable( true );
+    m_subMenu = new QPopupMenu( parent );
+    m_subMenu->setCheckable( true );
     for ( int i = 1; i < 10; ++i )
     {
-        int id = submenu->insertItem( QString::number( i ), 500+i );
-        submenu->setItemChecked( id, id-500 == vtstat.v_active );
+        int id = m_subMenu->insertItem( QString::number( i ), 500+i );
+        m_subMenu->setItemChecked( id, id-500 == vtstat.v_active );
     }
     ::close( fd );
 
-    connect( submenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) );
-    connect( submenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) );
+    connect( m_subMenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) );
+    connect( m_subMenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) );
 
-    return submenu;
+    return m_subMenu;
 }
 
 
 void VTApplet::changeVT( int index )
 {
     //qDebug( "VTApplet::changeVT( %d )", index-500 );
@@ -125,13 +125,13 @@ void VTApplet::updateMenu()
         if ( result == -1 )
             qDebug( "VT %d disallocated == free", i );
         else
             qDebug( "VT %d _not_ disallocated == busy", i );
         */
 
-        submenu->setItemEnabled( 500+i, result == -1 );
+        m_subMenu->setItemEnabled( 500+i, result == -1 );
     }
 
     ::close( fd );
 }
 
 
diff --git a/core/applets/vtapplet/vt.h b/core/applets/vtapplet/vt.h
index 6bdb9e0..4c92ddd 100644
--- a/core/applets/vtapplet/vt.h
+++ b/core/applets/vtapplet/vt.h
@@ -41,14 +41,12 @@ public:
 
     virtual void activated ();
 
 public slots:
     virtual void changeVT( int index );
     virtual void updateMenu();
-
 private:
-    ulong ref;
+    mutable QPopupMenu* m_subMenu;
 };
 
-static QPopupMenu* submenu;
 
 #endif