-rw-r--r-- | core/applets/vtapplet/vt.cpp | 18 |
1 files changed, 9 insertions, 9 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 | |||
@@ -25,17 +25,17 @@ | |||
25 | #include <sys/types.h> | 25 | #include <sys/types.h> |
26 | #include <sys/stat.h> | 26 | #include <sys/stat.h> |
27 | #include <sys/ioctl.h> | 27 | #include <sys/ioctl.h> |
28 | #include <linux/vt.h> | 28 | #include <linux/vt.h> |
29 | 29 | ||
30 | #include "vt.h" | 30 | #include "vt.h" |
31 | 31 | ||
32 | VTApplet::VTApplet ( ) | 32 | VTApplet::VTApplet ( ) |
33 | : QObject ( 0, "VTApplet" ), ref ( 0 ) | 33 | : QObject ( 0, "VTApplet" ) |
34 | { | 34 | { |
35 | } | 35 | } |
36 | 36 | ||
37 | VTApplet::~VTApplet ( ) | 37 | VTApplet::~VTApplet ( ) |
38 | { | 38 | { |
39 | } | 39 | } |
40 | 40 | ||
41 | int VTApplet::position ( ) const | 41 | int VTApplet::position ( ) const |
@@ -79,29 +79,29 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const | |||
79 | { | 79 | { |
80 | qDebug( "VTApplet::popup" ); | 80 | qDebug( "VTApplet::popup" ); |
81 | 81 | ||
82 | struct vt_stat vtstat; | 82 | struct vt_stat vtstat; |
83 | int fd = ::open( "/dev/tty0", O_RDWR ); | 83 | int fd = ::open( "/dev/tty0", O_RDWR ); |
84 | if ( fd == -1 ) return 0; | 84 | if ( fd == -1 ) return 0; |
85 | if ( ioctl( fd, VT_GETSTATE, &vtstat ) == -1 ) return 0; | 85 | if ( ioctl( fd, VT_GETSTATE, &vtstat ) == -1 ) return 0; |
86 | 86 | ||
87 | submenu = new QPopupMenu( parent ); | 87 | m_subMenu = new QPopupMenu( parent ); |
88 | submenu->setCheckable( true ); | 88 | m_subMenu->setCheckable( true ); |
89 | for ( int i = 1; i < 10; ++i ) | 89 | for ( int i = 1; i < 10; ++i ) |
90 | { | 90 | { |
91 | int id = submenu->insertItem( QString::number( i ), 500+i ); | 91 | int id = m_subMenu->insertItem( QString::number( i ), 500+i ); |
92 | submenu->setItemChecked( id, id-500 == vtstat.v_active ); | 92 | m_subMenu->setItemChecked( id, id-500 == vtstat.v_active ); |
93 | } | 93 | } |
94 | ::close( fd ); | 94 | ::close( fd ); |
95 | 95 | ||
96 | connect( submenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) ); | 96 | connect( m_subMenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) ); |
97 | connect( submenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) ); | 97 | connect( m_subMenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) ); |
98 | 98 | ||
99 | return submenu; | 99 | return m_subMenu; |
100 | } | 100 | } |
101 | 101 | ||
102 | 102 | ||
103 | void VTApplet::changeVT( int index ) | 103 | void VTApplet::changeVT( int index ) |
104 | { | 104 | { |
105 | //qDebug( "VTApplet::changeVT( %d )", index-500 ); | 105 | //qDebug( "VTApplet::changeVT( %d )", index-500 ); |
106 | 106 | ||
107 | int fd = ::open("/dev/tty0", O_RDWR); | 107 | int fd = ::open("/dev/tty0", O_RDWR); |
@@ -123,17 +123,17 @@ void VTApplet::updateMenu() | |||
123 | 123 | ||
124 | /* | 124 | /* |
125 | if ( result == -1 ) | 125 | if ( result == -1 ) |
126 | qDebug( "VT %d disallocated == free", i ); | 126 | qDebug( "VT %d disallocated == free", i ); |
127 | else | 127 | else |
128 | qDebug( "VT %d _not_ disallocated == busy", i ); | 128 | qDebug( "VT %d _not_ disallocated == busy", i ); |
129 | */ | 129 | */ |
130 | 130 | ||
131 | submenu->setItemEnabled( 500+i, result == -1 ); | 131 | m_subMenu->setItemEnabled( 500+i, result == -1 ); |
132 | } | 132 | } |
133 | 133 | ||
134 | ::close( fd ); | 134 | ::close( fd ); |
135 | } | 135 | } |
136 | 136 | ||
137 | 137 | ||
138 | void VTApplet::activated() | 138 | void VTApplet::activated() |
139 | { | 139 | { |