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

List:       kde-commits
Subject:    KDE/kdenetwork/krdc
From:       Caleb Tennis <caleb () gentoo ! org>
Date:       2005-09-07 12:16:33
Message-ID: 1126095393.779047.19355.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 458162 by ctennis:

Revert previous change per Matt Rogers as it doesn't compile against kdelibs4 snapshot (just trunk)

 M  +8 -8      keycapturedialog.cpp  
 M  +8 -8      vnc/kvncview.cpp  


--- trunk/KDE/kdenetwork/krdc/keycapturedialog.cpp #458161:458162
@@ -106,12 +106,12 @@
 		// Don't allow setting a modifier key as an accelerator.
 		// Also, don't release the focus yet.  We'll wait until
 		//  we get a 'normal' key.
-		case XK_Shift_L:   case XK_Shift_R:   keyModX = KKeyNative::modXShift(); break;
-		case XK_Control_L: case XK_Control_R: keyModX = KKeyNative::modXCtrl(); break;
-		case XK_Alt_L:     case XK_Alt_R:     keyModX = KKeyNative::modXAlt(); break;
+		case XK_Shift_L:   case XK_Shift_R:   keyModX = KKeyNative::modX(KKey::SHIFT); break;
+		case XK_Control_L: case XK_Control_R: keyModX = KKeyNative::modX(KKey::CTRL); break;
+		case XK_Alt_L:     case XK_Alt_R:     keyModX = KKeyNative::modX(KKey::ALT); break;
 		// FIXME: check whether the Meta or Super key are for the Win modifier
 		case XK_Meta_L:    case XK_Meta_R:
-		case XK_Super_L:   case XK_Super_R:   keyModX = KKeyNative::modXWin(); break;
+		case XK_Super_L:   case XK_Super_R:   keyModX = KKeyNative::modX(KKey::WIN); break;
 		case XK_Hyper_L:   case XK_Hyper_R:
 		case XK_Mode_switch:
 		case XK_Num_Lock:
@@ -133,10 +133,10 @@
 		keyModX = pEvent->xkey.state & ~keyModX;
 
 	QString keyModStr;
-	if( keyModX & KKeyNative::modXWin() )	keyModStr += KKey::modFlagLabel(KKey::WIN) + "+";
-	if( keyModX & KKeyNative::modXAlt() )	keyModStr += KKey::modFlagLabel(KKey::ALT) + "+";
-	if( keyModX & KKeyNative::modXCtrl() )	keyModStr += KKey::modFlagLabel(KKey::CTRL) + "+";
-	if( keyModX & KKeyNative::modXShift() )	keyModStr += KKey::modFlagLabel(KKey::SHIFT) + "+";
+	if( keyModX & KKeyNative::modX(KKey::WIN) )	keyModStr += KKey::modFlagLabel(KKey::WIN) + "+";
+	if( keyModX & KKeyNative::modX(KKey::ALT) )	keyModStr += KKey::modFlagLabel(KKey::ALT) + "+";
+	if( keyModX & KKeyNative::modX(KKey::CTRL) )	keyModStr += KKey::modFlagLabel(KKey::CTRL) + "+";
+	if( keyModX & KKeyNative::modX(KKey::SHIFT) )	keyModStr += KKey::modFlagLabel(KKey::SHIFT) + "+";
 
 	// Display currently selected modifiers, or redisplay old key.
 	m_captureWidget->keyLabel->setText( keyModStr );
--- trunk/KDE/kdenetwork/krdc/vnc/kvncview.cpp #458161:458162
@@ -602,25 +602,25 @@
 void KVncView::pressKey(XEvent *xe) {
 	KKeyNative k(xe);
 	uint mod = k.mod();
-	if (mod & KKeyNative::modXShift())
+	if (mod & KKeyNative::modX(KKey::SHIFT))
 		m_wthread.queueKeyEvent(XK_Shift_L, true);
-	if (mod & KKeyNative::modXCtrl())
+	if (mod & KKeyNative::modX(KKey::CTRL))
 		m_wthread.queueKeyEvent(XK_Control_L, true);
-	if (mod & KKeyNative::modXAlt())
+	if (mod & KKeyNative::modX(KKey::ALT))
 		m_wthread.queueKeyEvent(XK_Alt_L, true);
-	if (mod & KKeyNative::modXWin())
+	if (mod & KKeyNative::modX(KKey::WIN))
 		m_wthread.queueKeyEvent(XK_Meta_L, true);
 
 	m_wthread.queueKeyEvent(k.sym(), true);
 	m_wthread.queueKeyEvent(k.sym(), false);
 
-	if (mod & KKeyNative::modXWin())
+	if (mod & KKeyNative::modX(KKey::WIN))
 		m_wthread.queueKeyEvent(XK_Meta_L, false);
-	if (mod & KKeyNative::modXAlt())
+	if (mod & KKeyNative::modX(KKey::ALT))
 		m_wthread.queueKeyEvent(XK_Alt_L, false);
-	if (mod & KKeyNative::modXCtrl())
+	if (mod & KKeyNative::modX(KKey::CTRL))
 		m_wthread.queueKeyEvent(XK_Control_L, false);
-	if (mod & KKeyNative::modXShift())
+	if (mod & KKeyNative::modX(KKey::SHIFT))
 		m_wthread.queueKeyEvent(XK_Shift_L, false);
 
 	m_mods.clear();
[prev in list] [next in list] [prev in thread] [next in thread]