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

List:       kde-commits
Subject:    KDE/kdebase
From:       Andreas Hartmetz <ahartmetz () gmail ! com>
Date:       2007-03-26 11:30:21
Message-ID: 1174908621.306907.20006.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 646639 by ahartmetz:

pointer out-parameters for functions in kdelibs/kdeui/util/kkeyserver_x11.cpp

 M  +2 -2      apps/kwrite/kwritemain.cpp  
 M  +1 -1      workspace/kcontrol/access/kaccess.cpp  
 M  +1 -1      workspace/kcontrol/access/kcmaccess.cpp  
 M  +6 -6      workspace/kcontrol/keys/shortcuts.cpp  
 M  +8 -7      workspace/khotkeys/kcontrol/triggers_tab.cpp  
 M  +5 -5      workspace/khotkeys/kcontrol/voice_settings_tab.cpp  
 M  +1 -1      workspace/klipper/configdialog.cpp  
 M  +6 -6      workspace/kmenuedit/basictab.cpp  
 M  +1 -1      workspace/kwin/events.cpp  


--- trunk/KDE/kdebase/apps/kwrite/kwritemain.cpp #646638:646639
@@ -341,9 +341,9 @@
 void KWrite::editKeys()
 {
   KKeyDialog dlg;
-  dlg.insert(actionCollection());
+  dlg.addCollection(actionCollection());
   if( m_view )
-    dlg.insert(m_view->actionCollection());
+    dlg.addCollection(m_view->actionCollection());
   dlg.configure();
 }
 
--- trunk/KDE/kdebase/workspace/kcontrol/access/kaccess.cpp #646638:646639
@@ -517,7 +517,7 @@
   ev.xkey.keycode = code;
   ev.xkey.state = 0;
   int key;
-  KKeyServer::xEventToQt(&ev, key);
+  KKeyServer::xEventToQt(&ev, &key);
   QString keyname = QKeySequence(key).toString();
 
   unsigned int AltMask   = KKeyServer::modXAlt();
--- trunk/KDE/kdebase/workspace/kcontrol/access/kcmaccess.cpp #646638:646639
@@ -168,7 +168,7 @@
   ev.xkey.keycode = code;
   ev.xkey.state = 0;
   int key;
-  KKeyServer::xEventToQt(&ev, key);
+  KKeyServer::xEventToQt(&ev, &key);
   QString keyname = QKeySequence(key).toString();
 
   unsigned int AltMask   = KKeyServer::modXAlt();
--- trunk/KDE/kdebase/workspace/kcontrol/keys/shortcuts.cpp #646638:646639
@@ -82,8 +82,8 @@
 	}
 	KGlobal::config()->sync();
 
-	m_pkcGeneral->commitChanges();
-	m_pkcSequence->commitChanges();
+	//m_pkcGeneral->commitChanges();
+	//m_pkcSequence->commitChanges();
 	m_pkcApplication->save();
 
 	KGlobalAccel::self()->writeSettings();
@@ -93,9 +93,9 @@
 
 void ShortcutsModule::defaults()
 {
-	m_pkcGeneral->allDefault();
+	/*m_pkcGeneral->allDefault();
 	m_pkcSequence->allDefault();
-	m_pkcApplication->allDefault();
+	m_pkcApplication->allDefault();*/
 }
 
 QString ShortcutsModule::quickHelp() const
@@ -422,9 +422,9 @@
 	QString sFilename = m_rgsSchemeFiles[ m_pcbSchemes->currentIndex() ];
 	KConfig config( sFilename, KConfig::OnlyLocal);
 
-	m_pkcGeneral->commitChanges();
+	/*m_pkcGeneral->commitChanges();
 	m_pkcSequence->commitChanges();
-	m_pkcApplication->commitChanges();
+	m_pkcApplication->commitChanges();*/
 
 	KGlobalAccel::self()->writeSettings();
 }
--- trunk/KDE/kdebase/workspace/khotkeys/kcontrol/triggers_tab.cpp #646638:646639
@@ -247,17 +247,17 @@
 
 void Shortcut_trigger_widget::clear_data()
     {
-    bt->setShortcut( KShortcut() );
+    //bt->setShortcut( KShortcut() );
     }
 
 void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P )
     {
-    if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget())
+    /*if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget())
         || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget()))
-        return;
+        return;*/
     // KHotKeys::Module::changed()
     module->changed();
-    bt->setShortcut( s_P );
+    //bt->setShortcut( s_P );
     }
 
 void Shortcut_trigger_widget::set_data( const Shortcut_trigger* data_P )
@@ -267,13 +267,14 @@
         clear_data();
         return;
         }
-    bt->setShortcut( data_P->shortcut() );
+    //bt->setShortcut( data_P->shortcut() );
     }
 
 Shortcut_trigger* Shortcut_trigger_widget::get_data( Action_data* data_P ) const
     {
-    return !bt->shortcut().isEmpty()
-        ? new Shortcut_trigger( data_P, bt->shortcut()) : NULL;
+    /*return !bt->shortcut().isEmpty()
+        ? new Shortcut_trigger( data_P, bt->shortcut()) : NULL;*/
+    return 0;
     }
 
 // Shortcut_trigger_dialog
--- trunk/KDE/kdebase/workspace/khotkeys/kcontrol/voice_settings_tab.cpp #646638:646639
@@ -31,12 +31,12 @@
 
 void Voice_settings_tab::read_data()
     {
-		keyButton->setShortcut( module->voice_shortcut() );
+//		keyButton->setShortcut( module->voice_shortcut() );
     }
 
 void Voice_settings_tab::write_data() const
     {
-		module->set_voice_shortcut( keyButton->shortcut() );
+//		module->set_voice_shortcut( keyButton->shortcut() );
     }
 
 void Voice_settings_tab::clear_data()
@@ -55,12 +55,12 @@
 			   return;
 	   }*/
 	   
-	   if(KKeyChooser::checkGlobalShortcutsConflict(cut,true,this))
+/*	   if(KKeyChooser::checkGlobalShortcutsConflict(cut,true,this))
 		   return;
 	   if(KKeyChooser::checkStandardShortcutsConflict(cut,true,this))
-		   return;
+		   return;*/
 	   
-	   keyButton->setShortcut(cut);
+//	   keyButton->setShortcut(cut);
 	   module->changed();
    }
 } // namespace KHotKeys
--- trunk/KDE/kdebase/workspace/klipper/configdialog.cpp #646638:646639
@@ -95,7 +95,7 @@
 
 void ConfigDialog::commitShortcuts()
 {
-    keysWidget->commitChanges();
+    //keysWidget->commitChanges();
 }
 
 /////////////////////////////////////////
--- trunk/KDE/kdebase/workspace/kmenuedit/basictab.cpp #646638:646639
@@ -325,7 +325,7 @@
     _systrayCB->setChecked(false);
     _terminalCB->setChecked(false);
     _uidCB->setChecked(false);
-    _keyEdit->setShortcut(KShortcut());
+    //_keyEdit->setShortcut(KShortcut());
 
     enableWidgets(false, folderInfo->hidden);
     blockSignals(false);
@@ -345,7 +345,7 @@
        _iconButton->setIcon(QString());
 
        // key binding part
-       _keyEdit->setShortcut( KShortcut() );
+       //_keyEdit->setShortcut( KShortcut() );
        _execEdit->lineEdit()->setText(QString());
        _systrayCB->setChecked(false);
 
@@ -373,7 +373,7 @@
     // key binding part
     if( KHotKeys::present())
     {
-        _keyEdit->setShortcut( entryInfo->shortcut() );
+        //_keyEdit->setShortcut( entryInfo->shortcut() );
     }
 
     QString temp = df->readPathEntry("Exec");
@@ -493,9 +493,9 @@
     if (signalsBlocked())
        return;
 
-    if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, topLevelWidget())
+    /*if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, topLevelWidget())
         || KKeyChooser::checkStandardShortcutsConflict( cut, true, topLevelWidget()))
-        return;
+        return;*/
 
     if ( KHotKeys::present() )
     {
@@ -518,7 +518,7 @@
        }
        _menuEntryInfo->setShortcut( cut );
     }
-    _keyEdit->setShortcut(cut);
+    //_keyEdit->setShortcut(cut);
     if (_menuEntryInfo)
        emit changed( _menuEntryInfo );
 }
--- trunk/KDE/kdebase/workspace/kwin/events.cpp #646638:646639
@@ -228,7 +228,7 @@
             {
             was_user_interaction = true;
             int keyQt;
-            KKeyServer::xEventToQt(e, keyQt);
+            KKeyServer::xEventToQt(e, &keyQt);
             kDebug(125) << "Workspace::keyPress( " << keyQt << " )" << endl;
             if (movingClient)
                 {
[prev in list] [next in list] [prev in thread] [next in thread]